From 371a50176e934ab2c49270830b0558200a3ba032 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 30 Aug 2021 22:39:11 +1200 Subject: [PATCH 001/102] Tidy tests only - ClusterTest and TestAggregateFormula --- .../java/org/tests/aggregateformula/TestAggregateFormula.java | 2 -- ebean-redis/src/test/java/org/integration/ClusterTest.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index ff9bfb70a..223316cc1 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -81,7 +81,6 @@ public class TestAggregateFormula extends BaseTestCase { for (Contact contact : contacts) { Customer customer = contact.getCustomer(); assertNotNull(customer.getName()); - assertNotNull(customer.getStatus()); } List sql = LoggedSqlCollector.stop(); @@ -112,7 +111,6 @@ public class TestAggregateFormula extends BaseTestCase { for (Contact contact : contacts) { Customer customer = contact.getCustomer(); assertNotNull(customer.getName()); - assertNotNull(customer.getStatus()); final Address billingAddress = customer.getBillingAddress(); if (billingAddress != null) { assertNotNull(billingAddress.getCountry()); diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 64c54baaa..2d1046009 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -40,6 +40,7 @@ public class ClusterTest { foo.save(); DB.getServerCacheManager().clearAll(); + DB.getDefault().getMetaInfoManager().resetAllMetrics(); other.getMetaInfoManager().resetAllMetrics(); Person fooA = DB.find(Person.class, foo.getId()); From c5dca6948222aa03d39ac05ac2fe2ff35b6a12a7 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 30 Aug 2021 22:42:12 +1200 Subject: [PATCH 002/102] Tests only - update tests for sql server --- .../java/org/tests/m2m/TestM2MDistinct_sqlServer.java | 4 ++-- .../src/test/java/org/tests/model/cache/EColAB.java | 6 +++--- .../java/org/tests/model/json/TestJacksonPlainBean.java | 9 +++++++-- .../test/java/org/tests/query/TestQueryFilterMany.java | 6 +++++- .../java/org/tests/softdelete/TestSoftDeleteBasic.java | 4 ++-- .../softdelete/TestSoftDeleteOptionalRelationship.java | 6 +++++- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index 29c216ce7..d06989acb 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -29,8 +29,8 @@ public class TestM2MDistinct_sqlServer extends BaseTestCase { List sqls = LoggedSql.stop(); assertThat(sqls.get(0)).startsWith("select distinct t0.id, t0.name, t0.version, t0.tenant_id, t0.name collate Latin1_General_CI_AS " - + "from mt_role t0 join mt_role_permission u1z_ on u1z_.mt_role_id = t0.id " - + "join mt_permission u1 on u1.id = u1z_.mt_permission_id where u1.id = ? " + + "from mt_role t0 join mt_role_permission u1z_ on u1z_.mt_role_id = t0.id " + + "join mt_permission u1 on u1.id = u1z_.mt_permission_id where u1.id = ? " + "order by t0.name collate Latin1_General_CI_AS;"); } } diff --git a/ebean-core/src/test/java/org/tests/model/cache/EColAB.java b/ebean-core/src/test/java/org/tests/model/cache/EColAB.java index f3a7377b7..763d70e6c 100644 --- a/ebean-core/src/test/java/org/tests/model/cache/EColAB.java +++ b/ebean-core/src/test/java/org/tests/model/cache/EColAB.java @@ -13,7 +13,7 @@ import javax.persistence.Table; public class EColAB extends Model { @Id - private Long id; + private Integer id; private String columnA; @@ -24,11 +24,11 @@ public class EColAB extends Model { this.columnB = columnB; } - public Long getId() { + public Integer getId() { return id; } - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index b2237731d..2a7456b07 100644 --- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -1,12 +1,13 @@ package org.tests.model.json; +import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class TestJacksonPlainBean { +public class TestJacksonPlainBean extends BaseTestCase { @Test public void insertNullStayNull() { @@ -46,7 +47,11 @@ public class TestJacksonPlainBean { bean.setPlainBean2(new PlainBean("bar", 27)); DB.save(bean); - expectedSql(0, "insert into ebasic_plain (attr, plain_bean, plain_bean2, version) values (?,?,?,?)"); + if (isSqlServer()) { + expectedSql(0, "insert into ebasic_plain (id, attr, plain_bean, plain_bean2, version) values (?,?,?,?,?)"); + } else { + expectedSql(0, "insert into ebasic_plain (attr, plain_bean, plain_bean2, version) values (?,?,?,?)"); + } // inserted plainBean has not been mutated bean.setAttr("attr1"); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java index 92c334ed0..eafadf8b8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -302,6 +302,10 @@ public class TestQueryFilterMany extends BaseTestCase { List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|' ) order by t0.id; --bind(rob%)"); + if (isSqlServer()) { + assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? ) order by t0.id; --bind(rob%)"); + } else { + assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|' ) order by t0.id; --bind(rob%)"); + } } } diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 3364417b9..4f271f0f6 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -241,7 +241,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { .query(); List list = query.findList(); - if (isMySql() || isMariaDB()) { + if (isMySql() || isMariaDB() || isSqlServer()) { assertSql(query).contains("t0.deleted = 0"); assertSql(query).contains("u1.deleted = 0"); } else { @@ -277,7 +277,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { List list = query.findList(); // Make sure that query includes that the child mustn't've been deleted - if (isMySql() || isMariaDB()) { + if (isMySql() || isMariaDB() || isSqlServer()) { assertSql(query).contains("u1.deleted = 0"); assertSql(query).contains("u2.deleted = 0"); } else { diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index b4e320b21..8f730921a 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -60,7 +60,11 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { final List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where"); + if (isSqlServer()) { + assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where"); + } else { + assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where"); + } } } From da6f7d671b8b777ca3f42f2534b307d516060280 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 31 Aug 2021 14:26:52 +1200 Subject: [PATCH 003/102] #2336 - @DbArray List or Set of UUID or enum returned as String (not converted) when DB does not support ARRAY --- .../server/type/DefaultTypeManager.java | 32 ++++--------- .../type/PlatformArrayTypeJsonList.java | 41 ++++++++++++++++ .../server/type/PlatformArrayTypeJsonSet.java | 41 ++++++++++++++++ .../server/type/ScalarTypeJsonList.java | 48 ++++++++++++++++++- .../server/type/ScalarTypeJsonSet.java | 47 +++++++++++++++++- .../tests/model/array/TestDbArray_asSet.java | 10 ++-- .../tests/model/array/TestDbArray_basic.java | 9 ++-- 7 files changed, 193 insertions(+), 35 deletions(-) create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index d58c284f3..5d95efd6e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -162,30 +162,22 @@ public final class DefaultTypeManager implements TypeManager { } } - /** - * Return the factory to use to support DB ARRAY types. - */ private PlatformArrayTypeFactory arrayTypeListFactory(DatabasePlatform databasePlatform) { if (databasePlatform.isNativeArrayType()) { return ScalarTypeArrayList.factory(); } else if (databasePlatform.isPlatform(Platform.H2)) { return ScalarTypeArrayListH2.factory(); } - // not supported for this DB platform - return null; + return new PlatformArrayTypeJsonList(); } - /** - * Return the factory to use to support DB ARRAY types. - */ private PlatformArrayTypeFactory arrayTypeSetFactory(DatabasePlatform databasePlatform) { if (databasePlatform.isNativeArrayType()) { return ScalarTypeArraySet.factory(); } else if (databasePlatform.isPlatform(Platform.H2)) { return ScalarTypeArraySetH2.factory(); } - // not supported for this DB platform - return null; + return new PlatformArrayTypeJsonSet(); } /** @@ -305,25 +297,17 @@ public final class DefaultTypeManager implements TypeManager { } private ScalarType getArrayScalarTypeSet(Type valueType, boolean nullable) { - if (arrayTypeSetFactory != null) { - if (isEnumType(valueType)) { - return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable); - } - return arrayTypeSetFactory.typeFor(valueType, nullable); + if (isEnumType(valueType)) { + return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable); } - // fallback to JSON storage in VARCHAR column - return new ScalarTypeJsonSet.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray? + return arrayTypeSetFactory.typeFor(valueType, nullable); } private ScalarType getArrayScalarTypeList(Type valueType, boolean nullable) { - if (arrayTypeListFactory != null) { - if (isEnumType(valueType)) { - return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable); - } - return arrayTypeListFactory.typeFor(valueType, nullable); + if (isEnumType(valueType)) { + return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable); } - // fallback to JSON storage in VARCHAR column - return new ScalarTypeJsonList.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray? + return arrayTypeListFactory.typeFor(valueType, nullable); } private Class> asEnumClass(Type valueType) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java new file mode 100644 index 000000000..8b3232b28 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java @@ -0,0 +1,41 @@ +package io.ebeaninternal.server.type; + +import io.ebean.core.type.DocPropertyType; +import io.ebean.core.type.ScalarType; + +import java.lang.reflect.Type; +import java.util.UUID; + +/** + * Fallback for DbArray as Json List. + */ +class PlatformArrayTypeJsonList implements PlatformArrayTypeFactory { + + private DocPropertyType docType(Type valueType) { + if (valueType.equals(Long.class)) { + return DocPropertyType.LONG; + } + if (valueType.equals(Integer.class)) { + return DocPropertyType.INTEGER; + } + if (valueType.equals(Double.class)) { + return DocPropertyType.DOUBLE; + } + return DocPropertyType.TEXT; + } + + @Override + public ScalarType typeFor(Type valueType, boolean nullable) { + if (valueType.equals(UUID.class)) { + // TODO: keepSource for @DbArray? + return new ScalarTypeJsonList.VarcharWithConverter(DocPropertyType.UUID, nullable, false, ArrayElementConverter.UUID); + } + return new ScalarTypeJsonList.Varchar(docType(valueType), nullable, false); + } + + @Override + public ScalarType typeForEnum(ScalarType scalarType, boolean nullable) { + final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType); + return new ScalarTypeJsonList.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter); + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java new file mode 100644 index 000000000..a5c7595f7 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java @@ -0,0 +1,41 @@ +package io.ebeaninternal.server.type; + +import io.ebean.core.type.DocPropertyType; +import io.ebean.core.type.ScalarType; + +import java.lang.reflect.Type; +import java.util.UUID; + +/** + * Fallback for DbArray as Json Set. + */ +class PlatformArrayTypeJsonSet implements PlatformArrayTypeFactory { + + private DocPropertyType docType(Type valueType) { + if (valueType.equals(Long.class)) { + return DocPropertyType.LONG; + } + if (valueType.equals(Integer.class)) { + return DocPropertyType.INTEGER; + } + if (valueType.equals(Double.class)) { + return DocPropertyType.DOUBLE; + } + return DocPropertyType.TEXT; + } + + @Override + public ScalarType typeFor(Type valueType, boolean nullable) { + if (valueType.equals(UUID.class)) { + // TODO: keepSource for @DbArray? + return new ScalarTypeJsonSet.VarcharWithConverter(DocPropertyType.UUID, nullable, false, ArrayElementConverter.UUID); + } + return new ScalarTypeJsonSet.Varchar(docType(valueType), nullable, false); + } + + @Override + public ScalarType typeForEnum(ScalarType scalarType, boolean nullable) { + final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType); + return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter); + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index 71179dba7..4abd85931 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -9,11 +9,13 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarType; import io.ebean.text.TextException; import io.ebean.text.json.EJson; +import io.ebeaninternal.json.ModifyAwareList; import javax.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; +import java.util.ArrayList; import java.util.List; /** @@ -36,6 +38,46 @@ final class ScalarTypeJsonList { return new ScalarTypeJsonList.Varchar(docType, nullable, keepSource); } + @SuppressWarnings("rawtypes") + static final class VarcharWithConverter extends ScalarTypeJsonList.Base { + private final ArrayElementConverter converter; + + VarcharWithConverter(DocPropertyType docType, boolean nullable, boolean keepSource, ArrayElementConverter converter) { + super(Types.VARCHAR, docType, nullable, keepSource); + this.converter = converter; + } + + @Override + List readJsonConvert(String json) { + try { + return convertElements(EJson.parseList(json, false)); + } catch (IOException e) { + throw new TextException("Failed to parse JSON [{}] as List", json, e); + } + } + + @SuppressWarnings("unchecked") + private List convertElements(List rawList) { + if (rawList == null) { + return null; + } + final List result = new ArrayList<>(rawList.size()); + for (Object o : rawList) { + result.add(converter.fromSerialized(o)); + } + return new ModifyAwareList(result); + } + + @Override + public List parse(String value) { + try { + return convertElements(EJson.parseList(value, false)); + } catch (IOException e) { + throw new TextException("Failed to parse JSON [{}] as List", value, e); + } + } + } + /** * List mapped to DB VARCHAR. */ @@ -86,6 +128,10 @@ final class ScalarTypeJsonList { if (keepSource) { reader.pushJson(json); } + return readJsonConvert(json); + } + + List readJsonConvert(String json) { try { // parse JSON into modifyAware list return EJson.parseList(json, true); @@ -130,7 +176,7 @@ final class ScalarTypeJsonList { } @Override - public final List parse(String value) { + public List parse(String value) { try { return EJson.parseList(value, false); } catch (IOException e) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 50cc7f0b3..354d793d7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -9,6 +9,7 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarType; import io.ebean.text.TextException; import io.ebean.text.json.EJson; +import io.ebeaninternal.json.ModifyAwareSet; import javax.persistence.PersistenceException; import java.io.IOException; @@ -38,6 +39,45 @@ final class ScalarTypeJsonSet { return new ScalarTypeJsonSet.Varchar(docPropertyType, nullable, keepSource); } + @SuppressWarnings("rawtypes") + static final class VarcharWithConverter extends ScalarTypeJsonSet.Base { + private final ArrayElementConverter converter; + + VarcharWithConverter(DocPropertyType docType, boolean nullable, boolean keepSource, ArrayElementConverter converter) { + super(Types.VARCHAR, docType, nullable, keepSource); + this.converter = converter; + } + + @Override + Set readJsonConvert(String json) { + try { + return convertElements(EJson.parseSet(json, false)); + } catch (IOException e) { + throw new TextException("Failed to parse JSON [{}] as List", json, e); + } + } + + @SuppressWarnings("unchecked") + private Set convertElements(Set rawSet) { + if (rawSet == null) { + return null; + } + final Set result = new LinkedHashSet(rawSet.size()); + for (Object o : rawSet) { + result.add(converter.fromSerialized(o)); + } + return new ModifyAwareSet(result); + } + + @Override + public Set parse(String value) { + try { + return convertElements(EJson.parseSet(value, false)); + } catch (IOException e) { + throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e); + } + } + } /** * List mapped to DB VARCHAR. */ @@ -86,8 +126,11 @@ final class ScalarTypeJsonSet { if (keepSource) { reader.pushJson(json); } + return readJsonConvert(json); + } + + Set readJsonConvert(String json) { try { - // parse JSON into modifyAware list return EJson.parseSet(json, true); } catch (IOException e) { throw new TextException("Failed to parse JSON [{}] as Set", json, e); @@ -130,7 +173,7 @@ final class ScalarTypeJsonSet { } @Override - public final Set parse(String value) { + public Set parse(String value) { try { return convertList(EJson.parseList(value)); } catch (IOException e) { diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 36b917c36..5c1791056 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -179,11 +179,13 @@ public class TestDbArray_asSet extends BaseTestCase { Ebean.save(bean); // load cache - Ebean.find(EArraySetBean.class, bean.getId()); + final EArraySetBean entry = Ebean.find(EArraySetBean.class, bean.getId()); + assertThat(entry.getUids()).hasSameElementsAs(uids); + assertThat(entry.getStatus()).hasSameElementsAs(statuses); + // hit cache EArraySetBean found = Ebean.find(EArraySetBean.class, bean.getId()); - - assertThat(found.getUids()).isEqualTo(uids); - assertThat(found.getStatus()).isEqualTo(statuses); + assertThat(found.getUids()).hasSameElementsAs(uids); + assertThat(found.getStatus()).hasSameElementsAs(statuses); } } diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java index a3b5ad3d0..f6c7b7da1 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -268,11 +268,12 @@ public class TestDbArray_basic extends BaseTestCase { DB.save(bean); // load cache - DB.find(EArrayBean.class, bean.getId()); + final EArrayBean entry = DB.find(EArrayBean.class, bean.getId()); + assertThat(entry.getUids()).hasSameElementsAs(uids); + assertThat(entry.getStatuses()).hasSameElementsAs(statuses); // hit cache EArrayBean found = DB.find(EArrayBean.class, bean.getId()); - - assertThat(found.getUids()).isEqualTo(uids); - assertThat(found.getStatuses()).isEqualTo(statuses); + assertThat(found.getUids()).hasSameElementsAs(uids); + assertThat(found.getStatuses()).hasSameElementsAs(statuses); } } From 172c1d10a18a31f93380bc894e8d1ed0eaadc729 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 31 Aug 2021 14:28:54 +1200 Subject: [PATCH 004/102] Tidy test only - tidy TestDbArray_asSet --- .../tests/model/array/TestDbArray_asSet.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 5c1791056..907bac4ac 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -1,7 +1,7 @@ package org.tests.model.array; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; public class TestDbArray_asSet extends BaseTestCase { - private EArraySetBean bean = new EArraySetBean(); + private final EArraySetBean bean = new EArraySetBean(); private EArraySetBean found; @@ -51,14 +51,14 @@ public class TestDbArray_asSet extends BaseTestCase { status.add(EArrayBean.Status.TWO); bean.setStatus(status); - Ebean.save(bean); + DB.save(bean); - found = Ebean.find(EArraySetBean.class, bean.getId()); + found = DB.find(EArraySetBean.class, bean.getId()); assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823"); if (isPostgres()) { - Query query = Ebean.find(EArraySetBean.class) + Query query = DB.find(EArraySetBean.class) .where() .arrayContains("otherIds", 96L, 97L) .arrayContains("uids", first) @@ -74,7 +74,7 @@ public class TestDbArray_asSet extends BaseTestCase { assertSql(query).contains(" coalesce(cardinality(t0.phone_numbers),0) <> 0"); assertThat(list).hasSize(1); - query = Ebean.find(EArraySetBean.class) + query = DB.find(EArraySetBean.class) .where() .arrayIsEmpty("otherIds") .arrayNotContains("uids", first) @@ -93,11 +93,11 @@ public class TestDbArray_asSet extends BaseTestCase { //@Test//(dependsOnMethods = "insert") public void json_parse_format() { - String asJson = Ebean.json().toJson(found); + String asJson = DB.json().toJson(found); assertThat(asJson).contains("\"phoneNumbers\":[\"4321\",\"9823\"]"); assertThat(asJson).contains("\"id\":"); - EArraySetBean fromJson = Ebean.json().toBean(EArraySetBean.class, asJson); + EArraySetBean fromJson = DB.json().toBean(EArraySetBean.class, asJson); assertEquals(found.getId(), fromJson.getId()); assertEquals(found.getId(), fromJson.getId()); assertEquals(found.getName(), fromJson.getName()); @@ -109,7 +109,7 @@ public class TestDbArray_asSet extends BaseTestCase { found.setName("jack"); LoggedSqlCollector.start(); - Ebean.save(found); + DB.save(found); List sql = LoggedSqlCollector.stop(); // we don't update the phone numbers (as they are not dirty) @@ -123,7 +123,7 @@ public class TestDbArray_asSet extends BaseTestCase { found.getUids().add(UUID.randomUUID()); LoggedSqlCollector.start(); - Ebean.save(found); + DB.save(found); List sql = LoggedSqlCollector.stop(); assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where"); @@ -139,8 +139,8 @@ public class TestDbArray_asSet extends BaseTestCase { bean.setOtherIds(null); bean.setUids(null); - Ebean.save(bean); - Ebean.delete(bean); + DB.save(bean); + DB.delete(bean); } @Test @@ -156,8 +156,8 @@ public class TestDbArray_asSet extends BaseTestCase { Set all = new HashSet<>(); all.add(bean); - Ebean.saveAll(all); - Ebean.deleteAll(all); + DB.saveAll(all); + DB.deleteAll(all); } @Test @@ -177,14 +177,14 @@ public class TestDbArray_asSet extends BaseTestCase { bean.setUids(uids); bean.setStatus(statuses); - Ebean.save(bean); + DB.save(bean); // load cache - final EArraySetBean entry = Ebean.find(EArraySetBean.class, bean.getId()); + final EArraySetBean entry = DB.find(EArraySetBean.class, bean.getId()); assertThat(entry.getUids()).hasSameElementsAs(uids); assertThat(entry.getStatus()).hasSameElementsAs(statuses); // hit cache - EArraySetBean found = Ebean.find(EArraySetBean.class, bean.getId()); + EArraySetBean found = DB.find(EArraySetBean.class, bean.getId()); assertThat(found.getUids()).hasSameElementsAs(uids); assertThat(found.getStatus()).hasSameElementsAs(statuses); } From aa27aedca97236825ae978b3a39c23cacebb49bb Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 31 Aug 2021 17:21:52 +1200 Subject: [PATCH 005/102] [maven-release-plugin] prepare release ebean-parent-12.11.2 --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index b6adad05d..9745a7ce7 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index c244053d2..f311eea17 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.2 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 6468059fe..64b9947af 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-api - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-core-type - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-ddl-generator - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-externalmapping-api - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-externalmapping-xml - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-autotune - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-querybean - 12.11.2-SNAPSHOT + 12.11.2 io.ebean querybean-generator - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean kotlin-querybean-generator - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean ebean-test - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean ebean-postgis - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-redis - 12.11.2-SNAPSHOT + 12.11.2 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 10c45ea74..ef4b45445 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.2-SNAPSHOT + 12.11.2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 66eb107fb..495c59f15 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.2 @@ -78,19 +78,19 @@ io.ebean ebean-api - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-core-type - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-externalmapping-api - 12.11.2-SNAPSHOT + 12.11.2 diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e454770b8..b10976b3d 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index c2ea63651..470c49fce 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index b62c33793..d64653732 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.2 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.2-SNAPSHOT + 12.11.2 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean ebean-ddl-generator - 12.11.2-SNAPSHOT + 12.11.2 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 42b18f4f1..8b7029ff7 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.2-SNAPSHOT + 12.11.2 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a91cdb4ef..867a485ff 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean querybean-generator - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean ebean-test - 12.11.2-SNAPSHOT + 12.11.2 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 835a05812..bae231e85 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean ebean-querybean - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean querybean-generator - 12.11.2-SNAPSHOT + 12.11.2 test io.ebean ebean-test - 12.11.2-SNAPSHOT + 12.11.2 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 894f7f1b9..c80b9cc27 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 provided io.ebean ebean-ddl-generator - 12.11.2-SNAPSHOT + 12.11.2 diff --git a/ebean/pom.xml b/ebean/pom.xml index b17e93449..69901301e 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 io.ebean ebean-querybean - 12.11.2-SNAPSHOT + 12.11.2 diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 68601c019..6f8b62397 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.2-SNAPSHOT + 12.11.2 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.2-SNAPSHOT + 12.11.2 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.2-SNAPSHOT + 12.11.2 test diff --git a/pom.xml b/pom.xml index 9e8ae831a..06ad4a27f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.2-SNAPSHOT + 12.11.2 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.2 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 1cf09f8be..5219348aa 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2-SNAPSHOT + 12.11.2 querybean generator From c0007d3c1a2b71c0b0c454b3b3f1074b9904d26f Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 31 Aug 2021 17:21:59 +1200 Subject: [PATCH 006/102] [maven-release-plugin] prepare for next development iteration --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 9745a7ce7..9bb40a671 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index f311eea17..79101340c 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.2 + ebean-parent-12.8.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 64b9947af..5cd61b30c 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-api - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-core-type - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-ddl-generator - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-autotune - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-querybean - 12.11.2 + 12.11.3-SNAPSHOT io.ebean querybean-generator - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean ebean-test - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean ebean-postgis - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-redis - 12.11.2 + 12.11.3-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index ef4b45445..ebe821cc6 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.2 + 12.11.3-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 495c59f15..3ca1e8a3b 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.2 + ebean-parent-12.8.0 @@ -78,19 +78,19 @@ io.ebean ebean-api - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-core-type - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.2 + 12.11.3-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index b10976b3d..44cdee7e6 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 470c49fce..f620a73b1 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index d64653732..8fc4b1715 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.2 + ebean-parent-12.8.0 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.2 + 12.11.3-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean ebean-ddl-generator - 12.11.2 + 12.11.3-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 8b7029ff7..5fc612855 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.2 + 12.11.3-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 867a485ff..946d9c61a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean querybean-generator - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean ebean-test - 12.11.2 + 12.11.3-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index bae231e85..0006d6a65 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean ebean-querybean - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean querybean-generator - 12.11.2 + 12.11.3-SNAPSHOT test io.ebean ebean-test - 12.11.2 + 12.11.3-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c80b9cc27..c8c51c856 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.11.2 + 12.11.3-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 69901301e..dcd62a0d1 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT io.ebean ebean-querybean - 12.11.2 + 12.11.3-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 6f8b62397..b573491cb 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.2 + 12.11.3-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.2 + 12.11.3-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.2 + 12.11.3-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 06ad4a27f..02228496e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.2 + 12.11.3-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.2 + ebean-parent-12.8.0 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 5219348aa..540ef7273 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.2 + 12.11.3-SNAPSHOT querybean generator From 847ce5db884955e9f7271cddfb71b4aca1edce34 Mon Sep 17 00:00:00 2001 From: Ryszard Trojnacki Date: Tue, 31 Aug 2021 11:34:35 +0200 Subject: [PATCH 007/102] Added PByteArray query bean type for byte[] column type. --- .../java/io/ebean/typequery/PByteArray.java | 27 +++++++ .../java/org/example/domain/Customer.java | 12 +++ .../org/querytest/QCustomerByteArrayTest.java | 77 +++++++++++++++++++ .../querybean/generator/PropertyTypeMap.java | 1 + .../querybean/generator/PropertyTypeMap.java | 1 + 5 files changed, 118 insertions(+) create mode 100644 ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java create mode 100644 ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java b/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java new file mode 100644 index 000000000..222215887 --- /dev/null +++ b/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java @@ -0,0 +1,27 @@ +package io.ebean.typequery; + +/** + * Byte array property (byte[]). + * + * @param the root query bean type + */ +public class PByteArray extends PBaseValueEqual { + /** + * Construct with a property name and root instance. + * + * @param name property name + * @param root the root query bean instance + */ + public PByteArray(String name, R root) { + super(name, root); + } + + /** + * Construct with additional path prefix. + */ + public PByteArray(String name, R root, String prefix) { + super(name, root, prefix); + } + + +} diff --git a/ebean-querybean/src/test/java/org/example/domain/Customer.java b/ebean-querybean/src/test/java/org/example/domain/Customer.java index 36d3fa840..453b71818 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Customer.java +++ b/ebean-querybean/src/test/java/org/example/domain/Customer.java @@ -13,6 +13,7 @@ import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; +import javax.persistence.Lob; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -68,6 +69,9 @@ public class Customer extends BaseModel { @OneToMany(mappedBy = "customer", cascade = CascadeType.PERSIST) List contacts; + @Column @Lob + byte[] photo; + public Status getStatus() { return status; } @@ -156,6 +160,14 @@ public class Customer extends BaseModel { this.email = email; } + public byte[] getPhoto() { + return photo; + } + + public void setPhoto(byte[] photo) { + this.photo = photo; + } + /** * Helper method to add a contact to the customer. */ diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java new file mode 100644 index 000000000..3496172a1 --- /dev/null +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java @@ -0,0 +1,77 @@ +package org.querytest; + +import io.ebean.DB; +import io.ebean.Database; +import org.example.domain.Customer; +import org.example.domain.query.QCustomer; +import org.junit.Test; +import org.junit.Assert; + +import java.util.List; + +public class QCustomerByteArrayTest { + @Test + public void testIsNull() { + final byte[] photo1= new byte[] { 0x05, 0x10, 0x20, 0x30 }; + final byte[] photo2=new byte[] { 0x50, 0x55, 0x60, 0x70, 0x10 }; + final Database db=DB.getDefault(); + final String noPhoto="no_photo_client"; + final String wPhoto1="with_photo1_client"; + final String wPhoto2="with_photo2_client"; + + Customer c; + + c=new Customer(); + c.setName(noPhoto); + c.save(); + + c=new Customer(); + c.setName(wPhoto1); + c.setPhoto(photo1); + c.save(); + + c=new Customer(); + c.setName(wPhoto2); + c.setPhoto(photo2); + c.save(); + + Assert.assertNotNull(new QCustomer(db).name.eq(noPhoto).photo.isNull().findOne()); + // Assert.assertNotNull(new QCustomer(db).name.eq(noPhoto).photo.ne(photo1).findOne()); // Fails + Assert.assertNull(new QCustomer(db).name.eq(noPhoto).photo.isNotNull().findOne()); + Assert.assertNull(new QCustomer(db).name.eq(noPhoto).photo.eq(photo1).findOne()); + + + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.isNotNull().findOne()); + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo1).findOne()); + Assert.assertNotNull(new QCustomer(db).photo.eq(photo1).findOne()); + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo2).findOne()); + + Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.isNull().findOne()); + Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo2).findOne()); + Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo1).findOne()); + + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.isNotNull().findOne()); + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo2).findOne()); + Assert.assertNotNull(new QCustomer(db).photo.eq(photo2).findOne()); + Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo1).findOne()); + + Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.isNull().findOne()); + Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo1).findOne()); + Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo2).findOne()); + + Assert.assertEquals(2, new QCustomer(db).photo.in(photo1, photo2).findList().size()); + + + List ordered = new QCustomer(db).name.in(wPhoto1, wPhoto2).photo.desc().findList(); + Assert.assertEquals(wPhoto2, ordered.get(0).getName()); + Assert.assertArrayEquals(photo2, ordered.get(0).getPhoto()); + Assert.assertEquals(wPhoto1, ordered.get(1).getName()); + Assert.assertArrayEquals(photo1, ordered.get(1).getPhoto()); + + ordered = new QCustomer(db).name.in(wPhoto1, wPhoto2).photo.asc().findList(); + Assert.assertEquals(wPhoto2, ordered.get(1).getName()); + Assert.assertArrayEquals(photo2, ordered.get(1).getPhoto()); + Assert.assertEquals(wPhoto1, ordered.get(0).getName()); + Assert.assertArrayEquals(photo1, ordered.get(0).getPhoto()); + } +} diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java index 6afc8a6e3..28e78afa7 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java @@ -55,6 +55,7 @@ class PropertyTypeMap { map.put("java.lang.Class", new PropertyType("PClass")); addType(Locale.class); addType(File.class); + map.put("byte[]", new PropertyType("PByteArray")); addType(InetAddress.class); map.put(URI.class.getName(), new PropertyType("PUri")); map.put(URL.class.getName(), new PropertyType("PUrl")); diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java index fa35c72fa..848f37791 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java @@ -55,6 +55,7 @@ class PropertyTypeMap { addType(Locale.class); map.put("java.lang.Class", new PropertyType("PClass")); addType(File.class); + map.put("byte[]", new PropertyType("PByteArray")); addType(InetAddress.class); map.put(URI.class.getName(), new PropertyType("PUri")); map.put(URL.class.getName(), new PropertyType("PUrl")); From 5d84f101106d0986d31d64ec6cc6d814009d272c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 1 Sep 2021 09:44:31 +0200 Subject: [PATCH 008/102] NEW DeleteIdRequest can return beantype. Also provide alternative for deprecated 'getEbeanServer' --- .../java/io/ebean/event/BeanDeleteIdRequest.java | 14 ++++++++++++++ .../server/persist/DefaultPersister.java | 2 +- .../server/persist/DeleteIdRequest.java | 9 ++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java index 795886830..c86ff6c87 100644 --- a/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java +++ b/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java @@ -1,5 +1,6 @@ package io.ebean.event; +import io.ebean.Database; import io.ebean.EbeanServer; import io.ebean.Transaction; @@ -10,13 +11,26 @@ public interface BeanDeleteIdRequest { /** * Return the server processing the request. + * @deprecated use {@link #getDatabase()} */ EbeanServer getEbeanServer(); + /** + * Return the DB processing the request. + */ + default Database getDatabase() { + return getEbeanServer(); + } + /** * Return the Transaction associated with this request. */ Transaction getTransaction(); + + /** + * Returns the bean type of the bean being deleted. + */ + Class getBeanType(); /** * Returns the Id value of the bean being deleted. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index c63b7ed9a..b21fc286c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -824,7 +824,7 @@ public final class DefaultPersister implements Persister { BeanPersistController controller = descriptor.getPersistController(); if (controller != null) { - DeleteIdRequest request = new DeleteIdRequest(server, transaction, id); + DeleteIdRequest request = new DeleteIdRequest(server, transaction, descriptor.getBeanType(), id); if (idList == null) { controller.preDelete(request); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java index 760d9eda3..e98a7919e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java @@ -9,11 +9,13 @@ final class DeleteIdRequest implements BeanDeleteIdRequest { private final EbeanServer server; private final Transaction transaction; + private Class beanType; private Object id; - DeleteIdRequest(SpiEbeanServer server, Transaction transaction, Object id) { + DeleteIdRequest(SpiEbeanServer server, Transaction transaction, Class beanType, Object id) { this.server = server; this.transaction = transaction; + this.beanType = beanType; this.id = id; } @@ -30,6 +32,11 @@ final class DeleteIdRequest implements BeanDeleteIdRequest { public Transaction getTransaction() { return transaction; } + + @Override + public Class getBeanType() { + return beanType; + } @Override public Object getId() { From b2bfca7ec67454f9ee09f878db7109b82d9fb685 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 1 Sep 2021 09:58:27 +0200 Subject: [PATCH 009/102] no effective code change: Add missing @Override annotation and removed duplicate methods in interfaces --- .../src/main/java/io/ebeaninternal/api/SpiDtoQuery.java | 5 ----- .../main/java/io/ebeaninternal/api/SpiExpressionList.java | 4 ---- .../java/io/ebeaninternal/server/core/DtoQueryRequest.java | 1 + .../ebeaninternal/server/core/PersistRequestUpdateSql.java | 1 + .../io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java | 4 ++++ .../io/ebeaninternal/server/persist/DefaultPersister.java | 1 + .../java/io/ebeaninternal/server/profile/DCountMetric.java | 1 + .../io/ebeaninternal/server/profile/DProfileLocation.java | 1 + .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java | 1 + .../server/transaction/DefaultPersistenceContext.java | 1 + .../ebeaninternal/server/transaction/TransactionManager.java | 1 + .../io/ebeaninternal/server/type/ArrayElementConverter.java | 1 + .../io/ebeaninternal/server/type/ScalarTypeLocalDate.java | 1 + .../io/ebeaninternal/server/type/ScalarTypeUtilDate.java | 1 + .../elementcollection/TestElementCollectionBasicCache.java | 1 + .../TestElementCollectionBasicMapCache.java | 1 + .../dbmigration/ddlgeneration/platform/PostgresDdl.java | 1 + 17 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java index 16cee411c..cc64fb097 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java @@ -36,11 +36,6 @@ public interface SpiDtoQuery extends DtoQuery, SpiSqlBinding { */ boolean isRelaxedMode(); - /** - * Return the label for the query. - */ - String getLabel(); - /** * Return the label with fallback to profile location label. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java index c4764b30f..5c4ce37ed 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java @@ -44,8 +44,4 @@ public interface SpiExpressionList extends ExpressionList, SpiExpression { // do nothing by default } - /** - * Apply property prefix when filterMany expressions included in main query. - */ - void prefixProperty(String path); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index c023f2d0d..e03ce40ce 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -114,6 +114,7 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { return queryEngine.findList(this); } + @Override public boolean next() throws SQLException { query.checkCancelled(); return dataReader.next(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index f16a9d7cd..ae16bbd4b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -145,6 +145,7 @@ public final class PersistRequestUpdateSql extends PersistRequest { this.bindLog = bindLog; } + @Override public void startBind(boolean batchThisRequest) { this.batchThisRequest = batchThisRequest; super.startBind(batchThisRequest); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 3b3c5946c..768cba19c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -154,6 +154,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr /** * Return the property value as an entity bean. */ + @Override public EntityBean getValueAsEntityBean(EntityBean owner) { return (EntityBean) getValue(owner); } @@ -203,6 +204,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } } + @Override Object naturalKeyVal(Map values) { EntityBean bean = (EntityBean) values.get(name); if (bean == null) { @@ -339,6 +341,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } } + @Override public boolean hasForeignKey() { return foreignKey == null || primaryKeyJoin || !foreignKey.isNoConstraint(); } @@ -402,6 +405,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr /** * Return the bean cache value for this property using original values. */ + @Override public Object getCacheDataValueOrig(EntityBeanIntercept ebi) { return cacheDataConvert(ebi.getOrigValue(propertyIndex)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index c63b7ed9a..34026b61a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -150,6 +150,7 @@ public final class DefaultPersister implements Persister { /** * Add to the flush queue in position 0, 1 or 2. */ + @Override public void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, int pos) { new PersistRequestUpdateSql(server, update, t, persistExecute).addToFlushQueue(pos); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java index 693aa5de8..ba74a5e65 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java @@ -26,6 +26,7 @@ final class DCountMetric implements CountMetric { count.add(value); } + @Override public void increment() { count.increment(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java index df4c44c56..684cd1a00 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java @@ -82,6 +82,7 @@ class DProfileLocation implements ProfileLocation { } } + @Override public void setTraceCount(int traceCount) { this.traceCount = traceCount; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 65ba6b9a3..daca677b4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1339,6 +1339,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< return fetchInternal(path, null, FETCH_QUERY); } + @Override public Query fetchCache(String path) { return fetchInternal(path, null, FETCH_CACHE); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index 1064bf8bc..20b6d8a2a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -65,6 +65,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { return new DefaultPersistenceContext(this, false); } + @Override public boolean resetLimit() { lock.lock(); try { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 37a53f680..81a840dbf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -201,6 +201,7 @@ public class TransactionManager implements SpiTransactionManager { /** * Return the scope manager. */ + @Override public final TransactionScopeManager scope() { return scopeManager; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java index f2c2c1ee7..372de8c86 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java @@ -104,6 +104,7 @@ interface ArrayElementConverter { */ class StringConverter implements ArrayElementConverter { + @Override public String fromDbArray(Object rawValue) { return (String) rawValue; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java index 286818c37..630fe73a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java @@ -19,6 +19,7 @@ final class ScalarTypeLocalDate extends ScalarTypeBaseDate { super(mode, LocalDate.class, false, Types.DATE); } + @Override protected String toIsoFormat(LocalDate value) { return value.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java index 3a816d498..725d76055 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java @@ -95,6 +95,7 @@ final class ScalarTypeUtilDate { super(mode, Date.class, false, Types.DATE); } + @Override protected String toIsoFormat(java.util.Date value) { return UtilDateParser.format(value); } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index eaebe3f78..3e03fb46c 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -90,6 +90,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { LoggedSqlCollector.stop(); } + @Override public boolean isPersistBatchOnCascade() { return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 2da2d9d1f..a73e62c47 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -96,6 +96,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { LoggedSqlCollector.stop(); } + @Override public boolean isPersistBatchOnCascade() { return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java index 807bec456..734621a66 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java @@ -24,6 +24,7 @@ public class PostgresDdl extends PlatformDdl { this.indexConcurrent = "concurrently "; } + @Override public String setLockTimeout(int lockTimeoutSeconds) { return "set lock_timeout = " + (lockTimeoutSeconds * 1000); } From 47c9a434bb69658ee42e3a09a39aa65a57693551 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 2 Sep 2021 10:15:33 +1200 Subject: [PATCH 010/102] Test tidy - remove @Cache from Order model --- .../java/org/tests/model/basic/Order.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-core/src/test/java/org/tests/model/basic/Order.java index cea0a6e00..dfb9f2aef 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Order.java @@ -1,26 +1,8 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.Formula; -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.Where; +import io.ebean.annotation.*; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; @@ -31,7 +13,6 @@ import java.util.List; /** * Order entity bean. */ -@Cache @DocStore @ChangeLog @Entity From 1062adede49baca06d490720f6c7b0da32165dcc Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 2 Sep 2021 10:26:14 +1200 Subject: [PATCH 011/102] No effective change - change setUseCache(false) to setBeanCacheMode(CacheMode.OFF) --- .../java/io/ebeaninternal/server/core/DefaultBeanLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 4d0409d4c..adc91e5b4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -109,7 +109,7 @@ final class DefaultBeanLoader { } query.where().idEq(parentId); - query.setUseCache(false); + query.setBeanCacheMode(CacheMode.OFF); query.setMode(Mode.LAZYLOAD_MANY); query.setLazyLoadManyPath(many.getName()); query.setPersistenceContext(pc); @@ -235,7 +235,7 @@ final class DefaultBeanLoader { query.setId(id); if (embeddedOwnerIndex > -1 || mode == Mode.REFRESH_BEAN) { // make sure the query doesn't use the cache - query.setUseCache(false); + query.setBeanCacheMode(CacheMode.OFF); } if (ebi.isReadOnly()) { query.setReadOnly(true); From bf3c1629f729727a95f35aba44762b7d1d56d073 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 2 Sep 2021 11:44:51 +1200 Subject: [PATCH 012/102] Allow format() for types Integer and Long to handle string input --- .../server/type/ScalarTypeInteger.java | 5 +++++ .../server/type/ScalarTypeLong.java | 5 +++++ .../server/type/ScalarTypeIntegerTest.java | 22 +++++++++++++++++++ .../server/type/ScalarTypeLongTest.java | 22 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java index 172522224..0e1ef6075 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java @@ -71,6 +71,11 @@ final class ScalarTypeInteger extends ScalarTypeBase { return BasicTypeConverter.toInteger(value); } + @Override + public String format(Object value) { + return String.valueOf(value); + } + @Override public String formatValue(Integer v) { return v.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java index 5287c5fd5..3409cc9ed 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java @@ -46,6 +46,11 @@ final class ScalarTypeLong extends ScalarTypeBase { return BasicTypeConverter.toLong(value); } + @Override + public String format(Object value) { + return String.valueOf(value); + } + @Override public String formatValue(Long t) { return t.toString(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java new file mode 100644 index 000000000..2f4e53cb0 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java @@ -0,0 +1,22 @@ +package io.ebeaninternal.server.type; + + +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ScalarTypeIntegerTest { + + private final ScalarTypeInteger type = new ScalarTypeInteger(); + + @Test + public void format_when_string() { + assertThat(type.format("1")).isEqualTo("1"); + } + + @Test + public void format_when_integer() { + assertThat(type.format(1)).isEqualTo("1"); + } + +} diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java new file mode 100644 index 000000000..d8186457d --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java @@ -0,0 +1,22 @@ +package io.ebeaninternal.server.type; + + +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ScalarTypeLongTest { + + private final ScalarTypeLong type = new ScalarTypeLong(); + + @Test + public void format_when_string() { + assertThat(type.format("1")).isEqualTo("1"); + } + + @Test + public void format_when_long() { + assertThat(type.format(1L)).isEqualTo("1"); + } + +} From 2f18e97a44eaba71b950c0cd8f197bd766a22817 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 2 Sep 2021 11:52:26 +1200 Subject: [PATCH 013/102] Allow format() for types UUID to handle string input --- .../server/type/ScalarTypeUUIDBase.java | 5 ++++ .../server/type/ScalarTypeUUIDBaseTest.java | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java index abf91811b..7da989b82 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java @@ -35,6 +35,11 @@ abstract class ScalarTypeUUIDBase extends ScalarTypeBase implements Scalar return true; } + @Override + public String format(Object value) { + return String.valueOf(value); + } + @Override public String formatValue(UUID value) { return value.toString(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java new file mode 100644 index 000000000..397588994 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java @@ -0,0 +1,23 @@ +package io.ebeaninternal.server.type; + +import org.junit.Test; + +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ScalarTypeUUIDBaseTest { + + private final ScalarTypeUUIDBase type = new ScalarTypeUUIDNative(); + private final UUID uuid = UUID.randomUUID(); + + @Test + public void format_as_uuid() { + assertThat(type.format(uuid)).isEqualTo(uuid.toString()); + } + + @Test + public void format_as_String() { + assertThat(type.format(uuid.toString())).isEqualTo(uuid.toString()); + } +} From d9cef737e33e968562c0a4ca072e0ab57fbcc7b6 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 1 Sep 2021 09:02:01 +1200 Subject: [PATCH 014/102] #2335 Initial test work --- .../model/basic/cache/ESoftWithCache.java | 69 +++++++++++++++++++ .../basic/cache/TestCacheWithSoftDelete.java | 34 +++++++++ 2 files changed, 103 insertions(+) create mode 100644 ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java create mode 100644 ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java new file mode 100644 index 000000000..d570e1e4a --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java @@ -0,0 +1,69 @@ +package org.tests.model.basic.cache; + +import io.ebean.Model; +import io.ebean.annotation.Cache; +import io.ebean.annotation.SoftDelete; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Version; + +@Cache +@Entity +@Table(name = "e_softwithcache") +public class ESoftWithCache extends Model { + + @Id + long id; + + String name; + + String description; + + @SoftDelete + boolean deleted; + + @Version + long version; + + public ESoftWithCache(String name) { + this.name = name; + } + + public long id() { + return id; + } + + public ESoftWithCache id(long id) { + this.id = id; + return this; + } + + public String name() { + return name; + } + + public ESoftWithCache name(String name) { + this.name = name; + return this; + } + + public String description() { + return description; + } + + public ESoftWithCache description(String description) { + this.description = description; + return this; + } + + public long version() { + return version; + } + + public ESoftWithCache version(long version) { + this.version = version; + return this; + } +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java new file mode 100644 index 000000000..a4d8d5b7c --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -0,0 +1,34 @@ +package org.tests.model.basic.cache; + +import io.ebean.BaseTestCase; +import io.ebean.DB; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TestCacheWithSoftDelete extends BaseTestCase { + + @Test + public void idIn_expect_hitCache() { + + ESoftWithCache bean = new ESoftWithCache("hello"); + DB.save(bean); + + final List found = DB.find(ESoftWithCache.class) + .where().idIn(bean.id()) + //.setUseCache(true) + .findList(); + + assertThat(found).hasSize(1); + + final List foundAgain = DB.find(ESoftWithCache.class) + .where().idIn(bean.id()) + //.setUseCache(true) + .findList(); + + assertThat(foundAgain).hasSize(1); + + } +} From 6fe6b8ba646af5d0c3b3b901da2e0a0c71e538b9 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 2 Sep 2021 17:10:56 +1200 Subject: [PATCH 015/102] #2335 - L2 cache be triggered by in ? --- .../io/ebeaninternal/api/LoadBeanRequest.java | 47 ++++++++---------- .../io/ebeaninternal/api/LoadManyRequest.java | 32 ++++--------- .../io/ebeaninternal/api/LoadRequest.java | 3 -- .../server/core/DefaultBeanLoader.java | 4 -- .../server/query/DefaultOrmQueryEngine.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 6 +-- .../tests/basic/TestReadOnlyPropagation.java | 16 +++---- .../batchload/TestBatchLazyWithCacheHits.java | 48 +++++++------------ .../org/tests/batchload/TestQueryJoin.java | 5 +- .../tests/batchload/TestSecondaryQueries.java | 7 +-- .../tests/cache/TestBeanFetchJoinCache.java | 24 ++++------ .../basic/cache/TestCacheWithSoftDelete.java | 20 ++++++-- .../rawsql/nativesql/TestNativeSqlBasic.java | 8 +--- 13 files changed, 88 insertions(+), 134 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index a763182b2..a60dfc3f1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -1,7 +1,9 @@ package io.ebeaninternal.api; +import io.ebean.CacheMode; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.api.SpiQuery.Mode; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -19,30 +21,29 @@ public final class LoadBeanRequest extends LoadRequest { private final LoadBeanBuffer loadBuffer; private final String lazyLoadProperty; private final boolean loadCache; - private boolean loadedFromCache; + private final boolean alreadyLoaded; /** * Construct for lazy load request. */ - public LoadBeanRequest(LoadBeanBuffer LoadBuffer, EntityBeanIntercept ebi, boolean loadCache) { - this(LoadBuffer, null, true, ebi.getLazyLoadProperty(), loadCache); - this.loadedFromCache = ebi.isLoadedFromCache(); + public LoadBeanRequest(LoadBeanBuffer loadBuffer, EntityBeanIntercept ebi, boolean loadCache) { + this(loadBuffer, null, true, ebi.getLazyLoadProperty(), ebi.isLoaded(), loadCache || ebi.isLoadedFromCache()); } /** * Construct for secondary query. */ - public LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest parentRequest) { - this(LoadBuffer, parentRequest, false, null, false); + public LoadBeanRequest(LoadBeanBuffer loadBuffer, OrmQueryRequest parentRequest) { + this(loadBuffer, parentRequest, false, null, false, false); } private LoadBeanRequest(LoadBeanBuffer loadBuffer, OrmQueryRequest parentRequest, boolean lazy, - String lazyLoadProperty, boolean loadCache) { - + String lazyLoadProperty, boolean alreadyLoaded, boolean loadCache) { super(parentRequest, lazy); this.loadBuffer = loadBuffer; this.batch = loadBuffer.getBatch(); this.lazyLoadProperty = lazyLoadProperty; + this.alreadyLoaded = alreadyLoaded; this.loadCache = loadCache; } @@ -51,17 +52,6 @@ public final class LoadBeanRequest extends LoadRequest { return loadBuffer.getBeanDescriptor().getBeanType(); } - /** - * Return true if the beans invoking lazy loading were previously loaded from cache. - */ - public boolean isLoadedFromCache() { - return loadedFromCache; - } - - private boolean isLoadCache() { - return loadCache; - } - public String getDescription() { return "path:" + loadBuffer.getFullPath() + " batch:" + batch.size(); } @@ -100,16 +90,21 @@ public final class LoadBeanRequest extends LoadRequest { * Configure the query for lazy loading execution. */ public void configureQuery(SpiQuery query, List idList) { - query.setMode(SpiQuery.Mode.LAZYLOAD_BEAN); + query.setMode(Mode.LAZYLOAD_BEAN); query.setPersistenceContext(loadBuffer.getPersistenceContext()); - String mode = isLazy() ? "+lazy" : "+query"; - query.setLoadDescription(mode, getDescription()); - - if (isLazy()) { - // cascade the batch size (if set) for further lazy loading + query.setLoadDescription(lazy ? "+lazy" : "+query", getDescription()); + if (lazy) { query.setLazyLoadBatchSize(getBatchSize()); + if (alreadyLoaded) { + query.setBeanCacheMode(CacheMode.OFF); + } + } else { + query.setBeanCacheMode(CacheMode.OFF); } loadBuffer.configureQuery(query, lazyLoadProperty); + if (loadCache) { + query.setBeanCacheMode(CacheMode.PUT); + } if (idList.size() == 1) { query.where().idEq(idList.get(0)); } else { @@ -128,7 +123,7 @@ public final class LoadBeanRequest extends LoadRequest { EntityBean loadedBean = (EntityBean) bean; loadedIds.add(desc.getId(loadedBean)); } - if (isLoadCache()) { + if (loadCache) { desc.cacheBeanPutAll(list); } if (lazyLoadProperty != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index cd49558d6..8975af534 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.api; +import io.ebean.CacheMode; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.core.BindPadding; @@ -62,17 +63,6 @@ public final class LoadManyRequest extends LoadRequest { return batch; } - /** - * Return true if lazy loading should only load the id values. - *

- * This for use when lazy loading is invoked on methods such as clear() and removeAll() where it - * generally makes sense to only fetch the Id values as the other property information is not - * used. - */ - private boolean isOnlyIds() { - return onlyIds; - } - /** * Return true if we should load the Collection ids into the cache. */ @@ -111,31 +101,25 @@ public final class LoadManyRequest extends LoadRequest { if (orderBy != null) { query.order(orderBy); } - String extraWhere = many.getExtraWhere(); if (extraWhere != null) { // replace special ${ta} placeholder with the base table alias // which is always t0 and add the extra where clause query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_")); } - query.setLazyLoadForParents(many); many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore()); query.setPersistenceContext(loadContext.getPersistenceContext()); - - String mode = isLazy() ? "+lazy" : "+query"; - query.setLoadDescription(mode, getDescription()); - - if (isLazy()) { - // cascade the batch size (if set) for further lazy loading + query.setLoadDescription(lazy ? "+lazy" : "+query", getDescription()); + if (lazy) { query.setLazyLoadBatchSize(getBatchSize()); + } else { + query.setBeanCacheMode(CacheMode.OFF); } - - // potentially changes the joins and selected properties + // potentially changes the joins, selected properties, cache mode loadContext.configureQuery(query); - - if (isOnlyIds()) { - // override to just select the Id values + if (onlyIds) { + // lazy loading invoked via clear() and removeAll() query.select(many.getTargetIdProperty()); } return query; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java index 516bcddb2..3c797ced5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java @@ -9,13 +9,10 @@ import io.ebeaninternal.server.core.OrmQueryRequest; public abstract class LoadRequest { protected final OrmQueryRequest parentRequest; - protected final Transaction transaction; - protected final boolean lazy; public LoadRequest(OrmQueryRequest parentRequest, boolean lazy) { - this.parentRequest = parentRequest; this.transaction = parentRequest == null ? null : parentRequest.getTransaction(); this.lazy = lazy; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index adc91e5b4..108e7e95f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -147,10 +147,6 @@ final class DefaultBeanLoader { SpiQuery query = server.createQuery(loadRequest.getBeanType()); loadRequest.configureQuery(query, idList); - if (loadRequest.isLoadedFromCache()) { - query.setBeanCacheMode(CacheMode.PUT); - } - List list = executeQuery(loadRequest, query); loadRequest.postLoad(list); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index abab7cdf9..84ea2d737 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -133,7 +133,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { SpiQuery query = request.getQuery(); - if (request.isBeanCachePutMany()) { + if (result != null && request.isBeanCachePutMany()) { // load the individual beans into the bean cache BeanDescriptor descriptor = request.getBeanDescriptor(); Collection c = result.getActualDetails(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 65ba6b9a3..39952d042 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1232,10 +1232,8 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< @Override public void resetBeanCacheAutoMode(boolean findOne) { - if (useBeanCache == CacheMode.AUTO) { - if (!findOne || useQueryCache != CacheMode.OFF) { - useBeanCache = CacheMode.OFF; - } + if (useBeanCache == CacheMode.AUTO && useQueryCache != CacheMode.OFF) { + useBeanCache = CacheMode.OFF; } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 4417e5451..4325c5332 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -1,8 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.Assert; import org.junit.Test; @@ -16,6 +15,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import static org.junit.Assert.assertNotNull; + public class TestReadOnlyPropagation extends BaseTestCase { @Test @@ -23,21 +24,20 @@ public class TestReadOnlyPropagation extends BaseTestCase { ResetBasicData.reset(); - Order order = Ebean.find(Order.class) - .setAutoTune(false) - .setBeanCacheMode(CacheMode.OFF) + Order order = DB.find(Order.class) .setReadOnly(true) .setId(1) .findOne(); - Assert.assertTrue(Ebean.getBeanState(order).isReadOnly()); + Assert.assertTrue(DB.getBeanState(order).isReadOnly()); Customer customer = order.getCustomer(); - Assert.assertTrue(Ebean.getBeanState(customer).isReadOnly()); + Assert.assertTrue(DB.getBeanState(customer).isReadOnly()); Address billingAddress = customer.getBillingAddress(); - Assert.assertTrue(Ebean.getBeanState(billingAddress).isReadOnly()); + assertNotNull(billingAddress); + //Assert.assertTrue(Ebean.getBeanState(billingAddress).isReadOnly()); List details = order.getDetails(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index d6066f66e..2869b2121 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; @@ -17,66 +17,53 @@ import static org.junit.Assert.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { - private ServerCache beanCache = server().getServerCacheManager().getBeanCache(UUOne.class); + private final ServerCache beanCache = server().getServerCacheManager().getBeanCache(UUOne.class); private UUOne insert(String name) { UUOne one = new UUOne(); one.setName("testBLWCH" + name); - Ebean.save(one); + DB.save(one); return one; } @Test public void testOnCacheHit() { - - ArrayList inserted = insertData(); - + List inserted = insertData(); clearCacheAndStatistics(); - UUOne b = Ebean.find(UUOne.class, inserted.get(1).getId()); - assertNotNull(b); - - UUOne b2 = Ebean.find(UUOne.class, inserted.get(1).getId()); - assertNotNull(b2); - + assertNotNull(DB.find(UUOne.class, inserted.get(1).getId())); + // cache hit + assertNotNull(DB.find(UUOne.class, inserted.get(1).getId())); assertBeanCacheHits(1); - UUOne c = Ebean.find(UUOne.class) - .where().idEq(inserted.get(2).getId()) - .findOne(); - assertNotNull(c); - - UUOne c2 = Ebean.find(UUOne.class) - .where().idEq(inserted.get(2).getId()) - .findOne(); - - assertNotNull(c2); + assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne()); + // cache hit + assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne()); assertBeanCacheHits(1); LoggedSqlCollector.start(); - List list = Ebean.find(UUOne.class) - //.setDefaultLazyLoadBatchSize(5) + List list = DB.find(UUOne.class) .select("id") .where().startsWith("name", "testBLWCH") .order("name") .findList(); + // invoke lazy loading for (UUOne uuOne : list) { uuOne.getName(); } list.get(0).getName(); List sql = LoggedSqlCollector.stop(); - System.out.println("sql:" + sql); - assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from uuone t0 where t0.name like "); platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); // not lazy loading into bean cache - int size = beanCache.getStatistics(true).getSize(); - assertThat(size).isEqualTo(2); + final ServerCacheStatistics stats = beanCache.getStatistics(true); + assertThat(stats.getHitCount()).isEqualTo(10); + assertThat(stats.getSize()).isEqualTo(10); } private void assertBeanCacheHits(int hits) { @@ -85,13 +72,12 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { } private void clearCacheAndStatistics() { - beanCache.clear(); beanCache.getStatistics(true); } - private ArrayList insertData() { - ArrayList inserted = new ArrayList<>(); + private List insertData() { + List inserted = new ArrayList<>(); String[] names = "A,B,C,D,E,F,G,H,I,J".split(","); for (String name : names) { inserted.add(insert(name)); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 533dd5470..71b5a4b4d 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -27,9 +27,8 @@ public class TestQueryJoin extends BaseTestCase { custCache.clear(); Query query = Ebean.find(Order.class).select("status") - // .join("details","+query(10)") - .fetchLazy("customer", "name, status").fetch("customer.contacts").order().asc("id"); - // .join("customer.billingAddress"); + .fetchLazy("customer", "name, status") + .fetch("customer.contacts").order().asc("id"); List list = query.findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java index b61b1fbac..e2895c493 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,10 +1,6 @@ package org.tests.batchload; -import io.ebean.Ebean; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebean.QueryIterator; -import io.ebean.TransactionalTestCase; +import io.ebean.*; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import org.tests.model.basic.Customer; @@ -42,6 +38,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { public void fetchLazy() { LoggedSqlCollector.start(); + DB.getServerCacheManager().clearAll(); List orders = Ebean.find(Order.class) .select("status") diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index f036dded5..d22c21e3b 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -22,10 +22,8 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchCache_when_allHits() { - initDataClearCache(); loadCustomerBeanCache(); - customerBeanCache.getStatistics(true); LoggedSqlCollector.start(); @@ -59,7 +57,6 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchCache_when_someHits() { - initDataClearCache(); DB.find(Customer.class) @@ -94,7 +91,6 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchCache_when_hitsButBeanCachePartiallyLoaded() { - initDataClearCache(); DB.find(Customer.class) @@ -110,6 +106,9 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .fetchCache("customer") .findList(); + for (Order order : orders) { + assertThat(order.getCustomer().getName()).isNotNull(); + } final List sql0 = LoggedSqlCollector.current(); assertThat(sql0).hasSize(1); @@ -121,17 +120,17 @@ public class TestBeanFetchJoinCache extends BaseTestCase { for (Order order : orders) { final Customer customer = order.getCustomer(); assertThat(customer.getName()).isNotNull(); - assertThat(customer.getStatus()).isNotNull(); // We hit the DB here as previously hit bean cache + assertThat(customer.getStatus()).isNotNull(); // We cache miss on property(status) } - // assert we didn't hit the L2 bean cache the second time around - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); - assertThat(statistics1.getHitCount()).isEqualTo(0); - - // assert we did hit the DB the second time around + // assert we hit the DB the second time around final List sql1 = LoggedSqlCollector.stop(); assertThat(sql1).hasSize(1); assertThat(sql1.get(0)).contains(" from o_customer t0 "); + + // assert we didn't hit the L2 bean cache the second time around + final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + assertThat(statistics1.getHitCount()).isGreaterThan(0); } private final FetchGroup fgBasic = FetchGroup.of(Order.class) @@ -140,9 +139,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchGroup_fetchCache() { - initDataClearCache(); - loadCustomerBeanCache(); customerBeanCache.getStatistics(true); @@ -160,12 +157,9 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .fetchCache("customer", "name") .build(); - @Test public void fetchGroup_fetchCache_partial() { - initDataClearCache(); - customerBeanCache.getStatistics(true); LoggedSqlCollector.start(); diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index a4d8d5b7c..321c50dc1 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -2,6 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheStatistics; +import io.ebeantest.LoggedSql; import org.junit.Test; import java.util.List; @@ -10,25 +13,34 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheWithSoftDelete extends BaseTestCase { + private final ServerCache beanCache = DB.getServerCacheManager().getBeanCache(ESoftWithCache.class); + @Test public void idIn_expect_hitCache() { - ESoftWithCache bean = new ESoftWithCache("hello"); DB.save(bean); final List found = DB.find(ESoftWithCache.class) .where().idIn(bean.id()) - //.setUseCache(true) .findList(); - assertThat(found).hasSize(1); + // try to hit the cache + assertThat(stats().getPutCount()).isEqualTo(1); + + LoggedSql.start(); + // cache hit success this time final List foundAgain = DB.find(ESoftWithCache.class) .where().idIn(bean.id()) - //.setUseCache(true) .findList(); + final List sql = LoggedSql.stop(); + assertThat(sql).isEmpty(); assertThat(foundAgain).hasSize(1); + assertThat(stats().getHitCount()).isEqualTo(1); + } + private ServerCacheStatistics stats() { + return beanCache.getStatistics(true); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 4e0ccfd02..b127b249a 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,9 +1,6 @@ package org.tests.rawsql.nativesql; -import io.ebean.BaseTestCase; -import io.ebean.BeanState; -import io.ebean.Ebean; -import io.ebean.Query; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; @@ -157,11 +154,10 @@ public class TestNativeSqlBasic extends BaseTestCase { @Test public void partialAssocIncludingOracle() { - ResetBasicData.reset(); + DB.getServerCacheManager().clearAll(); String nativeSql = "select o.id, o.status, o.kcustomer_id from o_order o"; - List orders = Ebean.findNative(Order.class, nativeSql) .findList(); From 99acd6d64f597e612feaa112d7fbbef0706b2eee Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 2 Sep 2021 17:28:04 +1200 Subject: [PATCH 016/102] Tidy test only - static imports for QCustomerByteArrayTest --- .../org/querytest/QCustomerByteArrayTest.java | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java index 3496172a1..c252530e6 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java @@ -5,73 +5,73 @@ import io.ebean.Database; import org.example.domain.Customer; import org.example.domain.query.QCustomer; import org.junit.Test; -import org.junit.Assert; - import java.util.List; +import static org.junit.Assert.*; + public class QCustomerByteArrayTest { @Test public void testIsNull() { - final byte[] photo1= new byte[] { 0x05, 0x10, 0x20, 0x30 }; - final byte[] photo2=new byte[] { 0x50, 0x55, 0x60, 0x70, 0x10 }; - final Database db=DB.getDefault(); - final String noPhoto="no_photo_client"; - final String wPhoto1="with_photo1_client"; - final String wPhoto2="with_photo2_client"; + final byte[] photo1 = new byte[]{0x05, 0x10, 0x20, 0x30}; + final byte[] photo2 = new byte[]{0x50, 0x55, 0x60, 0x70, 0x10}; + final Database db = DB.getDefault(); + final String noPhoto = "no_photo_client"; + final String wPhoto1 = "with_photo1_client"; + final String wPhoto2 = "with_photo2_client"; Customer c; - c=new Customer(); + c = new Customer(); c.setName(noPhoto); c.save(); - c=new Customer(); + c = new Customer(); c.setName(wPhoto1); c.setPhoto(photo1); c.save(); - c=new Customer(); + c = new Customer(); c.setName(wPhoto2); c.setPhoto(photo2); c.save(); - Assert.assertNotNull(new QCustomer(db).name.eq(noPhoto).photo.isNull().findOne()); + assertNotNull(new QCustomer(db).name.eq(noPhoto).photo.isNull().findOne()); // Assert.assertNotNull(new QCustomer(db).name.eq(noPhoto).photo.ne(photo1).findOne()); // Fails - Assert.assertNull(new QCustomer(db).name.eq(noPhoto).photo.isNotNull().findOne()); - Assert.assertNull(new QCustomer(db).name.eq(noPhoto).photo.eq(photo1).findOne()); + assertNull(new QCustomer(db).name.eq(noPhoto).photo.isNotNull().findOne()); + assertNull(new QCustomer(db).name.eq(noPhoto).photo.eq(photo1).findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.isNotNull().findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo1).findOne()); - Assert.assertNotNull(new QCustomer(db).photo.eq(photo1).findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo2).findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.isNotNull().findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo1).findOne()); + assertNotNull(new QCustomer(db).photo.eq(photo1).findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo2).findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.isNull().findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo2).findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo1).findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto1).photo.isNull().findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto1).photo.eq(photo2).findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto1).photo.ne(photo1).findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.isNotNull().findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo2).findOne()); - Assert.assertNotNull(new QCustomer(db).photo.eq(photo2).findOne()); - Assert.assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo1).findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.isNotNull().findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo2).findOne()); + assertNotNull(new QCustomer(db).photo.eq(photo2).findOne()); + assertNotNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo1).findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.isNull().findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo1).findOne()); - Assert.assertNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo2).findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto2).photo.isNull().findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto2).photo.eq(photo1).findOne()); + assertNull(new QCustomer(db).name.eq(wPhoto2).photo.ne(photo2).findOne()); - Assert.assertEquals(2, new QCustomer(db).photo.in(photo1, photo2).findList().size()); + assertEquals(2, new QCustomer(db).photo.in(photo1, photo2).findList().size()); List ordered = new QCustomer(db).name.in(wPhoto1, wPhoto2).photo.desc().findList(); - Assert.assertEquals(wPhoto2, ordered.get(0).getName()); - Assert.assertArrayEquals(photo2, ordered.get(0).getPhoto()); - Assert.assertEquals(wPhoto1, ordered.get(1).getName()); - Assert.assertArrayEquals(photo1, ordered.get(1).getPhoto()); + assertEquals(wPhoto2, ordered.get(0).getName()); + assertArrayEquals(photo2, ordered.get(0).getPhoto()); + assertEquals(wPhoto1, ordered.get(1).getName()); + assertArrayEquals(photo1, ordered.get(1).getPhoto()); ordered = new QCustomer(db).name.in(wPhoto1, wPhoto2).photo.asc().findList(); - Assert.assertEquals(wPhoto2, ordered.get(1).getName()); - Assert.assertArrayEquals(photo2, ordered.get(1).getPhoto()); - Assert.assertEquals(wPhoto1, ordered.get(0).getName()); - Assert.assertArrayEquals(photo1, ordered.get(0).getPhoto()); + assertEquals(wPhoto2, ordered.get(1).getName()); + assertArrayEquals(photo2, ordered.get(1).getPhoto()); + assertEquals(wPhoto1, ordered.get(0).getName()); + assertArrayEquals(photo1, ordered.get(0).getPhoto()); } } From d2e36fc1d2aba942d57e4ac5014ad4ca9bdc4aeb Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 2 Sep 2021 17:34:45 +1200 Subject: [PATCH 017/102] No effective change - tidy DefaultSqlUpdate raw types --- .../ebeaninternal/server/core/DefaultSqlUpdate.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java index c516e730e..8f66ae6eb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Update; import io.ebeaninternal.api.BindParams; @@ -143,7 +143,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { return server.execute(this); } else { // Hopefully this doesn't catch anyone out... - return Ebean.execute(this); + return DB.getDefault().execute(this); } } @@ -167,7 +167,6 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { return server.executeBatch(this, transaction); } - @Override public void addBatch() { if (server == null) { @@ -179,7 +178,6 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { throw new IllegalStateException("No current transaction? Must have a transaction to use addBatch()"); } } - batched = true; server.addBatch(this, transaction); } @@ -287,8 +285,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { return this; } - private SqlUpdate setParamWithBindExpansion(int position, Collection values, String bindLiteral) { - + private SqlUpdate setParamWithBindExpansion(int position, Collection values, String bindLiteral) { StringBuilder sqlExpand = new StringBuilder(values.size() * 2); position = position + bindExpansion; int offset = 0; @@ -310,10 +307,9 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { String bindLiteral = "?" + position; int pos = baseSql.indexOf(bindLiteral); if (pos > -1) { - return setParamWithBindExpansion(position, (Collection) value, bindLiteral); + return setParamWithBindExpansion(position, (Collection) value, bindLiteral); } } - bindParams.setParameter(bindExpansion + position, value); return this; } From 97482c3372c8552f7c35a93355589925e60cb6fd Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 2 Sep 2021 17:45:30 +1200 Subject: [PATCH 018/102] No effective change - tidy DefaultCallableSql --- .../server/core/DefaultCallableSql.java | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java index fe7b18392..50807aa64 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.core; import io.ebean.CallableSql; -import io.ebean.EbeanServer; +import io.ebean.Database; import io.ebeaninternal.api.BindParams; import io.ebeaninternal.api.BindParams.Param; import io.ebeaninternal.api.SpiCallableSql; @@ -9,39 +9,23 @@ import io.ebeaninternal.api.TransactionEventTable; import java.io.Serializable; import java.sql.CallableStatement; -import java.sql.SQLException; - -public final class DefaultCallableSql implements Serializable, SpiCallableSql { +final class DefaultCallableSql implements Serializable, SpiCallableSql { private static final long serialVersionUID = 8984272253185424701L; - private transient final EbeanServer server; - - /** - * The callable sql. - */ - private String sql; - - /** - * To display in the transaction log to help identify the procedure. - */ - private String label; - - private int timeout; - /** * Holds the table modification information. On commit this information is * used to manage the cache etc. */ private final TransactionEventTable transactionEvent = new TransactionEventTable(); - private final BindParams bindParameters = new BindParams(); + private transient final Database server; + private String sql; + private String label; + private int timeout; - /** - * Create with callable sql. - */ - public DefaultCallableSql(EbeanServer server, String sql) { + DefaultCallableSql(Database server, String sql) { this.server = server; this.sql = sql; } @@ -108,13 +92,12 @@ public final class DefaultCallableSql implements Serializable, SpiCallableSql { } @Override - public boolean executeOverride(CallableStatement cstmt) throws SQLException { + public boolean executeOverride(CallableStatement statement) { return false; } @Override public CallableSql addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { - transactionEvent.add(tableName, inserts, updates, deletes); return this; } @@ -122,7 +105,7 @@ public final class DefaultCallableSql implements Serializable, SpiCallableSql { /** * Return the TransactionEvent which holds the table modification * information for this CallableSql. This information is merged into the - * transaction after the transaction is commited. + * transaction after the transaction is committed. */ @Override public TransactionEventTable getTransactionEventTable() { From e0afeea6c48dde36005f01a98c713f4402df88c8 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 2 Sep 2021 19:03:54 +1200 Subject: [PATCH 019/102] #2335 - Modify test - Put back readOnly assert (#2340) --- .../src/test/java/org/tests/basic/TestReadOnlyPropagation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 4325c5332..58a1ae64e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -37,7 +37,7 @@ public class TestReadOnlyPropagation extends BaseTestCase { Address billingAddress = customer.getBillingAddress(); assertNotNull(billingAddress); - //Assert.assertTrue(Ebean.getBeanState(billingAddress).isReadOnly()); + Assert.assertTrue(DB.getBeanState(billingAddress).isReadOnly()); List details = order.getDetails(); From 2419c6ab349cd806d99545b807ae17f5dedd62f7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 19:23:40 +1200 Subject: [PATCH 020/102] #2335 ReadOnly propagation test requiring cache clear --- .../src/test/java/org/tests/basic/TestReadOnlyPropagation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 58a1ae64e..b77dc577c 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -23,6 +23,7 @@ public class TestReadOnlyPropagation extends BaseTestCase { public void testReadOnly() { ResetBasicData.reset(); + DB.getServerCacheManager().clearAll(); Order order = DB.find(Order.class) .setReadOnly(true) From 455914fb52106c1d96e9121d95e75bbebe69c681 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 19:25:02 +1200 Subject: [PATCH 021/102] Use cast built into BeanDescriptor.beanId() rather than cast + getId() --- .../src/main/java/io/ebeaninternal/api/LoadBeanRequest.java | 3 +-- .../src/main/java/io/ebeaninternal/api/LoadManyRequest.java | 3 +-- .../java/io/ebeaninternal/server/core/DefaultBeanLoader.java | 5 ----- .../ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java | 2 +- .../ebeaninternal/server/deploy/BeanPropertyAssocMany.java | 4 ++-- .../io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java | 2 +- .../java/io/ebeaninternal/server/persist/SaveManyBeans.java | 2 +- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index a60dfc3f1..65be9a1c6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -120,8 +120,7 @@ public final class LoadBeanRequest extends LoadRequest { BeanDescriptor desc = loadBuffer.getBeanDescriptor(); // collect Ids and maybe load bean cache for (Object bean : list) { - EntityBean loadedBean = (EntityBean) bean; - loadedIds.add(desc.getId(loadedBean)); + loadedIds.add(desc.beanId(bean)); } if (loadCache) { desc.cacheBeanPutAll(list); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index 8975af534..0327a5199 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -141,8 +141,7 @@ public final class LoadManyRequest extends LoadRequest { logger.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean); } } else if (isLoadCache() && many.isUseCache()) { - Object parentId = desc.getId(bc.getOwnerBean()); - desc.cacheManyPropPut(many, bc, parentId); + desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean())); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 108e7e95f..e2e2709f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -69,12 +69,10 @@ final class DefaultBeanLoader { } Object parentId = parentDesc.getId(parentBean); - if (pc == null) { pc = new DefaultPersistenceContext(); parentDesc.contextPut(pc, parentId, parentBean); } - boolean useManyIdCache = beanCollection != null && parentDesc.isManyPropCaching() && many.isUseCache(); if (useManyIdCache) { Boolean readOnly = null; @@ -87,7 +85,6 @@ final class DefaultBeanLoader { } SpiQuery query = server.createQuery(parentDesc.getBeanType()); - if (refresh) { // populate a new collection BeanCollection emptyCollection = many.createEmpty(parentBean); @@ -98,7 +95,6 @@ final class DefaultBeanLoader { } query.select(parentDesc.getIdBinder().getIdProperty()); - if (onlyIds) { query.fetch(many.getName(), many.getTargetIdProperty()); } else { @@ -113,7 +109,6 @@ final class DefaultBeanLoader { query.setMode(Mode.LAZYLOAD_MANY); query.setLazyLoadManyPath(many.getName()); query.setPersistenceContext(pc); - if (ebi.isReadOnly()) { query.setReadOnly(true); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 7cdaf95df..d2c95d76c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -352,7 +352,7 @@ final class BeanDescriptorCacheHelp { BeanDescriptor targetDescriptor = many.getTargetDescriptor(); List idList = new ArrayList<>(actualDetails.size()); for (Object bean : actualDetails) { - idList.add(targetDescriptor.getId((EntityBean) bean)); + idList.add(targetDescriptor.beanId(bean)); } return new CachedManyIds(idList); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 37e5b7990..d07d94843 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -869,7 +869,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST draftVal.size(); Collection actualDetails = draftVal.getActualDetails(); for (T bean : actualDetails) { - Object id = targetDescriptor.getId((EntityBean) bean); + Object id = targetDescriptor.beanId(bean); T liveBean = liveBeansAsMap.remove(id); if (isManyToMany()) { @@ -899,7 +899,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST Collection liveBeans = liveVal.getActualDetails(); Map liveMap = new LinkedHashMap<>(); for (Object liveBean : liveBeans) { - Object id = targetDescriptor.getId((EntityBean) liveBean); + Object id = targetDescriptor.beanId(liveBean); liveMap.put(id, (T) liveBean); } return liveMap; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 768cba19c..dd029000b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -195,7 +195,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } else { Object assocBean = getValue(bean); if (assocBean != null) { - Object parentId = targetDescriptor.getId((EntityBean) assocBean); + Object parentId = targetDescriptor.beanId(assocBean); if (parentId != null) { changeSet.addManyRemove(targetDescriptor, relationshipProperty.getName(), parentId); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index f4a70f763..e48a7dd9d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -225,7 +225,7 @@ public final class SaveManyBeans extends SaveManyBase { detailBean = ((Map.Entry) detailBean).getValue(); } if (detailBean instanceof EntityBean) { - Object id = targetDescriptor.getId((EntityBean) detailBean); + Object id = targetDescriptor.beanId(detailBean); if (!isNullOrZero(id)) { // remember the Id (other details not in the collection) will be removed detailIds.add(id); From ac21fcb5cfc601b122f9fab43aeec2a65c90ef34 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 19:28:24 +1200 Subject: [PATCH 022/102] Simplify load description in LoadBeanRequest and LoadManyRequest --- .../main/java/io/ebeaninternal/api/LoadBeanRequest.java | 7 +++---- .../main/java/io/ebeaninternal/api/LoadManyRequest.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index 65be9a1c6..79658e626 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.api; import io.ebean.CacheMode; -import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiQuery.Mode; import io.ebeaninternal.server.core.OrmQueryRequest; @@ -52,8 +51,8 @@ public final class LoadBeanRequest extends LoadRequest { return loadBuffer.getBeanDescriptor().getBeanType(); } - public String getDescription() { - return "path:" + loadBuffer.getFullPath() + " batch:" + batch.size(); + public String description() { + return loadBuffer.getFullPath(); } /** @@ -92,7 +91,7 @@ public final class LoadBeanRequest extends LoadRequest { public void configureQuery(SpiQuery query, List idList) { query.setMode(Mode.LAZYLOAD_BEAN); query.setPersistenceContext(loadBuffer.getPersistenceContext()); - query.setLoadDescription(lazy ? "+lazy" : "+query", getDescription()); + query.setLoadDescription(lazy ? "+lazy" : "+query", description()); if (lazy) { query.setLazyLoadBatchSize(getBatchSize()); if (alreadyLoaded) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index 0327a5199..a26f2aa90 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -52,8 +52,8 @@ public final class LoadManyRequest extends LoadRequest { return loadContext.getBeanDescriptor().getBeanType(); } - public String getDescription() { - return "path:" + loadContext.getFullPath() + " size:" + batch.size(); + public String description() { + return loadContext.getFullPath(); } /** @@ -110,7 +110,7 @@ public final class LoadManyRequest extends LoadRequest { query.setLazyLoadForParents(many); many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore()); query.setPersistenceContext(loadContext.getPersistenceContext()); - query.setLoadDescription(lazy ? "+lazy" : "+query", getDescription()); + query.setLoadDescription(lazy ? "+lazy" : "+query", description()); if (lazy) { query.setLazyLoadBatchSize(getBatchSize()); } else { From b142319da03fdf9391b4cb84bff6b60f33cee60c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 21:50:43 +1200 Subject: [PATCH 023/102] Refactor tidy methods in LoadBeanRequest, LoadManyRequest, LoadRequest and DefaultBeanLoader --- .../io/ebeaninternal/api/LoadBeanRequest.java | 17 ++------- .../io/ebeaninternal/api/LoadManyRequest.java | 35 ++++--------------- .../io/ebeaninternal/api/LoadRequest.java | 6 ++-- .../server/core/DefaultBeanLoader.java | 6 ++-- 4 files changed, 16 insertions(+), 48 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index 79658e626..f2754e4c4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -47,7 +47,7 @@ public final class LoadBeanRequest extends LoadRequest { } @Override - public Class getBeanType() { + public Class beanType() { return loadBuffer.getBeanDescriptor().getBeanType(); } @@ -58,21 +58,10 @@ public final class LoadBeanRequest extends LoadRequest { /** * Return the batch of beans to actually load. */ - public List getBatch() { + public List batch() { return batch; } - /** - * Return the load context. - */ - private LoadBeanBuffer getLoadContext() { - return loadBuffer; - } - - public int getBatchSize() { - return getLoadContext().getBatchSize(); - } - /** * Return the list of Id values for the beans in the lazy load buffer. */ @@ -93,7 +82,7 @@ public final class LoadBeanRequest extends LoadRequest { query.setPersistenceContext(loadBuffer.getPersistenceContext()); query.setLoadDescription(lazy ? "+lazy" : "+query", description()); if (lazy) { - query.setLazyLoadBatchSize(getBatchSize()); + query.setLazyLoadBatchSize(loadBuffer.getBatchSize()); if (alreadyLoaded) { query.setBeanCacheMode(CacheMode.OFF); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index a26f2aa90..71ebdef78 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -48,7 +48,7 @@ public final class LoadManyRequest extends LoadRequest { } @Override - public Class getBeanType() { + public Class beanType() { return loadContext.getBeanDescriptor().getBeanType(); } @@ -56,30 +56,9 @@ public final class LoadManyRequest extends LoadRequest { return loadContext.getFullPath(); } - /** - * Return the batch of collections to actually load. - */ - public List> getBatch() { - return batch; - } - - /** - * Return true if we should load the Collection ids into the cache. - */ - private boolean isLoadCache() { - return loadCache; - } - - /** - * Return the batch size used for this load context. - */ - public int getBatchSize() { - return loadContext.getBatchSize(); - } - private List parentIdList(SpiEbeanServer server) { List idList = new ArrayList<>(); - BeanPropertyAssocMany many = getMany(); + BeanPropertyAssocMany many = many(); for (BeanCollection bc : batch) { idList.add(many.getParentId(bc.getOwnerBean())); bc.setLoader(server); // don't use the load buffer again @@ -90,12 +69,12 @@ public final class LoadManyRequest extends LoadRequest { return idList; } - private BeanPropertyAssocMany getMany() { + private BeanPropertyAssocMany many() { return loadContext.getBeanProperty(); } public SpiQuery createQuery(SpiEbeanServer server) { - BeanPropertyAssocMany many = getMany(); + BeanPropertyAssocMany many = many(); SpiQuery query = many.newQuery(server); String orderBy = many.getLazyFetchOrderBy(); if (orderBy != null) { @@ -112,7 +91,7 @@ public final class LoadManyRequest extends LoadRequest { query.setPersistenceContext(loadContext.getPersistenceContext()); query.setLoadDescription(lazy ? "+lazy" : "+query", description()); if (lazy) { - query.setLazyLoadBatchSize(getBatchSize()); + query.setLazyLoadBatchSize(loadContext.getBatchSize()); } else { query.setBeanCacheMode(CacheMode.OFF); } @@ -130,7 +109,7 @@ public final class LoadManyRequest extends LoadRequest { */ public void postLoad() { BeanDescriptor desc = loadContext.getBeanDescriptor(); - BeanPropertyAssocMany many = getMany(); + BeanPropertyAssocMany many = many(); // check for BeanCollection's that where never processed // in the +query or +lazy load due to no rows (predicates) for (BeanCollection bc : batch) { @@ -140,7 +119,7 @@ public final class LoadManyRequest extends LoadRequest { Object parentId = desc.getId(ownerBean); logger.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean); } - } else if (isLoadCache() && many.isUseCache()) { + } else if (loadCache && many.isUseCache()) { desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean())); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java index 3c797ced5..090e4bfad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java @@ -12,7 +12,7 @@ public abstract class LoadRequest { protected final Transaction transaction; protected final boolean lazy; - public LoadRequest(OrmQueryRequest parentRequest, boolean lazy) { + LoadRequest(OrmQueryRequest parentRequest, boolean lazy) { this.parentRequest = parentRequest; this.transaction = parentRequest == null ? null : parentRequest.getTransaction(); this.lazy = lazy; @@ -21,7 +21,7 @@ public abstract class LoadRequest { /** * Return the associated bean type for this load request. */ - public abstract Class getBeanType(); + public abstract Class beanType(); /** * Return true if this is a lazy load and false if it is a secondary query. @@ -36,7 +36,7 @@ public abstract class LoadRequest { * Lazy loading queries run in their own transaction. *

*/ - public Transaction getTransaction() { + public Transaction transaction() { return transaction; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index e2e2709f4..c1def652c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -129,7 +129,7 @@ final class DefaultBeanLoader { * Load a batch of beans for +query or +lazy loading. */ void loadBean(LoadBeanRequest loadRequest) { - List batch = loadRequest.getBatch(); + List batch = loadRequest.batch(); if (batch.isEmpty()) { throw new RuntimeException("Nothing in batch?"); } @@ -140,7 +140,7 @@ final class DefaultBeanLoader { return; } - SpiQuery query = server.createQuery(loadRequest.getBeanType()); + SpiQuery query = server.createQuery(loadRequest.beanType()); loadRequest.configureQuery(query, idList); List list = executeQuery(loadRequest, query); loadRequest.postLoad(list); @@ -159,7 +159,7 @@ final class DefaultBeanLoader { extraTxn.end(); } } else { - return server.findList(query, loadRequest.getTransaction()); + return server.findList(query, loadRequest.transaction()); } } From 491d6a54610e9345b75ae4e53e8c72c84d546b9c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:09:34 +1200 Subject: [PATCH 024/102] #2341 - Refactor internal api LoadBeanBuffer LoadBeanRequest etc --- .../java/io/ebeaninternal/api/LoadBeanBuffer.java | 10 +++++----- .../java/io/ebeaninternal/api/LoadBeanRequest.java | 14 +++++++------- .../server/core/DefaultBeanLoader.java | 13 ++++--------- .../server/loadcontext/DLoadBeanContext.java | 10 +++++----- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java index 346da41fd..3b999bc3c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java @@ -11,15 +11,15 @@ import java.util.List; */ public interface LoadBeanBuffer { - int getBatchSize(); + int batchSize(); - List getBatch(); + List batch(); - BeanDescriptor getBeanDescriptor(); + BeanDescriptor descriptor(); - PersistenceContext getPersistenceContext(); + PersistenceContext persistenceContext(); - String getFullPath(); + String fullPath(); void configureQuery(SpiQuery query, String lazyLoadProperty); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index f2754e4c4..7bbbc85bc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -40,7 +40,7 @@ public final class LoadBeanRequest extends LoadRequest { String lazyLoadProperty, boolean alreadyLoaded, boolean loadCache) { super(parentRequest, lazy); this.loadBuffer = loadBuffer; - this.batch = loadBuffer.getBatch(); + this.batch = loadBuffer.batch(); this.lazyLoadProperty = lazyLoadProperty; this.alreadyLoaded = alreadyLoaded; this.loadCache = loadCache; @@ -48,11 +48,11 @@ public final class LoadBeanRequest extends LoadRequest { @Override public Class beanType() { - return loadBuffer.getBeanDescriptor().getBeanType(); + return loadBuffer.descriptor().getBeanType(); } public String description() { - return loadBuffer.getFullPath(); + return loadBuffer.fullPath(); } /** @@ -67,7 +67,7 @@ public final class LoadBeanRequest extends LoadRequest { */ public List getIdList() { List idList = new ArrayList<>(); - BeanDescriptor desc = loadBuffer.getBeanDescriptor(); + BeanDescriptor desc = loadBuffer.descriptor(); for (EntityBeanIntercept ebi : batch) { idList.add(desc.getId(ebi.getOwner())); } @@ -79,10 +79,10 @@ public final class LoadBeanRequest extends LoadRequest { */ public void configureQuery(SpiQuery query, List idList) { query.setMode(Mode.LAZYLOAD_BEAN); - query.setPersistenceContext(loadBuffer.getPersistenceContext()); + query.setPersistenceContext(loadBuffer.persistenceContext()); query.setLoadDescription(lazy ? "+lazy" : "+query", description()); if (lazy) { - query.setLazyLoadBatchSize(loadBuffer.getBatchSize()); + query.setLazyLoadBatchSize(loadBuffer.batchSize()); if (alreadyLoaded) { query.setBeanCacheMode(CacheMode.OFF); } @@ -105,7 +105,7 @@ public final class LoadBeanRequest extends LoadRequest { */ public void postLoad(List list) { Set loadedIds = new HashSet<>(); - BeanDescriptor desc = loadBuffer.getBeanDescriptor(); + BeanDescriptor desc = loadBuffer.descriptor(); // collect Ids and maybe load bean cache for (Object bean : list) { loadedIds.add(desc.beanId(bean)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index c1def652c..8a42ed12f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -39,15 +39,12 @@ final class DefaultBeanLoader { } void loadMany(LoadManyRequest loadRequest) { - SpiQuery query = loadRequest.createQuery(server); - executeQuery(loadRequest, query); + executeQuery(loadRequest, loadRequest.createQuery(server)); loadRequest.postLoad(); } void loadMany(BeanCollection bc, boolean onlyIds) { - EntityBean parentBean = bc.getOwnerBean(); - String propertyName = bc.getPropertyName(); - loadManyInternal(parentBean, propertyName, null, false, onlyIds); + loadManyInternal(bc.getOwnerBean(), bc.getPropertyName(), null, false, onlyIds); } void refreshMany(EntityBean parentBean, String propertyName) { @@ -183,8 +180,7 @@ final class DefaultBeanLoader { if (EntityType.EMBEDDED == desc.getEntityType()) { // lazy loading on an embedded bean property EntityBean embeddedOwner = (EntityBean) ebi.getEmbeddedOwner(); - int ownerIndex = ebi.getEmbeddedOwnerIndex(); - refreshBeanInternal(embeddedOwner, mode, ownerIndex); + refreshBeanInternal(embeddedOwner, mode, ebi.getEmbeddedOwnerIndex()); } Object id = desc.getId(bean); @@ -240,8 +236,7 @@ final class DefaultBeanLoader { Object dbBean = query.findOne(); if (dbBean == null) { - String msg = "Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.getBeanType() + "]"; - throw new EntityNotFoundException(msg); + throw new EntityNotFoundException("Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.getBeanType() + "]"); } desc.resetManyProperties(dbBean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index ac871e5eb..bab6b0448 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -131,7 +131,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext } @Override - public int getBatchSize() { + public int batchSize() { return batchSize; } @@ -154,7 +154,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext } @Override - public List getBatch() { + public List batch() { return list; } @@ -164,17 +164,17 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext } @Override - public String getFullPath() { + public String fullPath() { return context.fullPath; } @Override - public BeanDescriptor getBeanDescriptor() { + public BeanDescriptor descriptor() { return context.desc; } @Override - public PersistenceContext getPersistenceContext() { + public PersistenceContext persistenceContext() { return persistenceContext; } From 6311d0bf4e1235452b27ac6b4e133664cfaade56 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:36:02 +1200 Subject: [PATCH 025/102] No effective change - javadoc for ServerCache --- ebean-api/src/main/java/io/ebean/cache/ServerCache.java | 4 +++- .../src/main/java/io/ebean/cache/ServerCacheManager.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java index 82bd452b0..724b71531 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java @@ -19,8 +19,10 @@ import java.util.Set; */ public interface ServerCache { + /** + * Get values for many keys. + */ default Map getAll(Set keys) { - Map map = new LinkedHashMap<>(); for (Object key : keys) { Object value = get(key); diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java index 5cc1a6040..82b85c956 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java @@ -44,7 +44,7 @@ public interface ServerCacheManager { void setAllRegionsEnabled(boolean enabled); /** - * Return the cache region by name. Typically to enable or disable the region. + * Return the cache region by name. Typically, to enable or disable the region. */ ServerCacheRegion getRegion(String name); From f770b66f429bd07aa1b52334f6258d699ed26f07 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:41:51 +1200 Subject: [PATCH 026/102] #2342 - Rename Database.getName() to Database.name() with deprecation --- ebean-api/src/main/java/io/ebean/Database.java | 10 +++++++++- ebean-api/src/main/java/io/ebean/DbContext.java | 2 +- .../src/main/java/io/ebean/bean/SingleBeanLoader.java | 2 +- .../autotune/service/DefaultAutoTuneService.java | 2 +- .../ebeaninternal/server/cluster/ClusterManager.java | 2 +- .../server/core/DefaultQueryPlanListener.java | 2 +- .../io/ebeaninternal/server/core/DefaultServer.java | 2 +- .../java/io/ebeaninternal/server/core/DumpMetrics.java | 2 +- .../io/ebeaninternal/server/core/DumpMetricsJson.java | 2 +- .../server/loadcontext/DLoadBaseContext.java | 2 +- .../server/loadcontext/DLoadManyContext.java | 2 +- .../java/io/ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../java/org/tests/query/TestQueryFindIterate.java | 2 +- .../org/tests/query/finder/TestCustomerFinder.java | 2 +- .../io/ebeaninternal/dbmigration/DdlGenerator.java | 4 ++-- 15 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index bd38253de..da4645811 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -136,7 +136,15 @@ public interface Database { * Return the name. This is used with {@link DB#byName(String)} to get a * Database that was registered with the DB singleton. */ - String getName(); + String name(); + + /** + * Deprecated migrate to name(). + */ + @Deprecated + default String getName() { + return name(); + } /** * Return the ExpressionFactory for this database. diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java index 18df2169e..786cfd4bb 100644 --- a/ebean-api/src/main/java/io/ebean/DbContext.java +++ b/ebean-api/src/main/java/io/ebean/DbContext.java @@ -115,7 +115,7 @@ final class DbContext { * Register a server so we can get it by its name. */ void register(Database server, boolean isDefault) { - registerWithName(server.getName(), server, isDefault); + registerWithName(server.name(), server, isDefault); } private void registerWithName(String name, Database server, boolean isDefault) { diff --git a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java index ad4a30b95..e196d3c5a 100644 --- a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java +++ b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java @@ -20,7 +20,7 @@ public abstract class SingleBeanLoader implements BeanLoader { @Override public String getName() { - return database.getName(); + return database.name(); } @Override diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index be2033695..8ea80d3a6 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -59,7 +59,7 @@ public class DefaultAutoTuneService implements AutoTuneService { this.tuningFile = config.getQueryTuningFile(); this.profilingFile = config.getProfilingFile(); this.profilingUpdateFrequency = config.getProfilingUpdateFrequency(); - this.serverName = server.getName(); + this.serverName = server.name(); this.profileManager = new ProfileManager(config, server); this.queryTuner = new BaseQueryTuner(config, server, profileManager); this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java index d2bdaeda7..a85444486 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java @@ -56,7 +56,7 @@ public class ClusterManager implements ServerLookup { public void registerServer(EbeanServer server) { lock.lock(); try { - serverMap.put(server.getName(), server); + serverMap.put(server.name(), server); if (!started) { startup(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java index ba2e99bda..5a6196230 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java @@ -15,7 +15,7 @@ final class DefaultQueryPlanListener implements QueryPlanListener { @Override public void process(QueryPlanCapture capture) { // better to log this in JSON form? - String dbName = capture.getDatabase().getName(); + String dbName = capture.getDatabase().name(); for (MetaQueryPlan plan : capture.getPlans()) { log.info("queryPlan db:{} label:{} queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}", dbName, plan.label(), plan.queryTimeMicros(), plan.profileLocation(), diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 1c77e06a8..c30134f31 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -499,7 +499,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the server name. */ @Override - public String getName() { + public String name() { return serverName; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java index 9b5a1afa7..b1f66f7ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java @@ -73,7 +73,7 @@ final class DumpMetrics { void dump() { - out("-- Dumping metrics for " + server.getName() + " -- "); + out("-- Dumping metrics for " + server.name() + " -- "); ServerMetrics serverMetrics = server.getMetaInfoManager().collectMetrics(); for (MetaTimedMetric metric : serverMetrics.timedMetrics()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java index 190af0af4..3358a709a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java @@ -112,7 +112,7 @@ final class DumpMetricsJson implements ServerMetricsAsJson { if (withHeader) { objStart(); key("db"); - val(database.getName()); + val(database.name()); key("metrics"); listStart(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java index 24233cf87..4ab63bec0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java @@ -35,7 +35,7 @@ abstract class DLoadBaseContext { DLoadBaseContext(DLoadContext parent, BeanDescriptor desc, String path, OrmQueryProperties queryProps) { this.parent = parent; - this.serverName = parent.getEbeanServer().getName(); + this.serverName = parent.getEbeanServer().name(); this.desc = desc; this.queryProps = queryProps; this.fullPath = parent.getFullPath(path); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index b830dc96d..5f09de0b3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -74,7 +74,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext public String getName() { - return parent.getEbeanServer().getName(); + return parent.getEbeanServer().name(); } public void register(BeanCollection bc) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index cb7e613a3..a4ec77ffd 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -348,7 +348,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public String getName() { + public String name() { return name; } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 4dea23698..c2d31a851 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -194,7 +194,7 @@ public class TestQueryFindIterate extends BaseTestCase { }); - if (!DB.getDefault().getName().equals("h2")) { + if (!DB.getDefault().name().equals("h2")) { // MySql allows the query with type conversion? throw new PersistenceException("H2 does expected thing but MySql does not"); } diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java index d36e36b51..68b5c627a 100644 --- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -83,7 +83,7 @@ public class TestCustomerFinder extends BaseTestCase { assertThat(customer.getId()).isEqualTo(customer1.getId()); assertThat(customer.getName()).isEqualTo(customer1.getName()); - assertThat(Customer.find.db().getName()).isEqualTo(DB.getDefault().getName()); + assertThat(Customer.find.db().name()).isEqualTo(DB.getDefault().name()); } @Test diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index fe546ab27..4c9ff9320 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -321,11 +321,11 @@ public class DdlGenerator implements SpiDdlGenerator { } protected String getDropFileName() { - return server.getName() + "-drop-all.sql"; + return server.name() + "-drop-all.sql"; } protected String getCreateFileName() { - return server.getName() + "-create-all.sql"; + return server.name() + "-create-all.sql"; } protected CurrentModel currentModel() { From 239a444d4cb478c78e6e9803bf0a3302dac3dfab Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:44:31 +1200 Subject: [PATCH 027/102] #2343 - Rename Database.getAutoTune() to autoTune() with deprecation --- ebean-api/src/main/java/io/ebean/Database.java | 10 +++++++++- .../io/ebeaninternal/server/core/DefaultServer.java | 2 +- .../java/io/ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../src/test/java/org/tests/basic/TestBatchLazy.java | 4 ++-- .../org/tests/query/TestAutofetchTuneWithJoin.java | 2 +- .../tests/query/autotune/TestAutoTuneProfiling.java | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index da4645811..4fabcb598 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -120,7 +120,15 @@ public interface Database { /** * Return AutoTune which is used to control the AutoTune service at runtime. */ - AutoTune getAutoTune(); + AutoTune autoTune(); + + /** + * Deprecated migrate to autoTune(). + */ + @Deprecated + default AutoTune getAutoTune() { + return autoTune(); + } /** * Return the associated DataSource for this Database instance. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index c30134f31..0f1302f92 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -350,7 +350,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public AutoTune getAutoTune() { + public AutoTune autoTune() { return autoTuneService; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index a4ec77ffd..2067b4ebb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -333,7 +333,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public AutoTune getAutoTune() { + public AutoTune autoTune() { return null; } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java index a81bf1596..60952e34e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java @@ -32,8 +32,8 @@ public class TestBatchLazy extends BaseTestCase { } } - Ebean.getDefaultServer().getAutoTune().collectProfiling(); - Ebean.getDefaultServer().getAutoTune().reportProfiling(); + Ebean.getDefaultServer().autoTune().collectProfiling(); + Ebean.getDefaultServer().autoTune().reportProfiling(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 8d368a9c8..0c21fb250 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -68,7 +68,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { private static void collectUsage() { - Ebean.getDefaultServer().getAutoTune().collectProfiling(); + Ebean.getDefaultServer().autoTune().collectProfiling(); } } diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 65ccbc893..33804cfb3 100644 --- a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -117,7 +117,7 @@ public class TestAutoTuneProfiling extends BaseTestCase { private static void collectUsage() { - DB.getDefault().getAutoTune().collectProfiling(); + DB.getDefault().autoTune().collectProfiling(); } } From 12c5e9ea5d3475c339794a04dd84490409f4f01a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:48:09 +1200 Subject: [PATCH 028/102] #2344 - Rename Database.getDataSource() to dataSource() with deprecation --- .../src/main/java/io/ebean/Database.java | 20 +++++++++++++++++-- .../server/core/DScriptRunner.java | 2 +- .../server/core/DefaultServer.java | 6 +++--- .../sqlserver/SqlServerStepSequenceTest.java | 2 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 4 ++-- .../server/rawsql/TestRawSqlBuilder.java | 2 +- ebean-core/src/test/java/org/Main.java | 2 +- .../tests/basic/TestQueryUsingConnection.java | 3 +-- .../org/tests/query/TestQueryFindIterate.java | 2 +- .../dbmigration/DdlGenerator.java | 2 +- .../java/org/querytest/QCustomerTest.java | 2 +- .../java/org/integration/ClusterTest.java | 4 ++-- 12 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 4fabcb598..043b775f9 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -133,12 +133,28 @@ public interface Database { /** * Return the associated DataSource for this Database instance. */ - DataSource getDataSource(); + DataSource dataSource(); + + /** + * Deprecated migrate to dataSource(). + */ + @Deprecated + default DataSource getDataSource() { + return dataSource(); + } /** * Return the associated read only DataSource for this Database instance (can be null). */ - DataSource getReadOnlyDataSource(); + DataSource readOnlyDataSource(); + + /** + * Deprecated migrate to readOnlyDataSource(). + */ + @Deprecated + default DataSource getReadOnlyDataSource() { + return readOnlyDataSource(); + } /** * Return the name. This is used with {@link DB#byName(String)} to get a diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index cb78076bc..0844bdd36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -102,7 +102,7 @@ final class DScriptRunner implements ScriptRunner { private Connection obtainConnection() { try { - return server.getDataSource().getConnection(); + return server.dataSource().getConnection(); } catch (SQLException e) { throw new PersistenceException("Failed to obtain connection to run script", e); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 0f1302f92..92f47b516 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -355,12 +355,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return transactionManager.getDataSource(); } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { return transactionManager.getReadOnlyDataSource(); } @@ -635,7 +635,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public void truncate(String... tables) { - try (Connection connection = getDataSource().getConnection()) { + try (Connection connection = dataSource().getConnection()) { for (String table : tables) { executeSql(connection, databasePlatform.truncateStatement(table)); } diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index 6c356021b..ff4f3ad05 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -27,7 +27,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase { server().sqlUpdate("create sequence sqls_testseq_9876 start with 1 increment by 50").execute(); BackgroundExecutor be = server().getBackgroundExecutor(); - DataSource ds = server().getDataSource(); + DataSource ds = server().dataSource(); SqlServerStepSequence s = new SqlServerStepSequence(be, ds, "sqls_testseq_9876", 50); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 2067b4ebb..6c971d831 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -338,12 +338,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return null; } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 8d4feeaf9..9fa3fd0a9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -266,7 +266,7 @@ public class TestRawSqlBuilder extends BaseTestCase { "join o_customer c on o.kcustomer_id = c.id " + "where c.id = ? and o.id > ?"; - final DataSource dataSource = DB.getDefault().getDataSource(); + final DataSource dataSource = DB.getDefault().dataSource(); try (Connection connection = dataSource.getConnection()) { try (PreparedStatement stmt = connection.prepareStatement(sql)) { diff --git a/ebean-core/src/test/java/org/Main.java b/ebean-core/src/test/java/org/Main.java index 9ce670947..7489f8056 100644 --- a/ebean-core/src/test/java/org/Main.java +++ b/ebean-core/src/test/java/org/Main.java @@ -15,7 +15,7 @@ public class Main { EbeanServer ms = Ebean.getServer("ms"); - DataSource dataSource = ms.getDataSource(); + DataSource dataSource = ms.dataSource(); Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement("select next VALUE for j2_seq"); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java index 486d3a833..c7aba0ab8 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -2,7 +2,6 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -24,7 +23,7 @@ public class TestQueryUsingConnection extends BaseTestCase { ResetBasicData.reset(); - DataSource dataSource = DB.getDefault().getDataSource(); + DataSource dataSource = DB.getDefault().dataSource(); try (Connection connection = dataSource.getConnection()) { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index c2d31a851..0cd41e022 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -235,7 +235,7 @@ public class TestQueryFindIterate extends BaseTestCase { SpiServer pluginApi = server().getPluginApi(); DataSourcePool dsPool = (DataSourcePool) pluginApi.getServerConfig().getReadOnlyDataSource(); if (dsPool == null) { - dsPool = (DataSourcePool) server().getDataSource(); + dsPool = (DataSourcePool) server().dataSource(); } int startConns = dsPool.getStatus(false).getBusy(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 4c9ff9320..f5250827b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -141,7 +141,7 @@ public class DdlGenerator implements SpiDdlGenerator { private Connection obtainConnection() { try { - return server.getDataSource().getConnection(); + return server.dataSource().getConnection(); } catch (SQLException e) { throw new PersistenceException("Failed to obtain connection to run DDL", e); } diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 867290e71..223f62b0a 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -277,7 +277,7 @@ public class QCustomerTest { cust.setStatus(Customer.Status.GOOD); cust.save(); - DataSource dataSource = DB.getDefault().getDataSource(); + DataSource dataSource = DB.getDefault().dataSource(); try (Connection connection = dataSource.getConnection()) { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 2d1046009..57e4568d7 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -30,7 +30,7 @@ public class ClusterTest { public void testBothNear() { // ensure the default server exists first final Database db = DB.getDefault(); - Database other = createOther(db.getPluginApi().getDataSource()); + Database other = createOther(db.getPluginApi().dataSource()); new QPerson() .name.eq("Someone") @@ -62,7 +62,7 @@ public class ClusterTest { public void test() throws InterruptedException { // ensure the default server exists first final Database db = DB.getDefault(); - Database other = createOther(db.getPluginApi().getDataSource()); + Database other = createOther(db.getPluginApi().dataSource()); for (int i = 0; i < 10; i++) { Person foo = new Person("name " + i); From 7a7dbae313e845ed7e469ba0429766bfdd71cf7c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:52:34 +1200 Subject: [PATCH 029/102] #2342 - Rename Database.getName() to Database.name() with deprecation --- .../src/main/java/io/ebean/bean/BeanCollectionLoader.java | 2 +- .../src/main/java/io/ebean/common/AbstractBeanCollection.java | 4 ++-- .../io/ebeaninternal/server/loadcontext/DLoadManyContext.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java index 2f0e2848d..b7dc32034 100644 --- a/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java +++ b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java @@ -11,7 +11,7 @@ public interface BeanCollectionLoader { /** * Return the name of the associated Database. */ - String getName(); + String name(); /** * Invoke the lazy loading for this bean collection. diff --git a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java index 809ca13b3..912d9582f 100644 --- a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java +++ b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java @@ -63,7 +63,7 @@ abstract class AbstractBeanCollection implements BeanCollection { */ AbstractBeanCollection(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) { this.loader = loader; - this.ebeanServerName = loader.getName(); + this.ebeanServerName = loader.name(); this.ownerBean = ownerBean; this.propertyName = propertyName; this.readOnly = ownerBean != null && ownerBean._ebean_getIntercept().isReadOnly(); @@ -111,7 +111,7 @@ abstract class AbstractBeanCollection implements BeanCollection { public void setLoader(BeanCollectionLoader loader) { this.registeredWithLoadContext = true; this.loader = loader; - this.ebeanServerName = loader.getName(); + this.ebeanServerName = loader.name(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index 5f09de0b3..e549d49fb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -177,7 +177,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext } @Override - public String getName() { + public String name() { return context.serverName; } From 4557bdfa6f99265a9f60d62bf3e5eaff18332eb9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:55:47 +1200 Subject: [PATCH 030/102] #2345 - Rename Database.getExpressionFactory() to expressionFactory with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 2 +- ebean-api/src/main/java/io/ebean/Database.java | 10 +++++++++- ebean-api/src/main/java/io/ebean/Ebean.java | 2 +- .../io/ebeaninternal/server/core/DefaultServer.java | 2 +- .../io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +- .../ebeaninternal/server/deploy/BeanPropertyAssoc.java | 2 +- .../java/io/ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../org/tests/query/other/TestSubQueryBinding.java | 2 +- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index a16ce3513..2305a5d22 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -127,7 +127,7 @@ public final class DB { *

*/ public static ExpressionFactory getExpressionFactory() { - return getDefault().getExpressionFactory(); + return getDefault().expressionFactory(); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 043b775f9..eb68f06d9 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -173,7 +173,15 @@ public interface Database { /** * Return the ExpressionFactory for this database. */ - ExpressionFactory getExpressionFactory(); + ExpressionFactory expressionFactory(); + + /** + * Deprecated migrate to expressionFactory(). + */ + @Deprecated + default ExpressionFactory getExpressionFactory() { + return expressionFactory(); + } /** * Return the MetaInfoManager which is used to get meta data from the Database diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java index fb0e34db3..ae2bfe0c1 100644 --- a/ebean-api/src/main/java/io/ebean/Ebean.java +++ b/ebean-api/src/main/java/io/ebean/Ebean.java @@ -103,7 +103,7 @@ public final class Ebean { *

*/ public static ExpressionFactory getExpressionFactory() { - return getDefault().getExpressionFactory(); + return getDefault().expressionFactory(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 92f47b516..b2d4268b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -345,7 +345,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public ExpressionFactory getExpressionFactory() { + public ExpressionFactory expressionFactory() { return expressionFactory; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 6541cade1..f9f8fa97d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1793,7 +1793,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * We actually need to do a query because we don't know the type without the discriminator value. */ private T findReferenceBean(Object id, PersistenceContext pc) { - DefaultOrmQuery query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory()); + DefaultOrmQuery query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.expressionFactory()); query.setPersistenceContext(pc); return query.setId(id).findOne(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 33304f5f9..416d500aa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -229,7 +229,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * We use target descriptor rather than target property type to support ElementCollection. */ public SpiQuery newQuery(SpiEbeanServer server) { - return new DefaultOrmQuery<>(targetDescriptor, server, server.getExpressionFactory()); + return new DefaultOrmQuery<>(targetDescriptor, server, server.expressionFactory()); } @Override diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 6c971d831..6131b5df1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -353,7 +353,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public ExpressionFactory getExpressionFactory() { + public ExpressionFactory expressionFactory() { return null; } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java index ba51c90b8..a2b1815d6 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -17,7 +17,7 @@ public class TestSubQueryBinding extends BaseTestCase { Query someCustomerIds = server.find(Customer.class).select("id").where().lt("id", 5).query(); - Expression someCustIdsExpression = server.getExpressionFactory().in("id", someCustomerIds); + Expression someCustIdsExpression = server.expressionFactory().in("id", someCustomerIds); Query query = server.find(Customer.class).where().like("name", "Rob%").not(someCustIdsExpression).query(); From 7fba9adc433ff1e105de0e647c9f4d71b0ce81a2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:58:09 +1200 Subject: [PATCH 031/102] #2346 - Rename Database.getMetaInfoManager() to metaInfo() with deprecation --- .../src/main/java/io/ebean/Database.java | 10 +++++++++- .../server/core/DefaultServer.java | 2 +- .../server/core/DumpMetrics.java | 2 +- .../server/core/DumpMetricsData.java | 2 +- .../server/core/DumpMetricsJson.java | 4 ++-- .../src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../src/test/java/io/ebean/DtoQuery2Test.java | 4 ++-- .../java/io/ebean/DtoQueryFromOrmTest.java | 4 ++-- .../src/test/java/io/ebean/DtoQueryTest.java | 4 ++-- .../ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../query/finder/TestCustomerFinder.java | 20 +++++++++---------- .../src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../java/org/integration/ClusterTest.java | 6 +++--- 13 files changed, 38 insertions(+), 30 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index eb68f06d9..1adacc8e1 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -187,7 +187,15 @@ public interface Database { * Return the MetaInfoManager which is used to get meta data from the Database * such as query execution statistics. */ - MetaInfoManager getMetaInfoManager(); + MetaInfoManager metaInfo(); + + /** + * Deprecated migrate to metaInfo(). + */ + @Deprecated + default MetaInfoManager getMetaInfoManager() { + return metaInfo(); + } /** * Return the platform used for this database instance. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index b2d4268b2..2b588655b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -325,7 +325,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public MetaInfoManager getMetaInfoManager() { + public MetaInfoManager metaInfo() { return metaInfoManager; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java index b1f66f7ef..73ad97f2c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java @@ -74,7 +74,7 @@ final class DumpMetrics { void dump() { out("-- Dumping metrics for " + server.name() + " -- "); - ServerMetrics serverMetrics = server.getMetaInfoManager().collectMetrics(); + ServerMetrics serverMetrics = server.metaInfo().collectMetrics(); for (MetaTimedMetric metric : serverMetrics.timedMetrics()) { log(metric); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java index 712521ce0..ef006949f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java @@ -24,7 +24,7 @@ final class DumpMetricsData { } List data() { - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); return list; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java index 3358a709a..0b96dcbd9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java @@ -66,14 +66,14 @@ final class DumpMetricsJson implements ServerMetricsAsJson { @Override public String json() { writer = new StringWriter(); - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); return writer.toString(); } @Override public void write(Appendable buffer) { writer = buffer; - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); } private void collect(ServerMetrics serverMetrics) { diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index 988e73b59..f771d7ab1 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -82,11 +82,11 @@ public abstract class BaseTestCase { } protected void resetAllMetrics() { - server().getMetaInfoManager().resetAllMetrics(); + server().metaInfo().resetAllMetrics(); } protected ServerMetrics collectMetrics() { - return server().getMetaInfoManager().collectMetrics(); + return server().metaInfo().collectMetrics(); } protected List visitTimedMetrics() { diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java index 625cc9ae9..4d37aaf57 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java @@ -189,7 +189,7 @@ public class DtoQuery2Test extends BaseTestCase { // collect without reset BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true); - server().getMetaInfoManager().visitMetrics(basic); + server().metaInfo().visitMetrics(basic); List stats = basic.queryMetrics(); assertThat(stats).hasSize(1); @@ -205,7 +205,7 @@ public class DtoQuery2Test extends BaseTestCase { .setParameter("name", "rob") .findList(); - BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic(); + BasicMetricVisitor metric2 = server().metaInfo().visitBasic(); stats = metric2.queryMetrics(); assertThat(stats).hasSize(2); diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java index 28b0bd490..db9e85aa9 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java @@ -21,12 +21,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase { @BeforeClass public static void resetStats() { - DB.getDefault().getMetaInfoManager().resetAllMetrics(); + DB.getDefault().metaInfo().resetAllMetrics(); } @AfterClass public static void reportStats() { - ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics(); + ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics(); for (MetaQueryMetric metric : metrics.queryMetrics()) { System.out.println(metric); } diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java index 0331a8215..f9e5406e1 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java @@ -281,7 +281,7 @@ public class DtoQueryTest extends BaseTestCase { // collect without reset BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true); - server().getMetaInfoManager().visitMetrics(basic); + server().metaInfo().visitMetrics(basic); List stats = basic.queryMetrics(); assertThat(stats).hasSize(1); @@ -297,7 +297,7 @@ public class DtoQueryTest extends BaseTestCase { .setParameter("name", "rob") .findList(); - ServerMetrics metric2 = server().getMetaInfoManager().collectMetrics(); + ServerMetrics metric2 = server().metaInfo().collectMetrics(); stats = metric2.queryMetrics(); assertThat(stats).hasSize(2); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 6131b5df1..8963bfa5b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -358,7 +358,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public MetaInfoManager getMetaInfoManager() { + public MetaInfoManager metaInfo() { return null; } diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 68b5c627a..04b0e755d 100644 --- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -31,7 +31,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer0 = new StringBuilder(); - DB.getDefault().getMetaInfoManager() + DB.getDefault().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer0); @@ -45,7 +45,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer1 = new StringBuilder(); - DB.getDefault().getMetaInfoManager() + DB.getDefault().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer1); @@ -177,7 +177,7 @@ public class TestCustomerFinder extends BaseTestCase { QueryPlanInit init0 = new QueryPlanInit(); init0.setAll(true); init0.thresholdMicros(2); - final List plans = server().getMetaInfoManager().queryPlanInit(init0); + final List plans = server().metaInfo().queryPlanInit(init0); assertThat(plans.size()).isGreaterThan(1); // the server has some plans @@ -187,13 +187,13 @@ public class TestCustomerFinder extends BaseTestCase { QueryPlanInit init = new QueryPlanInit(); init.setAll(true); init.thresholdMicros(1); - final List appliedToPlans = server().getMetaInfoManager().queryPlanInit(init); + final List appliedToPlans = server().metaInfo().queryPlanInit(init); assertThat(appliedToPlans.size()).isGreaterThan(4); // run queries again runQueries(); - ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics(); + ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics(); List planStats = metrics.queryMetrics(); assertThat(planStats.size()).isGreaterThan(4); @@ -212,7 +212,7 @@ public class TestCustomerFinder extends BaseTestCase { request.maxCount(1_000); // don't collect any more plans if used 10 secs request.maxTimeMillis(10_000); - List plans0 = server().getMetaInfoManager().queryPlanCollectNow(request); + List plans0 = server().metaInfo().queryPlanCollectNow(request); assertThat(plans0).isNotEmpty(); for (MetaQueryPlan plan : plans) { @@ -232,7 +232,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); - String metricsJson = server().getMetaInfoManager() + String metricsJson = server().metaInfo() .collectMetricsAsJson() .withHash(true) .withExtraAttributes(true) @@ -256,7 +256,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); - String metricsJson = server().getMetaInfoManager() + String metricsJson = server().metaInfo() .collectMetricsAsJson() .withHash(false) .withExtraAttributes(false) @@ -279,7 +279,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer = new StringBuilder(); - server().getMetaInfoManager() + server().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer); @@ -297,7 +297,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer = new StringBuilder(); - server().getMetaInfoManager() + server().metaInfo() .collectMetricsAsJson() .withHeader(true) .write(buffer); diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 4c0410ff3..568664de2 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -78,11 +78,11 @@ public abstract class BaseTestCase { } protected void resetAllMetrics() { - server().getMetaInfoManager().resetAllMetrics(); + server().metaInfo().resetAllMetrics(); } protected ServerMetrics collectMetrics() { - return server().getMetaInfoManager().collectMetrics(); + return server().metaInfo().collectMetrics(); } protected List visitTimedMetrics() { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 57e4568d7..9ae04139e 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -40,8 +40,8 @@ public class ClusterTest { foo.save(); DB.getServerCacheManager().clearAll(); - DB.getDefault().getMetaInfoManager().resetAllMetrics(); - other.getMetaInfoManager().resetAllMetrics(); + DB.getDefault().metaInfo().resetAllMetrics(); + other.metaInfo().resetAllMetrics(); Person fooA = DB.find(Person.class, foo.getId()); Person fooB = other.find(Person.class, foo.getId()); @@ -70,7 +70,7 @@ public class ClusterTest { } other.getServerCacheManager().clearAll(); - other.getMetaInfoManager().resetAllMetrics(); + other.metaInfo().resetAllMetrics(); DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class); From fe67abce83890091d65e4f0529949063ff3ed5e9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 23:04:57 +1200 Subject: [PATCH 032/102] #2347 - Rename Database.getPlatform() to platform() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 2 +- .../src/main/java/io/ebean/Database.java | 30 +++++++++++++++++-- ebean-api/src/main/java/io/ebean/Ebean.java | 2 +- .../io/ebean/bean/EntityBeanIntercept.java | 2 +- .../java/io/ebean/bean/SingleBeanLoader.java | 6 ++-- .../service/DefaultAutoTuneService.java | 2 +- .../server/core/DefaultServer.java | 6 ++-- .../java/io/ebean/ConditionalTestRunner.java | 2 +- .../dbplatform/DatabasePlatformTest.java | 10 +++---- .../sqlserver/SqlServerStepSequenceTest.java | 2 +- .../java/io/ebean/plugin/BeanTypeTest.java | 2 +- .../io/ebean/plugin/ExpressionPathTest.java | 2 +- .../java/io/ebean/plugin/PropertyTest.java | 2 +- .../java/io/ebean/plugin/SpiServerTest.java | 2 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 6 ++-- .../DefaultChangeLogListenerTest.java | 2 +- .../TestShutdownWithBackgroundTasks.java | 2 +- .../api/support/DocStoreDeleteEventTest.java | 2 +- .../api/support/DocStoreIndexEventTest.java | 2 +- .../java/org/tests/cache/TestQueryCache.java | 2 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 4 +-- .../java/org/tests/el/TestPathExpression.java | 2 +- .../org/tests/json/TestDbJson_Jackson.java | 4 +-- .../org/tests/json/TestDbJson_Jackson2.java | 2 +- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../org/tests/query/TestQueryFindIterate.java | 2 +- .../query/cancel/SqlQueryCancelTest.java | 3 +- .../sqlquery/TestNativeILikeExpression.java | 4 +-- .../text/json/TestTextJsonInvokeLazy.java | 4 +-- .../java/org/tests/types/TestNewTypes.java | 2 +- .../java/io/ebean/ConditionalTestRunner.java | 2 +- .../dbmigration/DbMigrationTest.java | 2 +- .../platform/PlatformDdl_AlterColumnTest.java | 2 +- .../platform/PlatformDdl_CreateIndexTest.java | 2 +- .../java/org/integration/ClusterTest.java | 4 +-- 35 files changed, 76 insertions(+), 53 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 2305a5d22..c9603ada6 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1254,7 +1254,7 @@ public final class DB { * queries. */ public static BackgroundExecutor getBackgroundExecutor() { - return getDefault().getBackgroundExecutor(); + return getDefault().backgroundExecutor(); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 1adacc8e1..c11e0cedc 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -214,12 +214,28 @@ public interface Database { * * @return platform for this database instance */ - Platform getPlatform(); + Platform platform(); + + /** + * Deprecated migrate to platform(). + */ + @Deprecated + default Platform getPlatform() { + return platform(); + } /** * Return the extended API intended for use by plugins. */ - SpiServer getPluginApi(); + SpiServer pluginApi(); + + /** + * Deprecated migrate to pluginApi(). + */ + @Deprecated + default SpiServer getPluginApi() { + return pluginApi(); + } /** * Return the BeanState for a given entity bean. @@ -1485,7 +1501,15 @@ public interface Database { * Return the BackgroundExecutor service for asynchronous processing of * queries. */ - BackgroundExecutor getBackgroundExecutor(); + BackgroundExecutor backgroundExecutor(); + + /** + * Deprecated migrate to backgroundExecutor(). + */ + @Deprecated + default BackgroundExecutor getBackgroundExecutor() { + return backgroundExecutor(); + } /** * Return the JsonContext for reading/writing JSON. diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java index ae2bfe0c1..7dc6cd308 100644 --- a/ebean-api/src/main/java/io/ebean/Ebean.java +++ b/ebean-api/src/main/java/io/ebean/Ebean.java @@ -1216,7 +1216,7 @@ public final class Ebean { * queries. */ public static BackgroundExecutor getBackgroundExecutor() { - return getDefault().getBackgroundExecutor(); + return getDefault().backgroundExecutor(); } /** diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java index 9924bf4f7..3725cc73c 100644 --- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java +++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java @@ -843,7 +843,7 @@ public final class EntityBeanIntercept implements Serializable { } // For stand alone reference bean or after deserialisation lazy load // using the ebeanServer. Synchronise only on the bean. - loadBeanInternal(loadProperty, database.getPluginApi().beanLoader()); + loadBeanInternal(loadProperty, database.pluginApi().beanLoader()); return; } } finally { diff --git a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java index e196d3c5a..73f3fe5d8 100644 --- a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java +++ b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java @@ -39,7 +39,7 @@ public abstract class SingleBeanLoader implements BeanLoader { @Override public void loadBean(EntityBeanIntercept ebi) { - database.getPluginApi().loadBeanL2(ebi); + database.pluginApi().loadBeanL2(ebi); } } @@ -53,7 +53,7 @@ public abstract class SingleBeanLoader implements BeanLoader { @Override public void loadBean(EntityBeanIntercept ebi) { - database.getPluginApi().loadBeanRef(ebi); + database.pluginApi().loadBeanRef(ebi); } } @@ -67,7 +67,7 @@ public abstract class SingleBeanLoader implements BeanLoader { @Override public void loadBean(EntityBeanIntercept ebi) { - database.getPluginApi().loadBean(ebi); + database.pluginApi().loadBean(ebi); } } } diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index 8ea80d3a6..b8d302f23 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -77,7 +77,7 @@ public class DefaultAutoTuneService implements AutoTuneService { loadTuningFile(); if (isRuntimeTuningUpdates()) { // periodically gather and update query tuning - server.getBackgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS); + server.backgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 2b588655b..df7a32beb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -330,17 +330,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public Platform getPlatform() { + public Platform platform() { return databasePlatform.getPlatform(); } @Override - public SpiServer getPluginApi() { + public SpiServer pluginApi() { return this; } @Override - public BackgroundExecutor getBackgroundExecutor() { + public BackgroundExecutor backgroundExecutor() { return backgroundExecutor; } diff --git a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java index 4adf007d8..d0dea0067 100644 --- a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java +++ b/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java @@ -37,7 +37,7 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner { } private boolean platformMath(Platform[] platforms) { - Platform basePlatform = DB.getDefault().getPlatform().base(); + Platform basePlatform = DB.getDefault().platform().base(); for (Platform platform : platforms) { if (platform.equals(basePlatform)) { return true; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 40d8b6e28..1e7603a7e 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java @@ -20,35 +20,35 @@ public class DatabasePlatformTest extends BaseTestCase { @Test @ForPlatform(Platform.H2) public void h2_platform() { - final Platform platform = DB.getDefault().getPlatform(); + final Platform platform = DB.getDefault().platform(); assertThat(platform).isSameAs(Platform.H2); } @Test @ForPlatform(Platform.POSTGRES) public void postgres_platform() { - final Platform platform = DB.getDefault().getPlatform().base(); + final Platform platform = DB.getDefault().platform().base(); assertThat(platform).isSameAs(Platform.POSTGRES); } @Test @ForPlatform(Platform.MYSQL) public void mysql_platform() { - final Platform platform = DB.getDefault().getPlatform().base(); + final Platform platform = DB.getDefault().platform().base(); assertThat(platform).isSameAs(Platform.MYSQL); } @Test @ForPlatform(Platform.MARIADB) public void mariadb_platform() { - final Platform platform = DB.getDefault().getPlatform().base(); + final Platform platform = DB.getDefault().platform().base(); assertThat(platform).isSameAs(Platform.MARIADB); } @Test @ForPlatform(Platform.SQLSERVER) public void sqlserver_platform() { - final Platform platform = DB.getDefault().getPlatform().base(); + final Platform platform = DB.getDefault().platform().base(); assertThat(platform).isSameAs(Platform.SQLSERVER); } diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index ff4f3ad05..e6c622437 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -26,7 +26,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase { server().sqlUpdate("drop sequence if exists sqls_testseq_9876").execute(); server().sqlUpdate("create sequence sqls_testseq_9876 start with 1 increment by 50").execute(); - BackgroundExecutor be = server().getBackgroundExecutor(); + BackgroundExecutor be = server().backgroundExecutor(); DataSource ds = server().dataSource(); SqlServerStepSequence s = new SqlServerStepSequence(be, ds, "sqls_testseq_9876", 50); diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index 820e89408..222dd2508 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -28,7 +28,7 @@ public class BeanTypeTest { private static Database db = DB.getDefault(); private BeanType beanType(Class cls) { - return db.getPluginApi().getBeanType(cls); + return db.pluginApi().getBeanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index 274cbb846..de6a79308 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java @@ -15,7 +15,7 @@ public class ExpressionPathTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.getPluginApi().getBeanType(cls); + return server.pluginApi().getBeanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index 581d5a647..1e3fcf472 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -15,7 +15,7 @@ public class PropertyTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.getPluginApi().getBeanType(cls); + return server.pluginApi().getBeanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index 4ea9727de..507df1339 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -23,7 +23,7 @@ public class SpiServerTest extends BaseTestCase { public void test() { EbeanServer defaultServer = Ebean.getDefaultServer(); - SpiServer pluginApi = defaultServer.getPluginApi(); + SpiServer pluginApi = defaultServer.pluginApi(); BeanType beanType = pluginApi.getBeanType(Customer.class); assertEquals("o_customer", beanType.getBaseTable()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 8963bfa5b..1e52c263e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -143,12 +143,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public Platform getPlatform() { + public Platform platform() { return Platform.GENERIC; } @Override - public SpiServer getPluginApi() { + public SpiServer pluginApi() { return null; } @@ -924,7 +924,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public BackgroundExecutor getBackgroundExecutor() { + public BackgroundExecutor backgroundExecutor() { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index e13ff7615..0209d5438 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -16,7 +16,7 @@ public class DefaultChangeLogListenerTest extends BaseTestCase { DefaultChangeLogListener changeLogListener = new DefaultChangeLogListener(); EbeanServer defaultServer = Ebean.getDefaultServer(); - changeLogListener.configure(defaultServer.getPluginApi()); + changeLogListener.configure(defaultServer.pluginApi()); ChangeSet changeSet = helper.createChangeSet("INT-001", 13); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java index a0a98c38a..563e50f3e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java @@ -15,7 +15,7 @@ public class TestShutdownWithBackgroundTasks extends BaseTestCase { public void test() { Database server = DB.getDefault(); - final BackgroundExecutor bg = server.getBackgroundExecutor(); + final BackgroundExecutor bg = server.backgroundExecutor(); try { for (int i = 0; i < 12; i++) { bg.execute(new Job(server, 500, i)); diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 9381188cf..6bfb125fa 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -22,7 +22,7 @@ public class DocStoreDeleteEventTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.getPluginApi().getBeanType(cls); + return server.pluginApi().getBeanType(cls); } BeanType orderType() { diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index c214f22ef..b2b8dd3ce 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -20,7 +20,7 @@ public class DocStoreIndexEventTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.getPluginApi().getBeanType(cls); + return server.pluginApi().getBeanType(cls); } BeanType orderType() { diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index 4c4d56109..6fbcdac6d 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -300,7 +300,7 @@ public class TestQueryCache extends BaseTestCase { @Test public void findCountDifferentQueriesBit() { - DB.getDefault().getPluginApi().getServerCacheManager().clearAll(); + DB.getDefault().pluginApi().getServerCacheManager().clearAll(); differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0)); differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0)); // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0 diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 237b4c66b..9dc2ec555 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -23,7 +23,7 @@ public class TestDPersonEl { Currency NZD = Currency.getInstance("NZD"); assertThat(NZD).isNotNull(); - + DPerson p = new DPerson(); p.setFirstName("first"); p.setLastName("last"); @@ -31,7 +31,7 @@ public class TestDPersonEl { Ebean.save(p); - SpiServer server = Ebean.getDefaultServer().getPluginApi(); + SpiServer server = Ebean.getDefaultServer().pluginApi(); BeanType descriptor = server.getBeanType(DPerson.class); diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index 1fa061269..a39d63f9a 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -20,7 +20,7 @@ public class TestPathExpression { final ExpressionPath city; public TestPathExpression() { - SpiServer server = Ebean.getDefaultServer().getPluginApi(); + SpiServer server = Ebean.getDefaultServer().pluginApi(); beanType = server.getBeanType(Customer.class); billingId = beanType.getExpressionPath("billingAddress.id"); line1 = beanType.getExpressionPath("billingAddress.line1"); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java index 00b4bfa52..3fb42e561 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -37,7 +37,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, "one"); bean.getValueMap().put(2, "two"); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); String json = mapper.writeValueAsString(bean); EBasicJsonJackson found = mapper.readValue(json, EBasicJsonJackson.class); @@ -83,7 +83,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); String json = mapper.writeValueAsString(bean); assertThat(json) diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java index f4a9a0d41..ef258ec86 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -34,7 +34,7 @@ public class TestDbJson_Jackson2 extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); String json = mapper.writeValueAsString(bean); found = mapper.readValue(json, EBasicJsonJackson2.class); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index fe957ef88..f98590371 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -20,7 +20,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { ResetBasicData.reset(); - BeanType embType = Ebean.getDefaultServer().getPluginApi().getBeanType(EAddr.class); + BeanType embType = Ebean.getDefaultServer().pluginApi().getBeanType(EAddr.class); Ebean.getDefaultServer().getServerCacheManager().clearAll(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 0cd41e022..7fb3b3863 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -232,7 +232,7 @@ public class TestQueryFindIterate extends BaseTestCase { public void findIterateCloseConnection(boolean withLoadBatch) { ResetBasicData.reset(); - SpiServer pluginApi = server().getPluginApi(); + SpiServer pluginApi = server().pluginApi(); DataSourcePool dsPool = (DataSourcePool) pluginApi.getServerConfig().getReadOnlyDataSource(); if (dsPool == null) { dsPool = (DataSourcePool) server().dataSource(); diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 40818cc91..5d51620c2 100644 --- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -1,7 +1,6 @@ package org.tests.query.cancel; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.sql.SQLException; @@ -76,7 +75,7 @@ public class SqlQueryCancelTest extends BaseTestCase { EBasic model = new EBasic("Basic " + i); DB.save(model); } - if (Platform.H2.equals(DB.getDefault().getPlatform())) { + if (Platform.H2.equals(DB.getDefault().platform())) { SlowDownEBasic.setSelectWaitMillis(0); } } diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index b3898dfad..37963ead5 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -36,9 +36,9 @@ public class TestNativeILikeExpression extends BaseTestCase { private boolean isExpectNative() { - SpiServer pluginApi = server().getPluginApi(); + SpiServer pluginApi = server().pluginApi(); boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike(); - Platform platform = pluginApi.getPlatform().base(); + Platform platform = pluginApi.platform().base(); return expressionNativeIlike && platform == Platform.POSTGRES; } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index ee41b162e..99b0dd279 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -16,9 +16,9 @@ public class TestTextJsonInvokeLazy extends BaseTestCase { @Before public void clearBeanCache() { - server().getPluginApi().getBeanType(Customer.class).clearBeanCache(); + server().pluginApi().getBeanType(Customer.class).clearBeanCache(); } - + @Test public void test() throws IOException { diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java index ca02e91bc..eb0210564 100644 --- a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java @@ -216,7 +216,7 @@ public class TestNewTypes extends BaseTestCase { private void testSetGetPath(SomeNewTypesBean refBean) { SomeNewTypesBean testBean = new SomeNewTypesBean(); - BeanType beanType = DB.getDefault().getPluginApi().getBeanType(SomeNewTypesBean.class); + BeanType beanType = DB.getDefault().pluginApi().getBeanType(SomeNewTypesBean.class); ExpressionPath localDate = beanType.getExpressionPath("localDate"); ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime"); ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime"); diff --git a/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java index 4adf007d8..d0dea0067 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java @@ -37,7 +37,7 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner { } private boolean platformMath(Platform[] platforms) { - Platform basePlatform = DB.getDefault().getPlatform().base(); + Platform basePlatform = DB.getDefault().platform().base(); for (Platform platform : platforms) { if (platform.equals(basePlatform)) { return true; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index 110fcb943..a659a2b65 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DbMigrationTest extends BaseTestCase { private void runScript(boolean expectErrors, String scriptName) throws IOException { - String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().getPlatform().name().toLowerCase() + "/" + scriptName); + String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().platform().name().toLowerCase() + "/" + scriptName); runScript(expectErrors, ddl, scriptName); } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index a696c4e62..0ddbcbca1 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -33,7 +33,7 @@ public class PlatformDdl_AlterColumnTest { private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); { - DatabaseConfig serverConfig = DB.getDefault().getPluginApi().getServerConfig(); + DatabaseConfig serverConfig = DB.getDefault().pluginApi().getServerConfig(); sqlServerDdl.configure(serverConfig); } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java index d7d33feae..c1871d4db 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java @@ -25,7 +25,7 @@ public class PlatformDdl_CreateIndexTest { private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); { - DatabaseConfig config = DB.getDefault().getPluginApi().getServerConfig(); + DatabaseConfig config = DB.getDefault().pluginApi().getServerConfig(); h2Ddl.configure(config); pgDdl.configure(config); mysqlDdl.configure(config); diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 9ae04139e..c61b521a0 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -30,7 +30,7 @@ public class ClusterTest { public void testBothNear() { // ensure the default server exists first final Database db = DB.getDefault(); - Database other = createOther(db.getPluginApi().dataSource()); + Database other = createOther(db.pluginApi().dataSource()); new QPerson() .name.eq("Someone") @@ -62,7 +62,7 @@ public class ClusterTest { public void test() throws InterruptedException { // ensure the default server exists first final Database db = DB.getDefault(); - Database other = createOther(db.getPluginApi().dataSource()); + Database other = createOther(db.pluginApi().dataSource()); for (int i = 0; i < 10; i++) { Person foo = new Person("name " + i); From 0ed6ccf4998d66d199f9fdc5b6bdbb7ebd28de48 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 23:14:33 +1200 Subject: [PATCH 033/102] #2348 - Rename Database.getServerCacheManager() to cacheManager() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 2 +- ebean-api/src/main/java/io/ebean/Database.java | 10 +++++++++- ebean-api/src/main/java/io/ebean/Ebean.java | 2 +- .../io/ebeaninternal/server/core/DefaultServer.java | 2 +- ebean-core/src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../java/io/ebean/cache/ServerCacheManagerTest.java | 2 +- .../java/io/ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../server/transaction/JdbcTransactionTest.java | 2 +- .../test/java/org/tests/basic/TestQueryWithCache.java | 2 +- .../tests/batchload/TestBatchLazyWithCacheHits.java | 2 +- .../src/test/java/org/tests/cache/TestBeanCache.java | 2 +- .../java/org/tests/cache/TestBeanFetchJoinCache.java | 4 ++-- .../org/tests/cache/TestL2DirtyFlagOnLazyLoad.java | 2 +- .../src/test/java/org/tests/cache/TestQueryCache.java | 2 +- .../org/tests/cache/personinfo/PersonCacheTests.java | 6 +++--- .../inheritance/cache/TestInheritCacheRefLoad.java | 2 +- .../basic/cache/TestCacheViaComplexNaturalKey.java | 2 +- .../basic/cache/TestCacheViaComplexNaturalKey3.java | 3 +-- .../tests/model/embedded/TestEmbeddedManyToOne.java | 2 +- .../query/embedded/TestMultipleEmbeddedLoading.java | 2 +- .../test/java/org/tests/readaudit/TestReadAudit.java | 4 ++-- .../src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../src/test/java/org/integration/ClusterTest.java | 6 +++--- 23 files changed, 39 insertions(+), 32 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index c9603ada6..619a6ecc2 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1246,7 +1246,7 @@ public final class DB { * Return the manager of the level 2 cache ("L2" cache). */ public static ServerCacheManager getServerCacheManager() { - return getDefault().getServerCacheManager(); + return getDefault().cacheManager(); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index c11e0cedc..be89f86c2 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1495,7 +1495,15 @@ public interface Database { /** * Return the manager of the server cache ("L2" cache). */ - ServerCacheManager getServerCacheManager(); + ServerCacheManager cacheManager(); + + /** + * Deprecated migrate to cacheManager(). + */ + @Deprecated + default ServerCacheManager getServerCacheManager() { + return cacheManager(); + } /** * Return the BackgroundExecutor service for asynchronous processing of diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java index 7dc6cd308..5756a18bf 100644 --- a/ebean-api/src/main/java/io/ebean/Ebean.java +++ b/ebean-api/src/main/java/io/ebean/Ebean.java @@ -1208,7 +1208,7 @@ public final class Ebean { * Return the manager of the server cache ("L2" cache). */ public static ServerCacheManager getServerCacheManager() { - return getDefault().getServerCacheManager(); + return getDefault().cacheManager(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index df7a32beb..0cee2236b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -538,7 +538,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public ServerCacheManager getServerCacheManager() { + public ServerCacheManager cacheManager() { return serverCacheManager; } diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index f771d7ab1..dd3c949f9 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -78,7 +78,7 @@ public abstract class BaseTestCase { } protected void clearAllL2Cache() { - server().getServerCacheManager().clearAll(); + server().cacheManager().clearAll(); } protected void resetAllMetrics() { @@ -242,7 +242,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().getServerCacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().getBeanCache(cls).getStatistics(reset); } protected Platform platform() { diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java index 337a80116..beaa1b31f 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java @@ -12,7 +12,7 @@ public class ServerCacheManagerTest { @Test public void test() { - ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager(); + ServerCacheManager cacheManager = DB.getDefault().cacheManager(); for (ServerCacheRegion region : cacheManager.allRegions()) { assertTrue(region.isEnabled()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 1e52c263e..648744ca8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -919,7 +919,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public ServerCacheManager getServerCacheManager() { + public ServerCacheManager cacheManager() { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index 7416ca58b..ad5a4e1a6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -43,7 +43,7 @@ public class JdbcTransactionTest { @Test public void skipCacheAfterSave() { - ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager(); + ServerCacheManager cacheManager = DB.getDefault().cacheManager(); ServerCache customerBeanCache = cacheManager.getBeanCache(Customer.class); ServerCache contactNatKeyCache = cacheManager.getNaturalKeyCache(Contact.class); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 6e8208409..06ef39bdf 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -30,7 +30,7 @@ public class TestQueryWithCache extends BaseTestCase { assertTrue(cacheOptions.isReadOnly()); assertTrue(beanDescriptor.isCacheSharableBeans()); - ServerCacheManager serverCacheManager = server.getServerCacheManager(); + ServerCacheManager serverCacheManager = server.cacheManager(); serverCacheManager.clear(Country.class); ServerCache beanCache = serverCacheManager.getBeanCache(Country.class); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 2869b2121..3d78cd137 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { - private final ServerCache beanCache = server().getServerCacheManager().getBeanCache(UUOne.class); + private final ServerCache beanCache = server().cacheManager().getBeanCache(UUOne.class); private UUOne insert(String name) { UUOne one = new UUOne(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java index 99e40879d..280848b95 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java @@ -27,7 +27,7 @@ public class TestBeanCache extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestBeanCache.class); - private final ServerCache beanCache = DB.getDefault().getServerCacheManager().getBeanCache(OCachedBean.class); + private final ServerCache beanCache = DB.getDefault().cacheManager().getBeanCache(OCachedBean.class); @Test public void findById_when_idTypeConverted() { diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index d22c21e3b..c0d632abc 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestBeanFetchJoinCache extends BaseTestCase { - private final ServerCache customerBeanCache = server().getServerCacheManager().getBeanCache(Customer.class); + private final ServerCache customerBeanCache = server().cacheManager().getBeanCache(Customer.class); @Test public void fetchCache_when_allHits() { @@ -181,6 +181,6 @@ public class TestBeanFetchJoinCache extends BaseTestCase { private void initDataClearCache() { ResetBasicData.reset(); - server().getServerCacheManager().clearAll(); + server().cacheManager().clearAll(); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index bd655c2fd..6032728a4 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -27,7 +27,7 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { // clearAll() caches via the ServerCacheManager ... // Clear all the caches on the default/primary EbeanServer - server().getServerCacheManager().clearAll(); + server().cacheManager().clearAll(); //TEST try (Transaction tx1 = Ebean.beginTransaction()) { diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index 6fbcdac6d..b8a2b518b 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -300,7 +300,7 @@ public class TestQueryCache extends BaseTestCase { @Test public void findCountDifferentQueriesBit() { - DB.getDefault().pluginApi().getServerCacheManager().clearAll(); + DB.getDefault().pluginApi().cacheManager().clearAll(); differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0)); differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0)); // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0 diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index 20935a319..d057edffd 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -21,10 +21,10 @@ public class PersonCacheTests { private final List ids = Arrays.asList("E001", "E002", "E003"); - private ServerCache beanCacheInfo = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheInfo.class); - private ServerCache beanCacheEmail = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheEmail.class); + private ServerCache beanCacheInfo = DB.getDefault().cacheManager().getBeanCache(PersonCacheInfo.class); + private ServerCache beanCacheEmail = DB.getDefault().cacheManager().getBeanCache(PersonCacheEmail.class); - private ServerCacheRegion region = DB.getDefault().getServerCacheManager().getRegion("email"); + private ServerCacheRegion region = DB.getDefault().cacheManager().getRegion("email"); private void insert(int id, String email) { diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java index 0f79a4206..af6c1299d 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java @@ -56,7 +56,7 @@ public class TestInheritCacheRefLoad { Class streetClassLazyLoaded = customerReloaded.getAddress().getStreet().getClass(); //Show Cache Hits - System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().getServerCacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount()); + System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount()); return streetClassLazyLoaded; } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 3b2cfc5f5..7411b1842 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -27,7 +27,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { private static boolean loadOnce; private ServerCacheManager cacheManager() { - return server().getServerCacheManager(); + return server().cacheManager(); } private static void insertSome() { diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 236b2545e..a94b77725 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -10,7 +10,6 @@ import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -25,7 +24,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { private static boolean loadOnce; private ServerCacheManager cacheManager() { - return server().getServerCacheManager(); + return server().cacheManager(); } private static void insertSome() { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index f98590371..7eff8c97f 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -22,7 +22,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { BeanType embType = Ebean.getDefaultServer().pluginApi().getBeanType(EAddr.class); - Ebean.getDefaultServer().getServerCacheManager().clearAll(); + Ebean.getDefaultServer().cacheManager().clearAll(); Country nz = Ebean.getReference(Country.class, "NZ"); diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index b6ca2d3c0..616d0b441 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -77,7 +77,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { assertEquals("3 Pineapple St", billAddress.getStreet()); EbeanServer server = Ebean.getServer(null); - ServerCacheManager serverCacheManager = server.getServerCacheManager(); + ServerCacheManager serverCacheManager = server.cacheManager(); // get cache, clear the cache and statistics ServerCache beanCache = serverCacheManager.getBeanCache(EInvoice.class); diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index 98f24353b..f2e74e4f5 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -83,7 +83,7 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache() { resetCounters(); - ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class); + ServerCache beanCache = server.cacheManager().getBeanCache(EBasicChangeLog.class); beanCache.getStatistics(true); EBasicChangeLog found = server.find(EBasicChangeLog.class, id1); @@ -111,7 +111,7 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache_sharedBean() { resetCounters(); - ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class); + ServerCache beanCache = server.cacheManager().getBeanCache(Country.class); beanCache.getStatistics(true); Country found = server.find(Country.class, "AR"); diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 568664de2..93ca61c87 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -74,7 +74,7 @@ public abstract class BaseTestCase { } protected void clearAllL2Cache() { - server().getServerCacheManager().clearAll(); + server().cacheManager().clearAll(); } protected void resetAllMetrics() { @@ -238,7 +238,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().getServerCacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().getBeanCache(cls).getStatistics(reset); } protected Platform platform() { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index c61b521a0..b1f134ca3 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -54,7 +54,7 @@ public class ClusterTest { fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 2, 1, 0, 1); fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheB = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class); + DuelCache dualCacheB = (DuelCache) other.cacheManager().getBeanCache(Person.class); assertCounts(dualCacheB, 2, 1, 1, 0); } @@ -69,10 +69,10 @@ public class ClusterTest { foo.save(); } - other.getServerCacheManager().clearAll(); + other.cacheManager().clearAll(); other.metaInfo().resetAllMetrics(); - DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class); + DuelCache dualCache = (DuelCache) other.cacheManager().getBeanCache(Person.class); Person foo0 = other.find(Person.class, 1); assertCounts(dualCache, 0, 1, 0, 1); From a5f9beabdffa7cb4f87d954885e999c6647abba9 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 09:31:16 +1200 Subject: [PATCH 034/102] #2349 - Rename Database.getBeanId() to beanId() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 2 +- .../src/main/java/io/ebean/Database.java | 20 +++++++++++++++++-- .../server/core/DefaultServer.java | 4 ++-- .../ebeaninternal/api/TDSpiEbeanServer.java | 4 ++-- .../org/tests/basic/TestExplicitInsert.java | 6 +++--- .../TestBatchSaveWithGetBeanId.java | 2 +- .../bothsides/TestInheritanceBothSides.java | 4 ++-- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 619a6ecc2..6851a6129 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1239,7 +1239,7 @@ public final class DB { * Return the value of the Id property for a given bean. */ public static Object getBeanId(Object bean) { - return getDefault().getBeanId(bean); + return getDefault().beanId(bean); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index be89f86c2..d113cf041 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -248,7 +248,15 @@ public interface Database { /** * Return the value of the Id property for a given bean. */ - Object getBeanId(Object bean); + Object beanId(Object bean); + + /** + * Deprecated migrate to beanId(). + */ + @Deprecated + default Object getBeanId(Object bean) { + return beanId(bean); + } /** * Set the Id value onto the bean converting the type of the id value if necessary. @@ -260,7 +268,15 @@ public interface Database { * @param bean The entity bean to set the id value on. * @param id The id value to set. */ - Object setBeanId(Object bean, Object id); + Object beanId(Object bean, Object id); + + /** + * Deprecated migrate to beanId(). + */ + @Deprecated + default Object setBeanId(Object bean, Object id) { + return beanId(bean, id); + } /** * Return a map of the differences between two objects of the same type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 0cee2236b..f6916bbe4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -2079,7 +2079,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public Object setBeanId(Object bean, Object id) { + public Object beanId(Object bean, Object id) { EntityBean eb = checkEntityBean(bean); BeanDescriptor desc = getBeanDescriptor(bean.getClass()); if (desc == null) { @@ -2089,7 +2089,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public Object getBeanId(Object bean) { + public Object beanId(Object bean) { EntityBean eb = checkEntityBean(bean); BeanDescriptor desc = getBeanDescriptor(bean.getClass()); if (desc == null) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 648744ca8..df747b1d0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -368,12 +368,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public Object setBeanId(Object bean, Object id) { + public Object beanId(Object bean, Object id) { return id; } @Override - public Object getBeanId(Object bean) { + public Object beanId(Object bean) { return null; } diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java index c6f8fb287..3dae9111d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -22,7 +22,7 @@ public class TestExplicitInsert extends BaseTestCase { EbeanServer server = Ebean.getDefaultServer(); Customer cust = new Customer(); - Object returnId = server.setBeanId(cust, "42"); + Object returnId = server.beanId(cust, "42"); assertThat(returnId).isEqualTo(42); assertThat(cust.getId()).isEqualTo(42); @@ -34,7 +34,7 @@ public class TestExplicitInsert extends BaseTestCase { EbeanServer server = Ebean.getDefaultServer(); Customer customer = new Customer(); - Object returnId = server.setBeanId(customer, 42); + Object returnId = server.beanId(customer, 42); assertThat(returnId).isEqualTo(42); assertThat(customer.getId()).isEqualTo(42); @@ -57,7 +57,7 @@ public class TestExplicitInsert extends BaseTestCase { Assert.assertNotNull(b.getId()); - Assert.assertEquals(b.getId(), server.getBeanId(b)); + Assert.assertEquals(b.getId(), server.beanId(b)); EBasic b2 = server.find(EBasic.class, b.getId()); diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index a83aa13ae..c92440fa6 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -31,7 +31,7 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase { // should invoke a flush which then means the // insert occurs and the bean has an Id value - Object beanId = server.getBeanId(model); + Object beanId = server.beanId(model); assertNotNull(beanId); Ebean.delete(Customer.class, beanId); diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index 788e9cf28..df7a28462 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -57,8 +57,8 @@ public class TestInheritanceBothSides extends BaseTestCase { final Database db = DB.getDefault(); - final SourceBase foundA = DB.find(SourceBase.class, db.getBeanId(sourceA)); - final SourceBase foundB = DB.find(SourceBase.class, db.getBeanId(sourceB)); + final SourceBase foundA = DB.find(SourceBase.class, db.beanId(sourceA)); + final SourceBase foundB = DB.find(SourceBase.class, db.beanId(sourceB)); assertSourceBaseEqual(foundA, sourceA); assertThat(foundA).isInstanceOf(SourceA.class); From 058e16d1a8570c67dd5b0b5c739e791ca9aa0328 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 09:32:47 +1200 Subject: [PATCH 035/102] #2349 - Rename Database.getBeanId() to beanId() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 10 +++++++++- .../cascadedelete/TestInheritanceDeleteCascade.java | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 6851a6129..a6a831853 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1238,10 +1238,18 @@ public final class DB { /** * Return the value of the Id property for a given bean. */ - public static Object getBeanId(Object bean) { + public static Object beanId(Object bean) { return getDefault().beanId(bean); } + /** + * Deprecated migrate to beanId(). + */ + @Deprecated + public static Object getBeanId(Object bean) { + return beanId(bean); + } + /** * Return the manager of the level 2 cache ("L2" cache). */ diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java index e4da9b23d..269642b2f 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java @@ -19,8 +19,8 @@ public class TestInheritanceDeleteCascade extends BaseTestCase { DB.save(referencingBean); DB.delete(referencingBean); - assertNull(DB.find(RootBean.class, DB.getBeanId(bean1))); - assertNull(DB.find(RootBean.class, DB.getBeanId(bean2))); + assertNull(DB.find(RootBean.class, DB.beanId(bean1))); + assertNull(DB.find(RootBean.class, DB.beanId(bean2))); } } From 921ee9f8a1bb27bac7f03f522858b00620042b30 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 09:46:04 +1200 Subject: [PATCH 036/102] #2345 - Rename Database.getExpressionFactory() to expressionFactory with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 20 ++++- ebean-api/src/main/java/io/ebean/Expr.java | 85 ++++++++++------------ 2 files changed, 58 insertions(+), 47 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index a6a831853..4935b5d9e 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -126,10 +126,18 @@ public final class DB { * an expression that uses OR like Expression e = Expr.or(..., ...); *

*/ - public static ExpressionFactory getExpressionFactory() { + public static ExpressionFactory expressionFactory() { return getDefault().expressionFactory(); } + /** + * Deprecated migrate to expressionFactory(). + */ + @Deprecated + public static ExpressionFactory getExpressionFactory() { + return expressionFactory(); + } + /** * Return the next identity value for a given bean type. *

@@ -1261,10 +1269,18 @@ public final class DB { * Return the BackgroundExecutor service for asynchronous processing of * queries. */ - public static BackgroundExecutor getBackgroundExecutor() { + public static BackgroundExecutor backgroundExecutor() { return getDefault().backgroundExecutor(); } + /** + * Deprecated migrate to backgroundExecutor(). + */ + @Deprecated + public static BackgroundExecutor getBackgroundExecutor() { + return backgroundExecutor(); + } + /** * Return the JsonContext for reading/writing JSON. */ diff --git a/ebean-api/src/main/java/io/ebean/Expr.java b/ebean-api/src/main/java/io/ebean/Expr.java index 01b8f0c49..1316f9873 100644 --- a/ebean-api/src/main/java/io/ebean/Expr.java +++ b/ebean-api/src/main/java/io/ebean/Expr.java @@ -16,7 +16,7 @@ import java.util.Map; * This provides a convenient way to create expressions for the default * database. *

- * See also {@link DB#getExpressionFactory()} + * See also {@link DB#expressionFactory()} *

*

* Creates standard common expressions for using in a Query Where or Having @@ -34,14 +34,14 @@ public class Expr { * Equal To - property equal to the given value. */ public static Expression eq(String propertyName, Object value) { - return DB.getExpressionFactory().eq(propertyName, value); + return DB.expressionFactory().eq(propertyName, value); } /** * Not Equal To - property not equal to the given value. */ public static Expression ne(String propertyName, Object value) { - return DB.getExpressionFactory().ne(propertyName, value); + return DB.expressionFactory().ne(propertyName, value); } /** @@ -49,7 +49,7 @@ public class Expr { * using a lower() function to make it case insensitive). */ public static Expression ieq(String propertyName, String value) { - return DB.getExpressionFactory().ieq(propertyName, value); + return DB.expressionFactory().ieq(propertyName, value); } /** @@ -59,28 +59,28 @@ public class Expr { *

*/ public static Expression inRange(String propertyName, Object value1, Object value2) { - return DB.getExpressionFactory().inRange(propertyName, value1, value2); + return DB.expressionFactory().inRange(propertyName, value1, value2); } /** * Between - property between the two given values. */ public static Expression between(String propertyName, Object value1, Object value2) { - return DB.getExpressionFactory().between(propertyName, value1, value2); + return DB.expressionFactory().between(propertyName, value1, value2); } /** * Between - value between two given properties. */ public static Expression between(String lowProperty, String highProperty, Object value) { - return DB.getExpressionFactory().betweenProperties(lowProperty, highProperty, value); + return DB.expressionFactory().betweenProperties(lowProperty, highProperty, value); } /** * Greater Than - property greater than the given value. */ public static Expression gt(String propertyName, Object value) { - return DB.getExpressionFactory().gt(propertyName, value); + return DB.expressionFactory().gt(propertyName, value); } /** @@ -88,42 +88,42 @@ public class Expr { * value. */ public static Expression ge(String propertyName, Object value) { - return DB.getExpressionFactory().ge(propertyName, value); + return DB.expressionFactory().ge(propertyName, value); } /** * Less Than - property less than the given value. */ public static Expression lt(String propertyName, Object value) { - return DB.getExpressionFactory().lt(propertyName, value); + return DB.expressionFactory().lt(propertyName, value); } /** * Less Than or Equal to - property less than or equal to the given value. */ public static Expression le(String propertyName, Object value) { - return DB.getExpressionFactory().le(propertyName, value); + return DB.expressionFactory().le(propertyName, value); } /** * Is Null - property is null. */ public static Expression isNull(String propertyName) { - return DB.getExpressionFactory().isNull(propertyName); + return DB.expressionFactory().isNull(propertyName); } /** * Is Not Null - property is not null. */ public static Expression isNotNull(String propertyName) { - return DB.getExpressionFactory().isNotNull(propertyName); + return DB.expressionFactory().isNotNull(propertyName); } /** * Case insensitive {@link #exampleLike(Object)} */ public static ExampleExpression iexampleLike(Object example) { - return DB.getExpressionFactory().iexampleLike(example); + return DB.expressionFactory().iexampleLike(example); } /** @@ -131,14 +131,14 @@ public class Expr { * LikeType.RAW (you need to add you own wildcards % and _). */ public static ExampleExpression exampleLike(Object example) { - return DB.getExpressionFactory().exampleLike(example); + return DB.expressionFactory().exampleLike(example); } /** * Create the query by Example expression specifying more options. */ public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) { - return DB.getExpressionFactory().exampleLike(example, caseInsensitive, likeType); + return DB.expressionFactory().exampleLike(example, caseInsensitive, likeType); } /** @@ -146,7 +146,7 @@ public class Expr { * characters % (percentage) and _ (underscore). */ public static Expression like(String propertyName, String value) { - return DB.getExpressionFactory().like(propertyName, value); + return DB.expressionFactory().like(propertyName, value); } /** @@ -155,14 +155,14 @@ public class Expr { * a lower() function to make the expression case insensitive. */ public static Expression ilike(String propertyName, String value) { - return DB.getExpressionFactory().ilike(propertyName, value); + return DB.expressionFactory().ilike(propertyName, value); } /** * Starts With - property like value%. */ public static Expression startsWith(String propertyName, String value) { - return DB.getExpressionFactory().startsWith(propertyName, value); + return DB.expressionFactory().startsWith(propertyName, value); } /** @@ -170,14 +170,14 @@ public class Expr { * lower() function to make the expression case insensitive. */ public static Expression istartsWith(String propertyName, String value) { - return DB.getExpressionFactory().istartsWith(propertyName, value); + return DB.expressionFactory().istartsWith(propertyName, value); } /** * Ends With - property like %value. */ public static Expression endsWith(String propertyName, String value) { - return DB.getExpressionFactory().endsWith(propertyName, value); + return DB.expressionFactory().endsWith(propertyName, value); } /** @@ -185,14 +185,14 @@ public class Expr { * function to make the expression case insensitive. */ public static Expression iendsWith(String propertyName, String value) { - return DB.getExpressionFactory().iendsWith(propertyName, value); + return DB.expressionFactory().iendsWith(propertyName, value); } /** * Contains - property like %value%. */ public static Expression contains(String propertyName, String value) { - return DB.getExpressionFactory().contains(propertyName, value); + return DB.expressionFactory().contains(propertyName, value); } /** @@ -200,42 +200,42 @@ public class Expr { * function to make the expression case insensitive. */ public static Expression icontains(String propertyName, String value) { - return DB.getExpressionFactory().icontains(propertyName, value); + return DB.expressionFactory().icontains(propertyName, value); } /** * For collection properties that are empty (have not existing elements). */ public static Expression isEmpty(String propertyName) { - return DB.getExpressionFactory().isEmpty(propertyName); + return DB.expressionFactory().isEmpty(propertyName); } /** * For collection properties that are not empty (have existing elements). */ public static Expression isNotEmpty(String propertyName) { - return DB.getExpressionFactory().isNotEmpty(propertyName); + return DB.expressionFactory().isNotEmpty(propertyName); } /** * In - property has a value in the array of values. */ public static Expression in(String propertyName, Object[] values) { - return DB.getExpressionFactory().in(propertyName, values); + return DB.expressionFactory().in(propertyName, values); } /** * In - using a subQuery. */ public static Expression in(String propertyName, Query subQuery) { - return DB.getExpressionFactory().in(propertyName, subQuery); + return DB.expressionFactory().in(propertyName, subQuery); } /** * In - property has a value in the collection of values. */ public static Expression in(String propertyName, Collection values) { - return DB.getExpressionFactory().in(propertyName, values); + return DB.expressionFactory().in(propertyName, values); } /** @@ -272,14 +272,14 @@ public class Expr { * } */ public static Expression inOrEmpty(String propertyName, Collection values) { - return DB.getExpressionFactory().inOrEmpty(propertyName, values); + return DB.expressionFactory().inOrEmpty(propertyName, values); } /** * Id Equal to - ID property is equal to the value. */ public static Expression idEq(Object value) { - return DB.getExpressionFactory().idEq(value); + return DB.expressionFactory().idEq(value); } /** @@ -292,7 +292,7 @@ public class Expr { * @param propertyMap a map keyed by property names. */ public static Expression allEq(Map propertyMap) { - return DB.getExpressionFactory().allEq(propertyMap); + return DB.expressionFactory().allEq(propertyMap); } /** @@ -303,7 +303,7 @@ public class Expr { *

*/ public static Expression raw(String raw, Object value) { - return DB.getExpressionFactory().raw(raw, value); + return DB.expressionFactory().raw(raw, value); } /** @@ -314,53 +314,48 @@ public class Expr { *

*/ public static Expression raw(String raw, Object[] values) { - return DB.getExpressionFactory().raw(raw, values); + return DB.expressionFactory().raw(raw, values); } /** * Add raw expression with no parameters. */ public static Expression raw(String raw) { - return DB.getExpressionFactory().raw(raw); + return DB.expressionFactory().raw(raw); } /** * And - join two expressions with a logical and. */ public static Expression and(Expression expOne, Expression expTwo) { - - return DB.getExpressionFactory().and(expOne, expTwo); + return DB.expressionFactory().and(expOne, expTwo); } /** * Or - join two expressions with a logical or. */ public static Expression or(Expression expOne, Expression expTwo) { - - return DB.getExpressionFactory().or(expOne, expTwo); + return DB.expressionFactory().or(expOne, expTwo); } /** * Negate the expression (prefix it with NOT). */ public static Expression not(Expression exp) { - - return DB.getExpressionFactory().not(exp); + return DB.expressionFactory().not(exp); } /** * Return a list of expressions that will be joined by AND's. */ public static Junction conjunction(Query query) { - - return DB.getExpressionFactory().conjunction(query); + return DB.expressionFactory().conjunction(query); } /** * Return a list of expressions that will be joined by OR's. */ public static Junction disjunction(Query query) { - - return DB.getExpressionFactory().disjunction(query); + return DB.expressionFactory().disjunction(query); } } From 8cb43788dc3ea0d8018056ca369f3c90b7d6813d Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 09:55:48 +1200 Subject: [PATCH 037/102] #2350 - Rename Database.getBeanState() to beanState() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 10 ++++++++- .../src/main/java/io/ebean/Database.java | 10 ++++++++- ebean-api/src/main/java/io/ebean/Ebean.java | 2 +- .../server/core/DefaultServer.java | 2 +- .../java/io/ebean/EbeanServer_refresh.java | 4 ++-- .../java/io/ebean/event/BeanPostLoadTest.java | 2 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../server/deploy/BeanDescriptorTest.java | 10 ++++----- .../org/tests/basic/TestDynamicUpdate.java | 2 +- .../tests/basic/TestReadOnlyPropagation.java | 6 ++--- .../java/org/tests/basic/TestTransient.java | 2 +- .../org/tests/batchload/TestBeanState.java | 12 +++++----- .../java/org/tests/cache/TestQueryCache.java | 2 +- .../org/tests/json/TestDbJson_Jackson3.java | 22 +++++++++---------- .../java/org/tests/json/TestDbJson_List.java | 2 +- .../java/org/tests/json/TestOldValue.java | 22 +++++++++---------- .../org/tests/update/TestStatelessUpdate.java | 2 +- 17 files changed, 65 insertions(+), 49 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 4935b5d9e..ab719b7da 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1239,8 +1239,16 @@ public final class DB { * This will return null if the bean is not an enhanced entity bean. *

*/ + public static BeanState beanState(Object bean) { + return getDefault().beanState(bean); + } + + /** + * Deprecated migrate to beanState(). + */ + @Deprecated public static BeanState getBeanState(Object bean) { - return getDefault().getBeanState(bean); + return beanState(bean); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index d113cf041..7bc21364a 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -243,7 +243,15 @@ public interface Database { * This will return null if the bean is not an enhanced entity bean. *

*/ - BeanState getBeanState(Object bean); + BeanState beanState(Object bean); + + /** + * Deprecated migrate to beanState(). + */ + @Deprecated + default BeanState getBeanState(Object bean) { + return beanState(bean); + } /** * Return the value of the Id property for a given bean. diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java index 5756a18bf..53d76811f 100644 --- a/ebean-api/src/main/java/io/ebean/Ebean.java +++ b/ebean-api/src/main/java/io/ebean/Ebean.java @@ -1201,7 +1201,7 @@ public final class Ebean { *

*/ public static BeanState getBeanState(Object bean) { - return getDefault().getBeanState(bean); + return getDefault().beanState(bean); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index f6916bbe4..cd25b08c5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -519,7 +519,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public BeanState getBeanState(Object bean) { + public BeanState beanState(Object bean) { if (bean instanceof EntityBean) { return new DefaultBeanState((EntityBean) bean); } diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java index 66af5d164..638f110f6 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java @@ -40,10 +40,10 @@ public class EbeanServer_refresh { assertEquals(rows, 1); basic.setName("modify"); - assertTrue(DB.getBeanState(basic).isDirty()); + assertTrue(DB.beanState(basic).isDirty()); server.refresh(basic); assertEquals(basic.getStatus(), EBasic.Status.ACTIVE); - assertFalse(DB.getBeanState(basic).isDirty()); + assertFalse(DB.beanState(basic).isDirty()); } @Test diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java index 4b0dcde41..7775ccc47 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -91,7 +91,7 @@ public class BeanPostLoadTest extends BaseTestCase { public void postLoad(Object bean) { this.methodsCalled.add("postLoad"); this.bean = bean; - this.beanState = DB.getBeanState(bean); + this.beanState = DB.beanState(bean); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index df747b1d0..6c5d929cd 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -363,7 +363,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public BeanState getBeanState(Object bean) { + public BeanState beanState(Object bean) { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index ab8ae6a87..d79d79427 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -30,31 +30,31 @@ public class BeanDescriptorTest extends BaseTestCase { Customer bean = customerDesc.createReference(null, false, 42, null); assertThat(bean.getId()).isEqualTo(42); - assertThat(server().getBeanState(bean).isReadOnly()).isFalse(); + assertThat(server().beanState(bean).isReadOnly()).isFalse(); } @Test public void createReference_whenReadOnly() { Customer bean = customerDesc.createReference(Boolean.TRUE, false, 42, null); - assertThat(server().getBeanState(bean).isReadOnly()).isTrue(); + assertThat(server().beanState(bean).isReadOnly()).isTrue(); } @Test public void createReference_whenNotReadOnly() { Customer bean = customerDesc.createReference(Boolean.FALSE, false, 42, null); - assertThat(server().getBeanState(bean).isReadOnly()).isFalse(); + assertThat(server().beanState(bean).isReadOnly()).isFalse(); bean = customerDesc.createReference(42, null); - assertThat(server().getBeanState(bean).isReadOnly()).isFalse(); + assertThat(server().beanState(bean).isReadOnly()).isFalse(); } @Test public void createReference_when_disabledLazyLoad() { Customer bean = customerDesc.createReference(Boolean.FALSE, true, 42, null); - assertThat(server().getBeanState(bean).isDisableLazyLoad()).isTrue(); + assertThat(server().beanState(bean).isDisableLazyLoad()).isTrue(); } @Test diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java index ac6764edb..6f3d21332 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -29,7 +29,7 @@ public class TestDynamicUpdate extends BaseTestCase { b2.getEmbeddable().setDescription("ABC"); - BeanState beanState = server.getBeanState(b2); + BeanState beanState = server.beanState(b2); boolean dirty = beanState.isDirty(); Assert.assertTrue(dirty); diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index b77dc577c..64d449fda 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -30,15 +30,15 @@ public class TestReadOnlyPropagation extends BaseTestCase { .setId(1) .findOne(); - Assert.assertTrue(DB.getBeanState(order).isReadOnly()); + Assert.assertTrue(DB.beanState(order).isReadOnly()); Customer customer = order.getCustomer(); - Assert.assertTrue(DB.getBeanState(customer).isReadOnly()); + Assert.assertTrue(DB.beanState(customer).isReadOnly()); Address billingAddress = customer.getBillingAddress(); assertNotNull(billingAddress); - Assert.assertTrue(DB.getBeanState(billingAddress).isReadOnly()); + Assert.assertTrue(DB.beanState(billingAddress).isReadOnly()); List details = order.getDetails(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestTransient.java b/ebean-core/src/test/java/org/tests/basic/TestTransient.java index 428896ac1..ef0db80bb 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-core/src/test/java/org/tests/basic/TestTransient.java @@ -30,7 +30,7 @@ public class TestTransient extends BaseTestCase { assertNotNull(c); - BeanState beanState = DB.getBeanState(c); + BeanState beanState = DB.beanState(c); assertFalse("not new or dirty as transient", beanState.isNewOrDirty()); c.getLock().tryLock(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java index 28161dc3d..c6ef4fbd1 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java @@ -29,7 +29,7 @@ public class TestBeanState extends BaseTestCase { .setUseCache(false) .findOne(); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); assertFalse(beanState.isNew()); assertFalse(beanState.isDirty()); assertFalse(beanState.isNewOrDirty()); @@ -67,7 +67,7 @@ public class TestBeanState extends BaseTestCase { .setUseCache(false) .findOne(); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); beanState.setDisableLazyLoad(true); assertNull(customer.getName()); } @@ -79,7 +79,7 @@ public class TestBeanState extends BaseTestCase { Customer customer = DB.find(Customer.class).order("id").setMaxRows(1).findOne(); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); assertThat(beanState.getChangedProps()).isEmpty(); customer.setContacts(new ArrayList<>()); @@ -91,7 +91,7 @@ public class TestBeanState extends BaseTestCase { Customer customer = new Customer(); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); assertThat(beanState.getChangedProps()).isEmpty(); // when new state, then loaded @@ -112,7 +112,7 @@ public class TestBeanState extends BaseTestCase { Customer customer = new Customer(); customer.setContacts(new ArrayList<>()); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); beanState.setLoaded(); beanState.setReadOnly(true); @@ -127,7 +127,7 @@ public class TestBeanState extends BaseTestCase { Customer customer = new Customer(); customer.setName("a"); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); beanState.setLoaded(); beanState.setReadOnly(true); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index b8a2b518b..b8ce6d1d5 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -227,7 +227,7 @@ public class TestQueryCache extends BaseTestCase { Assert.assertTrue(bc.isReadOnly()); Assert.assertFalse(bc.isEmpty()); Assert.assertTrue(!list.isEmpty()); - Assert.assertTrue(DB.getBeanState(list.get(0)).isReadOnly()); + Assert.assertTrue(DB.beanState(list.get(0)).isReadOnly()); List list2 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() .ilike("name", "Rob").findList(); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 5b58b3108..1eafa2328 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -92,7 +92,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { found.setName("p1-mod"); found.setBeanList(null); - BeanState state = DB.getBeanState(found); + BeanState state = DB.beanState(found); assertThat(state.getChangedProps()).containsExactlyInAnyOrder("name", "beanList"); ValuePair pair = state.getDirtyValues().get("name"); @@ -115,12 +115,12 @@ public class TestDbJson_Jackson3 extends BaseTestCase { .extracting(Map.Entry::toString) .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1"); - assertThat(DB.getBeanState(found).isDirty()).isFalse(); + assertThat(DB.beanState(found).isDirty()).isFalse(); found.getPlainBean().setName("b"); - assertThat(DB.getBeanState(found).isDirty()).isTrue(); + assertThat(DB.beanState(found).isDirty()).isTrue(); - state = DB.getBeanState(found); + state = DB.beanState(found); assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean"); pair = state.getDirtyValues().get("plainBean"); assertThat(pair.getNewValue()).hasToString("name:b"); @@ -153,7 +153,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId()); found.getBeanList().get(0).setName("p1-mod"); - BeanState state = DB.getBeanState(found); + BeanState state = DB.beanState(found); assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); } @@ -169,7 +169,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { bean.setPlainValue2(contentBean2); bean.setPlainValue3(contentBean3); - BeanState state = DB.getBeanState(bean); + BeanState state = DB.beanState(bean); // a new bean is not considered as dirty (thus have no changed props) assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isTrue(); @@ -178,7 +178,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { bean.save(); bean = DB.find(EBasicJsonJackson3.class, bean.getId()); - state = DB.getBeanState(bean); + state = DB.beanState(bean); // a fresh loaded bean is also not considered as dirty assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isFalse(); @@ -222,19 +222,19 @@ public class TestDbJson_Jackson3 extends BaseTestCase { LoggedSql.stop(); } - + @Test public void push_pop_test() { - + EBasicJsonMulti bean = new EBasicJsonMulti(); bean.setPlainValue2(new PlainBeanDirtyAware("x", 42)); bean.save(); - + bean = DB.find(EBasicJsonMulti.class, bean.getId()); bean.setPlainValue1(null); // already null bean.setPlainValue2(null); bean.setPlainValue3(null); // already null - BeanState state = DB.getBeanState(bean); + BeanState state = DB.beanState(bean); assertThat(state.getDirtyValues()).hasSize(1).containsKey("plainValue2"); } diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index e20beb1d8..771a5f54a 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -216,7 +216,7 @@ public class TestDbJson_List extends BaseTestCase { .setAllowLoadErrors() // allow invalid JSON content .findOne(); - Map errors = server().getBeanState(bean).getLoadErrors(); + Map errors = server().beanState(bean).getLoadErrors(); assertThat(errors).containsKey("beanMap").hasSize(1); assertThat(errors.values().iterator().next()) diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java index f7bd391e5..fd108204e 100644 --- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java @@ -18,8 +18,8 @@ import java.util.Set; public class TestOldValue extends BaseTestCase { - - + + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testDbJsonOldValue() throws Exception { @@ -35,9 +35,9 @@ public class TestOldValue extends BaseTestCase { bean.getIntList().add(2); bean.getIntSet().add(1002); bean.getIntMap().put("ik1",2002); - + bean.setJsonNode(jnf.arrayNode().add("Foo")); - + DB.save(bean); bean = DB.find(EBasicOldValue.class, bean.getId()); @@ -51,8 +51,8 @@ public class TestOldValue extends BaseTestCase { bean.getIntSet().add(1006); bean.getIntMap().put("ik2",2006); ((ArrayNode)bean.getJsonNode()).add("Bar"); - - Map dirty = DB.getBeanState(bean).getDirtyValues(); + + Map dirty = DB.beanState(bean).getDirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(10); @@ -83,7 +83,7 @@ public class TestOldValue extends BaseTestCase { softly.assertAll(); } - + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test @Ignore("Old value detection does not work for @DbArray") @@ -91,16 +91,16 @@ public class TestOldValue extends BaseTestCase { EBasicOldValue bean = new EBasicOldValue(); bean.getStringArr().add("sa1"); - + DB.save(bean); bean = DB.find(EBasicOldValue.class, bean.getId()); bean.getStringArr().add("sa2"); - - - Map dirty = DB.getBeanState(bean).getDirtyValues(); + + + Map dirty = DB.beanState(bean).getDirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java index d96de03e4..02f17ffe5 100644 --- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -272,7 +272,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { } private boolean containsContacts(Customer cust) { - return DB.getBeanState(cust).getLoadedProps().contains("contacts"); + return DB.beanState(cust).getLoadedProps().contains("contacts"); } /** From 57c0bceb6348449a669052081506900295acda59 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 10:47:56 +1200 Subject: [PATCH 038/102] #2351 - Rename Database.getReference() to reference() with deprecation --- .../src/main/java/io/ebean/BeanFinder.java | 4 +- ebean-api/src/main/java/io/ebean/DB.java | 2 +- .../src/main/java/io/ebean/Database.java | 10 +++- ebean-api/src/main/java/io/ebean/Ebean.java | 2 +- ebean-api/src/main/java/io/ebean/Finder.java | 4 +- .../server/core/DefaultServer.java | 2 +- .../test/java/io/ebean/UpdateQueryTest.java | 4 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../server/cache/CacheBeanDataTest.java | 2 +- .../server/core/TestDiffHelpSimple.java | 8 ++-- .../deploy/TestDiffHelpInsertSimple.java | 2 +- .../tests/docstore/CustomerReportTest.java | 46 ++++++++----------- .../inheritance/TestInheritanceRefBean.java | 4 +- .../org/tests/readaudit/TestReadAudit.java | 2 +- 14 files changed, 48 insertions(+), 46 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/BeanFinder.java b/ebean-api/src/main/java/io/ebean/BeanFinder.java index 2c8e04eec..aab61b572 100644 --- a/ebean-api/src/main/java/io/ebean/BeanFinder.java +++ b/ebean-api/src/main/java/io/ebean/BeanFinder.java @@ -79,11 +79,11 @@ public abstract class BeanFinder { /** * Creates an entity reference for this ID. *

- * Equivalent to {@link Database#getReference(Class, Object)} + * Equivalent to {@link Database#reference(Class, Object)} */ @Nonnull public T ref(I id) { - return db().getReference(type, id); + return db().reference(type, id); } /** diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index ab719b7da..636889b4e 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -659,7 +659,7 @@ public final class DB { * @param id the id value */ public static T getReference(Class beanType, Object id) { - return getDefault().getReference(beanType, id); + return getDefault().reference(beanType, id); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 7bc21364a..594644c62 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -950,7 +950,15 @@ public interface Database { * @param id the id value */ @Nonnull - T getReference(Class beanType, Object id); + T reference(Class beanType, Object id); + + /** + * Deprecated migrate to reference(). + */ + @Deprecated + default T getReference(Class beanType, Object id) { + return reference(beanType, id); + } /** * Return the extended API for Database. diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java index 53d76811f..eabc3c5b4 100644 --- a/ebean-api/src/main/java/io/ebean/Ebean.java +++ b/ebean-api/src/main/java/io/ebean/Ebean.java @@ -642,7 +642,7 @@ public final class Ebean { * @param id the id value */ public static T getReference(Class beanType, Object id) { - return getDefault().getReference(beanType, id); + return getDefault().reference(beanType, id); } /** diff --git a/ebean-api/src/main/java/io/ebean/Finder.java b/ebean-api/src/main/java/io/ebean/Finder.java index 3c9318e7d..cc5ef87f6 100644 --- a/ebean-api/src/main/java/io/ebean/Finder.java +++ b/ebean-api/src/main/java/io/ebean/Finder.java @@ -137,11 +137,11 @@ public class Finder { /** * Creates an entity reference for this ID. *

- * Equivalent to {@link Database#getReference(Class, Object)} + * Equivalent to {@link Database#reference(Class, Object)} */ @Nonnull public T ref(I id) { - return db().getReference(type, id); + return db().reference(type, id); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index cd25b08c5..469cc148f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -687,7 +687,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override @SuppressWarnings({"unchecked", "rawtypes"}) - public T getReference(Class type, Object id) { + public T reference(Class type, Object id) { if (id == null) { throw new NullPointerException("The id is null"); } diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java index 5b9c42991..bcbdd103b 100644 --- a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java @@ -174,7 +174,7 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); - Country nz = server.getReference(Country.class, "NZ"); + Country nz = server.reference(Country.class, "NZ"); UpdateQuery update = server.update(Customer.class); Query query = update @@ -198,7 +198,7 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); - Country nz = server.getReference(Country.class, "NZ"); + Country nz = server.reference(Country.class, "NZ"); LoggedSqlCollector.start(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 6c5d929cd..7dc5a0b63 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -660,7 +660,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public T getReference(Class beanType, Object id) { + public T reference(Class beanType, Object id) { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 957515f80..d7ab3ea5e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -39,7 +39,7 @@ public class CacheBeanDataTest extends BaseTestCase { Address billingAddress = new Address(); billingAddress.setId(12); billingAddress.setCity("Auckland"); - billingAddress.setCountry(server.getReference(Country.class, "NZ")); + billingAddress.setCountry(server.reference(Country.class, "NZ")); billingAddress.setLine1("92 Someplace Else"); c.setBillingAddress(billingAddress); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index 5ab4b56ee..7d14d858c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -35,7 +35,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Order order1 = new Order(); order1.setId(12); order1.setCretime(new Timestamp(firstTime)); - order1.setCustomer(server.getReference(Customer.class, 1234)); + order1.setCustomer(server.reference(Customer.class, 1234)); order1.setStatus(Status.NEW); order1.setShipDate(new Date(firstTime)); order1.setOrderDate(new Date(firstTime)); @@ -51,7 +51,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Order order2 = new Order(); order2.setId(14); order2.setCretime(new Timestamp(secondTime)); - order2.setCustomer(server.getReference(Customer.class, 2133)); + order2.setCustomer(server.reference(Customer.class, 2133)); order2.setStatus(Status.COMPLETE); order2.setShipDate(new Date(secondTime)); order2.setOrderDate(new Date(secondTime)); @@ -77,7 +77,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Order order2 = new Order(); order2.setId(14); order2.setCretime(new Timestamp(secondTime)); - order2.setCustomer(server.getReference(Customer.class, 2133)); + order2.setCustomer(server.reference(Customer.class, 2133)); order2.setStatus(Status.COMPLETE); order2.setShipDate(new Date(secondTime)); order2.setOrderDate(new Date(secondTime)); @@ -114,7 +114,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Order order1 = createBaseOrder(server); Order order2 = createBaseOrder(server); - order2.setCustomer(server.getReference(Customer.class, 2133)); + order2.setCustomer(server.reference(Customer.class, 2133)); order2.setStatus(Status.COMPLETE); order2.setShipDate(null); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 4e7704a02..58cdd45ee 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -37,7 +37,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase { Order order1 = new Order(); order1.setId(12); order1.setCretime(new Timestamp(firstTime)); - order1.setCustomer(server.getReference(Customer.class, 1234)); + order1.setCustomer(server.reference(Customer.class, 1234)); order1.setStatus(Status.NEW); //order1.setShipDate(new Date(firstTime)); order1.setOrderDate(new Date(firstTime)); diff --git a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java index 3668d833f..e7047cc37 100644 --- a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -16,53 +16,47 @@ import io.ebean.BaseTestCase; import io.ebean.text.json.JsonReadOptions; public class CustomerReportTest extends BaseTestCase { - - - + @Test public void testToJson() throws Exception { ResetBasicData.reset(); - - + + String json = server().json().toJson(getCustomerReport()); - - assertThat(json).isEqualTo("{\"dtype\":\"CR\",\"friends\":[{\"id\":2},{\"id\":3}],\"customer\":{\"id\":1}}"); } - - @Test public void testFromJson() throws Exception { ResetBasicData.reset(); String json = "{\"dtype\":\"CR\",\"friends\":[{\"id\":2},{\"id\":3}],\"customer\":{\"id\":1}}"; - + JsonReadOptions opts = new JsonReadOptions(); opts.setEnableLazyLoading(true); CustomerReport report = server().json().toBean(CustomerReport.class, json, opts); - + assertThat(report.getCustomer().getName()).isEqualTo("Rob"); - + assertThat(report.getFriends().get(0).getName()).isEqualTo("Cust NoAddress"); assertThat(report.getFriends().get(1).getName()).isEqualTo("Fiona"); } - + @Test public void testEmbeddedDocs() throws Exception { ResetBasicData.reset(); - + CustomerReport report = getCustomerReport(); report.getEmbeddedReports().add(getProductReport()); - + String json = server().json().toJson(report); - + assertThat(json).isEqualTo("{\"dtype\":\"CR\"," + "\"embeddedReports\":[{\"dtype\":\"PR\",\"title\":\"This is a good product\",\"product\":{\"id\":1}}]," + "\"friends\":[{\"id\":2},{\"id\":3}]," + "\"customer\":{\"id\":1}}"); - + JsonReadOptions opts = new JsonReadOptions(); opts.setEnableLazyLoading(true); report = server().json().toBean(CustomerReport.class, json, opts); @@ -70,22 +64,22 @@ public class CustomerReportTest extends BaseTestCase { assertThat(ar.getTitle()).isEqualTo("This is a good product"); assertThat(ar.getProduct().getName()).isEqualTo("Chair"); } - - + + private CustomerReport getCustomerReport() { - Customer customer = server().getReference(Customer.class, 1); - Customer friend1 = server().getReference(Customer.class, 2); - Customer friend2 = server().getReference(Customer.class, 3); - + Customer customer = server().reference(Customer.class, 1); + Customer friend1 = server().reference(Customer.class, 2); + Customer friend2 = server().reference(Customer.class, 3); + CustomerReport report = new CustomerReport(); - + report.setCustomer(customer); report.setFriends(Arrays.asList(friend1, friend2)); return report; } - + private ProductReport getProductReport() { - Product product = server().getReference(Product.class, 1); + Product product = server().reference(Product.class, 1); ProductReport report = new ProductReport(); report.setTitle("This is a good product"); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 520e84866..f38000825 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -26,12 +26,12 @@ public class TestInheritanceRefBean extends BaseTestCase { Parent test; LoggedSqlCollector.start(); - test = server().getReference(ChildA.class, idA); + test = server().reference(ChildA.class, idA); assertTrue(test instanceof ChildA); assertEquals(0, LoggedSqlCollector.stop().size()); LoggedSqlCollector.start(); - test = server().getReference(Parent.class, idB); + test = server().reference(Parent.class, idB); assertTrue(test instanceof ChildB); assertEquals(1, LoggedSqlCollector.stop().size()); diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index f2e74e4f5..2f202d83c 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -134,7 +134,7 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans).hasSize(2); - Country ref = server.getReference(Country.class, "AR"); + Country ref = server.reference(Country.class, "AR"); assertThat(readAuditLogger.beans).hasSize(3); assertThat(ref).isSameAs(found2); } From 7c2a77081b4b3c37bf54821cfaea2a3700960b52 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 10:50:29 +1200 Subject: [PATCH 039/102] #2351 - Rename Database.getReference() to reference() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 14 ++++++++++---- .../basic/TestQueryForUpdatePostgresLock.java | 2 +- .../java/org/tests/model/m2m/TestM2MWithWhere.java | 8 +++----- .../java/org/tests/o2m/TestOneToManyOnlyBean.java | 2 +- .../o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../org/tests/transaction/TestExecuteComplete.java | 6 +++--- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 636889b4e..d5f281599 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -658,24 +658,30 @@ public final class DB { * @param beanType the type of entity bean * @param id the id value */ - public static T getReference(Class beanType, Object id) { + public static T reference(Class beanType, Object id) { return getDefault().reference(beanType, id); } + /** + * Deprecated migrate to beanId(). + */ + @Deprecated + public static T getReference(Class beanType, Object id) { + return reference(beanType, id); + } + /** * Sort the list using the sortByClause which can contain a comma delimited * list of property names and keywords asc, desc, nullsHigh and nullsLow. *

    *
  • asc - ascending order (which is the default)
    • *
  • desc - Descending order
    • - *
  • nullsHigh - Treat null values as high/large values (which is the - * default)
    • + *
  • nullsHigh - Treat null values as high/large values (which is the default)
    • *
  • nullsLow- Treat null values as low/very small values
    • *
*

* If you leave off any keywords the defaults are ascending order and treating * nulls as high values. - *

*

* Note that the sorting uses a Comparator and Collections.sort(); and does * not invoke a DB query. diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index ecda6bee2..eee072594 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -71,7 +71,7 @@ public class TestQueryForUpdatePostgresLock extends BaseTestCase { log.info("insert start"); timePreInsert = System.currentTimeMillis(); Section section = new Section(); - section.setArticle(DB.getReference(Article.class, id)); + section.setArticle(DB.reference(Article.class, id)); DB.save(section); timePostInsert = System.currentTimeMillis(); log.info("inserted"); diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index da8d83dd5..6a6c8e85e 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -5,8 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import org.junit.Test; -import org.tests.model.m2m.MnyEdge; -import org.tests.model.m2m.MnyNode; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -108,8 +106,8 @@ public class TestM2MWithWhere extends BaseTestCase { sb.append("from = ").append(from).append(" |"); for (int to = 1; to <= 5; to++) { MnyEdge edge = new MnyEdge(); - edge.setFrom(DB.getReference(MnyNode.class, from)); - edge.setTo(DB.getReference(MnyNode.class, to)); + edge.setFrom(DB.reference(MnyNode.class, from)); + edge.setTo(DB.reference(MnyNode.class, to)); int flags = 0; if (from < to) { flags |= 1; @@ -125,7 +123,7 @@ public class TestM2MWithWhere extends BaseTestCase { } // System.out.println(sb); dump the table } - + @Test public void testWithDbTableName() { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index 2dccb4a1e..a07c415d4 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -33,7 +33,7 @@ public class TestOneToManyOnlyBean extends BaseTestCase { @Test public void isReference_when_getReference_expectTrue() { - OMVertex myBean = DB.getReference(OMVertex.class, UUID.randomUUID()); + OMVertex myBean = DB.reference(OMVertex.class, UUID.randomUUID()); assertTrue(isReference(myBean)); } diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 1fb128e09..c0747fb7a 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -85,7 +85,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { // make m2 dirty ... cascades to an update on Uim m2.setFoodPreference("Apple"); trainer.getMonkeys().add(m2); - trainer.getMonkeys().add(DB.getReference(JtMonkey.class, m1.getMid())); + trainer.getMonkeys().add(DB.reference(JtMonkey.class, m1.getMid())); trainer.getMonkeys().add(new JtMonkey("FAlp")); trainer.getMonkeys().add(new JtMonkey("FBet")); trainer.getMonkeys().add(new JtMonkey("FThe")); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java index 6632816a5..60b6e6e03 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -27,7 +27,7 @@ public class TestExecuteComplete extends BaseTestCase { try { DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer); @@ -48,7 +48,7 @@ public class TestExecuteComplete extends BaseTestCase { DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> DB.execute(() -> { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer); @@ -75,7 +75,7 @@ public class TestExecuteComplete extends BaseTestCase { @Transactional(batchSize = 10) private void errorOnCommit() { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer); From aa53742a07d254a1c05486e49fea89690192d775 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 17:24:33 +1200 Subject: [PATCH 040/102] #2352 - Rename ServerCache methods with deprecation --- .../main/java/io/ebean/cache/ServerCache.java | 18 ++++- .../io/ebean/cache/ServerCacheManager.java | 65 ++++++++++++++++--- .../server/cache/DefaultCacheAdapter.java | 16 ++--- .../server/core/DefaultServer.java | 2 +- .../src/test/java/io/ebean/BaseTestCase.java | 2 +- .../ebean/cache/ServerCacheManagerTest.java | 28 ++++---- .../server/cache/DefaultServerCacheTest.java | 8 +-- .../DefaultServerCache_RunEvictionTest.java | 2 +- .../transaction/JdbcTransactionTest.java | 16 ++--- .../tests/basic/TestBeanReferenceRefresh.java | 2 +- .../org/tests/basic/TestQueryWithCache.java | 2 +- .../batchload/TestBatchLazyWithCacheHits.java | 8 +-- .../org/tests/batchload/TestQueryJoin.java | 2 +- .../java/org/tests/cache/TestBeanCache.java | 10 +-- .../tests/cache/TestBeanFetchJoinCache.java | 24 +++---- .../java/org/tests/cache/TestCacheBasic.java | 6 +- .../tests/cache/TestCacheCollectionIds.java | 10 +-- .../org/tests/cache/TestCacheNaturalId.java | 10 +-- .../tests/cache/TestExternalNotification.java | 2 +- .../cache/TestL2CacheWithSharedBean.java | 6 +- .../java/org/tests/cache/TestQueryCache.java | 2 +- .../tests/cache/TestQueryCacheCountry.java | 24 +++---- .../org/tests/cache/TestQueryCacheInsert.java | 6 +- .../cache/TestQueryCacheTableDependency.java | 10 +-- .../cache/personinfo/PersonCacheTests.java | 18 ++--- .../cache/TestInheritCacheRefLoad.java | 2 +- .../cache/TestCacheViaComplexNaturalKey.java | 12 ++-- .../cache/TestCacheViaComplexNaturalKey3.java | 12 ++-- .../basic/cache/TestCacheWithSoftDelete.java | 4 +- .../embedded/TestMultipleEmbeddedLoading.java | 8 +-- .../org/tests/readaudit/TestReadAudit.java | 16 ++--- .../src/test/java/io/ebean/BaseTestCase.java | 2 +- .../java/org/integration/ClusterTest.java | 6 +- 33 files changed, 212 insertions(+), 149 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java index 724b71531..1476e567d 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java @@ -10,12 +10,10 @@ import java.util.Set; * Represents part of the "L2" server side cache. *

* This is used to cache beans or query results (bean collections). - *

*

* There are 2 ServerCache's for each bean type. One is used as the 'bean cache' * which holds beans of a given type. The other is the 'query cache' holding * query results for a given type. - *

*/ public interface ServerCache { @@ -75,6 +73,14 @@ public interface ServerCache { /** * Return the hit ratio the cache is currently getting. */ + default int hitRatio() { + return getHitRatio(); + } + + /** + * Deprecated migrate to hitRatio(). + */ + @Deprecated int getHitRatio(); /** @@ -82,6 +88,14 @@ public interface ServerCache { * * @param reset if true the statistics are reset. */ + default ServerCacheStatistics statistics(boolean reset) { + return getStatistics(reset); + } + + /** + * Deprecated migrate to statistics(). + */ + @Deprecated ServerCacheStatistics getStatistics(boolean reset); /** diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java index 82b85c956..67156a642 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java @@ -21,7 +21,15 @@ public interface ServerCacheManager { * rather than background processing. *

*/ - boolean isLocalL2Caching(); + boolean localL2Caching(); + + /** + * Deprecated migrate to localL2Caching(). + */ + @Deprecated + default boolean isLocalL2Caching() { + return localL2Caching(); + } /** * Return all the cache regions. @@ -36,37 +44,78 @@ public interface ServerCacheManager { * * @param regions A region name or comma delimited list of region names. */ - void setEnabledRegions(String regions); + void enabledRegions(String regions); + + /** + * Deprecated migrate to enabledRegions(). + */ + @Deprecated + default void setEnabledRegions(String regions) { + enabledRegions(regions); + } /** * Enable or disable all the cache regions. */ - void setAllRegionsEnabled(boolean enabled); + void allRegionsEnabled(boolean enabled); + + /** + * Deprecated migrate to allRegionsEnabled(). + */ + @Deprecated + default void setAllRegionsEnabled(boolean enabled) { + allRegionsEnabled(enabled); + } /** * Return the cache region by name. Typically, to enable or disable the region. */ - ServerCacheRegion getRegion(String name); + ServerCacheRegion region(String name); + + @Deprecated + default ServerCacheRegion getRegion(String name) { + return region(name); + } /** * Return the cache for mapping natural keys to id values. */ - ServerCache getNaturalKeyCache(Class beanType); + ServerCache naturalKeyCache(Class beanType); + + @Deprecated + default ServerCache getNaturalKeyCache(Class beanType) { + return naturalKeyCache(beanType); + } /** * Return the cache for beans of a particular type. */ - ServerCache getBeanCache(Class beanType); + ServerCache beanCache(Class beanType); + + @Deprecated + default ServerCache getBeanCache(Class beanType) { + return beanCache(beanType); + } /** * Return the cache for associated many properties of a bean type. */ - ServerCache getCollectionIdsCache(Class beanType, String propertyName); + ServerCache collectionIdsCache(Class beanType, String propertyName); + + @Deprecated + default ServerCache getCollectionIdsCache(Class beanType, String propertyName) { + return collectionIdsCache(beanType, propertyName); + } /** * Return the cache for query results of a particular type of bean. */ - ServerCache getQueryCache(Class beanType); + ServerCache queryCache(Class beanType); + + @Deprecated + default ServerCache getQueryCache(Class beanType) { + return queryCache(beanType); + } /** * This clears both the bean and query cache for a given type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java index 413af049d..e9b3752d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java @@ -27,7 +27,7 @@ public final class DefaultCacheAdapter implements ServerCacheManager { } @Override - public boolean isLocalL2Caching() { + public boolean localL2Caching() { return cacheManager.isLocalL2Caching(); } @@ -37,37 +37,37 @@ public final class DefaultCacheAdapter implements ServerCacheManager { } @Override - public void setEnabledRegions(String regions) { + public void enabledRegions(String regions) { cacheManager.setEnabledRegions(regions); } @Override - public ServerCacheRegion getRegion(String region) { + public ServerCacheRegion region(String region) { return cacheManager.getRegion(region); } @Override - public void setAllRegionsEnabled(boolean enabled) { + public void allRegionsEnabled(boolean enabled) { cacheManager.setAllRegionsEnabled(enabled); } @Override - public ServerCache getNaturalKeyCache(Class beanType) { + public ServerCache naturalKeyCache(Class beanType) { return cacheManager.getNaturalKeyCache(beanType); } @Override - public ServerCache getBeanCache(Class beanType) { + public ServerCache beanCache(Class beanType) { return cacheManager.getBeanCache(beanType); } @Override - public ServerCache getCollectionIdsCache(Class beanType, String propertyName) { + public ServerCache collectionIdsCache(Class beanType, String propertyName) { return cacheManager.getCollectionIdsCache(beanType, propertyName); } @Override - public ServerCache getQueryCache(Class beanType) { + public ServerCache queryCache(Class beanType) { return cacheManager.getQueryCache(beanType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 469cc148f..e517b37ec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -381,7 +381,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (encryptKeyManager != null) { encryptKeyManager.initialise(); } - serverCacheManager.setEnabledRegions(config.getEnabledL2Regions()); + serverCacheManager.enabledRegions(config.getEnabledL2Regions()); } /** diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index dd3c949f9..e33900534 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -242,7 +242,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().cacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().beanCache(cls).statistics(reset); } protected Platform platform() { diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java index beaa1b31f..977b38b42 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java @@ -18,28 +18,28 @@ public class ServerCacheManagerTest { assertTrue(region.isEnabled()); } - cacheManager.setEnabledRegions("r0,doesNotExist"); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions("r0,doesNotExist"); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions("r0"); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions("r0"); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions(null); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions(null); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions("email"); - assertThat(cacheManager.getRegion("email").isEnabled()).isTrue(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isFalse(); + cacheManager.enabledRegions("email"); + assertThat(cacheManager.region("email").isEnabled()).isTrue(); + assertThat(cacheManager.region("r0").isEnabled()).isFalse(); - cacheManager.setAllRegionsEnabled(false); + cacheManager.allRegionsEnabled(false); for (ServerCacheRegion region : cacheManager.allRegions()) { assertFalse(region.isEnabled()); } - cacheManager.setAllRegionsEnabled(true); + cacheManager.allRegionsEnabled(true); for (ServerCacheRegion region : cacheManager.allRegions()) { assertTrue(region.isEnabled()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java index e86a4cea0..9bf023c6e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java @@ -26,20 +26,20 @@ public class DefaultServerCacheTest { public void testGetHitRatio() { DefaultServerCache cache = createCache(); - assertEquals(0, cache.getHitRatio()); + assertEquals(0, cache.hitRatio()); assertEquals(0, cache.getHitCount()); assertEquals(0, cache.getMissCount()); cache.put("A", "A"); cache.get("A"); - assertEquals(100, cache.getHitRatio()); + assertEquals(100, cache.hitRatio()); assertEquals(1, cache.getHitCount()); assertEquals(0, cache.getMissCount()); cache.get("B"); - assertEquals(50, cache.getHitRatio()); + assertEquals(50, cache.hitRatio()); assertEquals(1, cache.getMissCount()); cache.get("B"); cache.get("B"); - assertEquals(25, cache.getHitRatio()); + assertEquals(25, cache.hitRatio()); assertEquals(3, cache.getMissCount()); assertEquals(1, cache.getHitCount()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index aa79cf71e..184783627 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java @@ -40,7 +40,7 @@ public class DefaultServerCache_RunEvictionTest { for (int i = 0; i < 15; i++) { doStuff(); cache.runEviction(); - ServerCacheStatistics statistics = cache.getStatistics(true); + ServerCacheStatistics statistics = cache.statistics(true); System.out.println(statistics); Thread.sleep(500); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index ad5a4e1a6..ae7405354 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -44,18 +44,18 @@ public class JdbcTransactionTest { public void skipCacheAfterSave() { ServerCacheManager cacheManager = DB.getDefault().cacheManager(); - ServerCache customerBeanCache = cacheManager.getBeanCache(Customer.class); - ServerCache contactNatKeyCache = cacheManager.getNaturalKeyCache(Contact.class); + ServerCache customerBeanCache = cacheManager.beanCache(Customer.class); + ServerCache contactNatKeyCache = cacheManager.naturalKeyCache(Contact.class); try (Transaction transaction = DB.beginTransaction()) { - customerBeanCache.getStatistics(true); - contactNatKeyCache.getStatistics(true); + customerBeanCache.statistics(true); + contactNatKeyCache.statistics(true); Customer.find.byId(19898989); DB.find(Contact.class).where().eq("email", "junk@foo.com").findOne(); - assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(1); - assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(1); + assertThat(customerBeanCache.statistics(true).getMissCount()).isEqualTo(1); + assertThat(contactNatKeyCache.statistics(true).getMissCount()).isEqualTo(1); EBasic basic = new EBasic("b1"); DB.save(basic); @@ -64,8 +64,8 @@ public class JdbcTransactionTest { Customer.find.byId(29898989); DB.find(Contact.class).where().eq("email", "junk2@foo.com").findOne(); - assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(0); - assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(0); + assertThat(customerBeanCache.statistics(true).getMissCount()).isEqualTo(0); + assertThat(contactNatKeyCache.statistics(true).getMissCount()).isEqualTo(0); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 4827e46f0..d20ceb952 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -19,7 +19,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase { ResetBasicData.reset(); - ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(Order.class); + ServerCache beanCache = Ebean.getServerCacheManager().beanCache(Order.class); beanCache.clear(); Order order = Ebean.getReference(Order.class, 1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 06ef39bdf..914191cc9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -33,7 +33,7 @@ public class TestQueryWithCache extends BaseTestCase { ServerCacheManager serverCacheManager = server.cacheManager(); serverCacheManager.clear(Country.class); - ServerCache beanCache = serverCacheManager.getBeanCache(Country.class); + ServerCache beanCache = serverCacheManager.beanCache(Country.class); assertEquals(0, beanCache.size()); Country nz1 = Ebean.getReference(Country.class, "NZ"); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 3d78cd137..4558594a5 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { - private final ServerCache beanCache = server().cacheManager().getBeanCache(UUOne.class); + private final ServerCache beanCache = server().cacheManager().beanCache(UUOne.class); private UUOne insert(String name) { UUOne one = new UUOne(); @@ -61,19 +61,19 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); // not lazy loading into bean cache - final ServerCacheStatistics stats = beanCache.getStatistics(true); + final ServerCacheStatistics stats = beanCache.statistics(true); assertThat(stats.getHitCount()).isEqualTo(10); assertThat(stats.getSize()).isEqualTo(10); } private void assertBeanCacheHits(int hits) { - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertEquals(statistics.getHitCount(), hits); } private void clearCacheAndStatistics() { beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); } private List insertData() { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 71b5a4b4d..822f80a21 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -23,7 +23,7 @@ public class TestQueryJoin extends BaseTestCase { // Need to make sure the customer cache is cleared for the later // asserts on the lazy loading - ServerCache custCache = Ebean.getServerCacheManager().getBeanCache(Customer.class); + ServerCache custCache = Ebean.getServerCacheManager().beanCache(Customer.class); custCache.clear(); Query query = Ebean.find(Order.class).select("status") diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java index 280848b95..80ef3b99d 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java @@ -27,7 +27,7 @@ public class TestBeanCache extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestBeanCache.class); - private final ServerCache beanCache = DB.getDefault().cacheManager().getBeanCache(OCachedBean.class); + private final ServerCache beanCache = DB.getDefault().cacheManager().beanCache(OCachedBean.class); @Test public void findById_when_idTypeConverted() { @@ -61,7 +61,7 @@ public class TestBeanCache extends BaseTestCase { List ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList()); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); try (Transaction transaction = DB.beginTransaction()) { // skipCacheAfterWrite set after this write ... @@ -77,7 +77,7 @@ public class TestBeanCache extends BaseTestCase { transaction.commit(); } - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(0); assertThat(statistics.getMissCount()).isEqualTo(2); assertThat(statistics.getPutCount()).isEqualTo(2); @@ -90,7 +90,7 @@ public class TestBeanCache extends BaseTestCase { List ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList()); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); LoggedSqlCollector.start(); @@ -158,7 +158,7 @@ public class TestBeanCache extends BaseTestCase { } private void assertBeanCacheHitMiss(int hitCount, int missCount) { - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(hitCount); assertThat(statistics.getMissCount()).isEqualTo(missCount); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index c0d632abc..4144ca557 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -18,13 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestBeanFetchJoinCache extends BaseTestCase { - private final ServerCache customerBeanCache = server().cacheManager().getBeanCache(Customer.class); + private final ServerCache customerBeanCache = server().cacheManager().beanCache(Customer.class); @Test public void fetchCache_when_allHits() { initDataClearCache(); loadCustomerBeanCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -35,7 +35,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final List sql0 = LoggedSqlCollector.current(); assertThat(sql0).hasSize(1); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(2); assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status"); @@ -64,7 +64,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .where().lt("id", 2) .findList(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -77,7 +77,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(sql0.get(0)).contains(" from o_order "); assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id "); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(1); for (Order order : orders) { @@ -98,7 +98,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .select("name") // not included status in bean cache .findList(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -112,7 +112,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final List sql0 = LoggedSqlCollector.current(); assertThat(sql0).hasSize(1); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(2); assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status"); @@ -129,7 +129,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(sql1.get(0)).contains(" from o_customer t0 "); // assert we didn't hit the L2 bean cache the second time around - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getHitCount()).isGreaterThan(0); } @@ -141,7 +141,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { public void fetchGroup_fetchCache() { initDataClearCache(); loadCustomerBeanCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); List orders = DB.find(Order.class) .select(fgBasic) @@ -149,7 +149,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(orders).isNotEmpty(); - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getHitCount()).isEqualTo(2); } @@ -160,7 +160,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchGroup_fetchCache_partial() { initDataClearCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -170,7 +170,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(orders).isNotEmpty(); - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getMissCount()).isEqualTo(2); final List sql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 390e3e4e4..20fa503c7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -17,16 +17,16 @@ public class TestCacheBasic extends BaseTestCase { ResetBasicData.reset(); Ebean.getServerCacheManager().clear(Country.class); - ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class); + ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); loadCountryCache(); Assert.assertTrue(countryCache.size() > 0); // reset the statistics - countryCache.getStatistics(true); + countryCache.statistics(true); Country c0 = Ebean.getReference(Country.class, "NZ"); - ServerCacheStatistics statistics = countryCache.getStatistics(false); + ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); Assert.assertEquals(1, hc); Assert.assertNotNull(c0); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 5cff419c4..0fcef9cee 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -39,8 +39,8 @@ public class TestCacheCollectionIds extends BaseTestCase { ResetBasicData.reset(); awaitL2Cache(); - ServerCache custCache = cacheManager.getBeanCache(Customer.class); - ServerCache custManyIdsCache = cacheManager.getCollectionIdsCache(Customer.class, "contacts"); + ServerCache custCache = cacheManager.beanCache(Customer.class); + ServerCache custManyIdsCache = cacheManager.collectionIdsCache(Customer.class, "contacts"); // cacheManager.setCaching(Customer.class, true); // cacheManager.setCaching(Contact.class, true); @@ -121,7 +121,7 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); // confirm the starting data and cache entry @@ -249,7 +249,7 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); // confirm the starting data and cache entry @@ -293,7 +293,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.save(cachedBean); // clear the cache - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); cachedBeanCountriesCache.clear(); assertEquals(0, cachedBeanCountriesCache.size()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java index 8e64c2327..608b481d7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -22,7 +22,7 @@ public class TestCacheNaturalId extends BaseTestCase { ResetBasicData.reset(); - ServerCache contactCache = Ebean.getServerCacheManager().getBeanCache(Contact.class); + ServerCache contactCache = Ebean.getServerCacheManager().beanCache(Contact.class); List list = Ebean.find(Contact.class).setBeanCacheMode(CacheMode.PUT).findList(); @@ -36,15 +36,15 @@ public class TestCacheNaturalId extends BaseTestCase { } } - contactCache.getStatistics(true); + contactCache.statistics(true); Contact c0 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); - ServerCacheStatistics stats0 = contactCache.getStatistics(false); + ServerCacheStatistics stats0 = contactCache.statistics(false); Contact c1 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); - ServerCacheStatistics stats1 = contactCache.getStatistics(false); + ServerCacheStatistics stats1 = contactCache.statistics(false); assertNotNull(c0); assertNotNull(c1); @@ -59,7 +59,7 @@ public class TestCacheNaturalId extends BaseTestCase { Contact c2 = Ebean.find(Contact.class).where().eq("email", "mychangedemail@what.com") .findOne(); - ServerCacheStatistics stats2 = contactCache.getStatistics(false); + ServerCacheStatistics stats2 = contactCache.statistics(false); assertNotNull(c2); assertEquals(c2.getId(), c1.getId()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java index b55135f30..ef863dc65 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java @@ -21,7 +21,7 @@ public class TestExternalNotification extends BaseTestCase { loadCountryCache(); - ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class); + ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); assertTrue(countryCache.size() > 0); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index cbc736cc5..7e02c995c 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -28,8 +28,8 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { Ebean.save(f1); - ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(FeatureDescription.class); - beanCache.getStatistics(true); + ServerCache beanCache = Ebean.getServerCacheManager().beanCache(FeatureDescription.class); + beanCache.statistics(true); OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("name"); @@ -49,7 +49,7 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { // load the cache FeatureDescription fetchOne = Ebean.find(FeatureDescription.class, f1.getId()); Assert.assertNotNull(fetchOne); - assertEquals(1, beanCache.getStatistics(false).getSize()); + assertEquals(1, beanCache.statistics(false).getSize()); FeatureDescription fetchTwo = Ebean.find(FeatureDescription.class, f1.getId()); FeatureDescription fetchThree = Ebean.find(FeatureDescription.class, f1.getId()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index b8ce6d1d5..0c4dc2317 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -217,7 +217,7 @@ public class TestQueryCache extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = DB.getServerCacheManager().getQueryCache(Customer.class); + ServerCache customerCache = DB.getServerCacheManager().queryCache(Customer.class); customerCache.clear(); List list = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 28694eac3..6e442fa4f 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertTrue; public class TestQueryCacheCountry extends BaseTestCase { private ServerCacheManager cacheManager = Ebean.getServerCacheManager(); - private ServerCache queryCache = cacheManager.getQueryCache(Country.class); - private ServerCache beanCache = cacheManager.getBeanCache(Country.class); + private ServerCache queryCache = cacheManager.queryCache(Country.class); + private ServerCache beanCache = cacheManager.beanCache(Country.class); private void clearCache() { queryCache.clear(); beanCache.clear(); - queryCache.getStatistics(true); + queryCache.statistics(true); } @@ -44,7 +44,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList0).isEmpty(); - ServerCacheStatistics queryStats = queryCache.getStatistics(false); + ServerCacheStatistics queryStats = queryCache.statistics(false); assertEquals(1, queryStats.getMissCount()); assertEquals(1, queryStats.getSize()); @@ -56,7 +56,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList1).isEmpty(); - ServerCacheStatistics queryStats1 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats1 = queryCache.statistics(false); assertEquals(1, queryStats1.getMissCount()); assertEquals(1, queryStats1.getSize()); assertEquals(1, queryStats1.getHitCount()); @@ -83,7 +83,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList1.get(0).getName()).isEqualTo("Australia"); - ServerCacheStatistics queryStats1 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats1 = queryCache.statistics(false); assertEquals(2, queryStats1.getMissCount()); assertEquals(2, queryStats1.getSize()); assertEquals(0, queryStats1.getHitCount()); // no hits yet @@ -97,7 +97,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList2.get(0).getName()).isEqualTo("New Zealand"); - ServerCacheStatistics queryStats2 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats2 = queryCache.statistics(false); assertEquals(2, queryStats2.getMissCount()); assertEquals(2, queryStats2.getSize()); assertEquals(1, queryStats2.getHitCount()); // got a hit @@ -110,7 +110,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList3.get(0).getName()).isEqualTo("Australia"); - ServerCacheStatistics queryStats3 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats3 = queryCache.statistics(false); assertEquals(2, queryStats3.getMissCount()); assertEquals(2, queryStats3.getSize()); assertEquals(2, queryStats3.getHitCount()); // got another hit @@ -124,14 +124,14 @@ public class TestQueryCacheCountry extends BaseTestCase { awaitL2Cache(); clearCache(); - assertEquals(0, queryCache.getStatistics(false).getSize()); + assertEquals(0, queryCache.statistics(false).getSize()); List countryList0 = Ebean.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); - assertEquals(1, queryCache.getStatistics(false).getSize()); + assertEquals(1, queryCache.statistics(false).getSize()); assertTrue(!countryList0.isEmpty()); List countryList1 = Ebean.find(Country.class) @@ -139,7 +139,7 @@ public class TestQueryCacheCountry extends BaseTestCase { .order().asc("name") .findList(); - ServerCacheStatistics statistics = queryCache.getStatistics(false); + ServerCacheStatistics statistics = queryCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); Assert.assertSame(countryList1, countryList0); @@ -149,7 +149,7 @@ public class TestQueryCacheCountry extends BaseTestCase { Ebean.save(nz); awaitL2Cache(); - statistics = queryCache.getStatistics(false); + statistics = queryCache.statistics(false); assertEquals(0, statistics.getSize()); List countryList2 = Ebean.find(Country.class) diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 3a5ca02ea..0b5517eb7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -44,8 +44,8 @@ public class TestQueryCacheInsert extends BaseTestCase { Ebean.save(doda); - ServerCache queryCache = Ebean.getServerCacheManager().getQueryCache(EBasicVer.class); - queryCache.getStatistics(true); + ServerCache queryCache = Ebean.getServerCacheManager().queryCache(EBasicVer.class); + queryCache.statistics(true); Optional found0 = Ebean.find(EBasicVer.class) .where().eq("description", "OddButUniqueSillyExample") @@ -65,7 +65,7 @@ public class TestQueryCacheInsert extends BaseTestCase { } private void assertHitMiss(int hits, int miss, ServerCache queryCache) { - ServerCacheStatistics stats = queryCache.getStatistics(true); + ServerCacheStatistics stats = queryCache.statistics(true); assertEquals(hits, stats.getHitCount()); assertEquals(miss, stats.getMissCount()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 4403aa885..46c910f83 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -25,7 +25,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = Ebean.getServerCacheManager().getQueryCache(Customer.class); + ServerCache customerCache = Ebean.getServerCacheManager().queryCache(Customer.class); customerCache.clear(); List
addrs = Ebean.find(Address.class) @@ -138,8 +138,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("bobby"); child.setBillingAddress(root); DB.save(child); - DB.getServerCacheManager().getQueryCache(Address.class).clear(); - DB.getServerCacheManager().getQueryCache(Customer.class).clear(); + DB.getServerCacheManager().queryCache(Address.class).clear(); + DB.getServerCacheManager().queryCache(Customer.class).clear(); // Test preparation finished, start the test Thread.sleep(10); @@ -169,8 +169,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("testChild"); child.setRoot(root); DB.save(child); - DB.getServerCacheManager().getQueryCache(ECacheChild.class).clear(); - DB.getServerCacheManager().getQueryCache(ECacheRoot.class).clear(); + DB.getServerCacheManager().queryCache(ECacheChild.class).clear(); + DB.getServerCacheManager().queryCache(ECacheRoot.class).clear(); // Test preparation finished, start the test Thread.sleep(10); // we need this thread.sleep here, because on a fast machine, DB.save(child) and computing the diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index d057edffd..a5d950009 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -21,10 +21,10 @@ public class PersonCacheTests { private final List ids = Arrays.asList("E001", "E002", "E003"); - private ServerCache beanCacheInfo = DB.getDefault().cacheManager().getBeanCache(PersonCacheInfo.class); - private ServerCache beanCacheEmail = DB.getDefault().cacheManager().getBeanCache(PersonCacheEmail.class); + private ServerCache beanCacheInfo = DB.getDefault().cacheManager().beanCache(PersonCacheInfo.class); + private ServerCache beanCacheEmail = DB.getDefault().cacheManager().beanCache(PersonCacheEmail.class); - private ServerCacheRegion region = DB.getDefault().cacheManager().getRegion("email"); + private ServerCacheRegion region = DB.getDefault().cacheManager().region("email"); private void insert(int id, String email) { @@ -56,7 +56,7 @@ public class PersonCacheTests { .setUseCache(true) .findList(); - beanCacheInfo.getStatistics(true); + beanCacheInfo.statistics(true); List emailList = DB.find(PersonCacheEmail.class) @@ -73,7 +73,7 @@ public class PersonCacheTests { List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(3); - assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3); + assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); // force cache misses on PersonCacheEmail beanCacheEmail.clear(); @@ -94,7 +94,7 @@ public class PersonCacheTests { sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3); + assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); turnOffRegion_expect_noCacheUse(); @@ -103,7 +103,7 @@ public class PersonCacheTests { private void turnOffRegion_expect_noCacheUse() { assertTrue(region.isEnabled()); - beanCacheEmail.getStatistics(true); + beanCacheEmail.statistics(true); log.info("Disabled region ..."); region.setEnabled(false); @@ -116,7 +116,7 @@ public class PersonCacheTests { } // assert that we didn't hit the cache - ServerCacheStatistics statistics = beanCacheEmail.getStatistics(true); + ServerCacheStatistics statistics = beanCacheEmail.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(0); assertThat(statistics.getMissCount()).isEqualTo(0); @@ -131,7 +131,7 @@ public class PersonCacheTests { } // assert that we DID hit the cache - statistics = beanCacheEmail.getStatistics(true); + statistics = beanCacheEmail.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(3); assertThat(statistics.getMissCount()).isEqualTo(0); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java index af6c1299d..3c88e598e 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java @@ -56,7 +56,7 @@ public class TestInheritCacheRefLoad { Class streetClassLazyLoaded = customerReloaded.getAddress().getStreet().getClass(); //Show Cache Hits - System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount()); + System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().queryCache(streetClassLazyLoaded).statistics(false).getHitCount()); return streetClassLazyLoaded; } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 7411b1842..bad02c0c4 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -21,8 +21,8 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestCacheViaComplexNaturalKey.class); - private ServerCache beanCache = cacheManager().getBeanCache(OCachedNatKeyBean.class); - private ServerCache natKeyCache = cacheManager().getNaturalKeyCache(OCachedNatKeyBean.class); + private ServerCache beanCache = cacheManager().beanCache(OCachedNatKeyBean.class); + private ServerCache natKeyCache = cacheManager().naturalKeyCache(OCachedNatKeyBean.class); private static boolean loadOnce; @@ -52,17 +52,17 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { } private void clearStatistics() { - beanCache.getStatistics(true); - natKeyCache.getStatistics(true); + beanCache.statistics(true); + natKeyCache.statistics(true); } private void assertNaturalKeyHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = natKeyCache.getStatistics(true); + ServerCacheStatistics stats = natKeyCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } private void assertBeanCacheHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = beanCache.getStatistics(true); + ServerCacheStatistics stats = beanCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index a94b77725..34175b77c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { - private ServerCache beanCache = cacheManager().getBeanCache(OCachedNatKeyBean3.class); - private ServerCache natKeyCache = cacheManager().getNaturalKeyCache(OCachedNatKeyBean3.class); + private ServerCache beanCache = cacheManager().beanCache(OCachedNatKeyBean3.class); + private ServerCache natKeyCache = cacheManager().naturalKeyCache(OCachedNatKeyBean3.class); private static boolean loadOnce; @@ -55,17 +55,17 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { } private void clearStatistics() { - beanCache.getStatistics(true); - natKeyCache.getStatistics(true); + beanCache.statistics(true); + natKeyCache.statistics(true); } private void assertNaturalKeyHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = natKeyCache.getStatistics(true); + ServerCacheStatistics stats = natKeyCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } private void assertBeanCacheHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = beanCache.getStatistics(true); + ServerCacheStatistics stats = beanCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 321c50dc1..d96d49b17 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheWithSoftDelete extends BaseTestCase { - private final ServerCache beanCache = DB.getServerCacheManager().getBeanCache(ESoftWithCache.class); + private final ServerCache beanCache = DB.getServerCacheManager().beanCache(ESoftWithCache.class); @Test public void idIn_expect_hitCache() { @@ -41,6 +41,6 @@ public class TestCacheWithSoftDelete extends BaseTestCase { } private ServerCacheStatistics stats() { - return beanCache.getStatistics(true); + return beanCache.statistics(true); } } diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 616d0b441..52fb10c60 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -80,15 +80,15 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { ServerCacheManager serverCacheManager = server.cacheManager(); // get cache, clear the cache and statistics - ServerCache beanCache = serverCacheManager.getBeanCache(EInvoice.class); + ServerCache beanCache = serverCacheManager.beanCache(EInvoice.class); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); // fetch and load the cache EInvoice invoice4 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice4); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(0, statistics.getHitCount()); @@ -97,7 +97,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { EInvoice invoice5 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice5); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index 2f202d83c..91ccb2b78 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -83,8 +83,8 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache() { resetCounters(); - ServerCache beanCache = server.cacheManager().getBeanCache(EBasicChangeLog.class); - beanCache.getStatistics(true); + ServerCache beanCache = server.cacheManager().beanCache(EBasicChangeLog.class); + beanCache.statistics(true); EBasicChangeLog found = server.find(EBasicChangeLog.class, id1); assertThat(found).isNotNull(); @@ -94,13 +94,13 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(EBasicChangeLog.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo(id1); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0); EBasicChangeLog found2 = server.find(EBasicChangeLog.class, id1); assertThat(found2).isNotNull(); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(1); @@ -111,8 +111,8 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache_sharedBean() { resetCounters(); - ServerCache beanCache = server.cacheManager().getBeanCache(Country.class); - beanCache.getStatistics(true); + ServerCache beanCache = server.cacheManager().beanCache(Country.class); + beanCache.statistics(true); Country found = server.find(Country.class, "AR"); assertThat(found).isNotNull(); @@ -122,13 +122,13 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(Country.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo("AR"); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0); Country found2 = server.find(Country.class, "AR"); assertThat(found2).isNotNull(); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(1); diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 93ca61c87..5b76d754f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -238,7 +238,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().cacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().beanCache(cls).statistics(reset); } protected Platform platform() { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index b1f134ca3..b895170f6 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -46,7 +46,7 @@ public class ClusterTest { Person fooA = DB.find(Person.class, foo.getId()); Person fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().getBeanCache(Person.class); + DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().beanCache(Person.class); assertCounts(dualCacheA, 0, 1, 0, 1); fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 1, 1, 0, 1); @@ -54,7 +54,7 @@ public class ClusterTest { fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 2, 1, 0, 1); fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheB = (DuelCache) other.cacheManager().getBeanCache(Person.class); + DuelCache dualCacheB = (DuelCache) other.cacheManager().beanCache(Person.class); assertCounts(dualCacheB, 2, 1, 1, 0); } @@ -72,7 +72,7 @@ public class ClusterTest { other.cacheManager().clearAll(); other.metaInfo().resetAllMetrics(); - DuelCache dualCache = (DuelCache) other.cacheManager().getBeanCache(Person.class); + DuelCache dualCache = (DuelCache) other.cacheManager().beanCache(Person.class); Person foo0 = other.find(Person.class, 1); assertCounts(dualCache, 0, 1, 0, 1); From b69c00b01e7557a0010ab28da7794a8d31791179 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 18:01:27 +1200 Subject: [PATCH 041/102] #2353 - Rename BeanPersistRequest methods with deprecation --- .../io/ebean/event/BeanDeleteIdRequest.java | 47 +++++++++--- .../io/ebean/event/BeanPersistRequest.java | 71 +++++++++++++++++-- .../java/io/ebean/event/BeanQueryRequest.java | 31 +++++++- .../java/io/ebean/event/BulkTableEvent.java | 10 ++- .../io/ebeaninternal/api/LoadRequest.java | 4 +- .../api/TransactionEventTable.java | 4 +- .../server/core/BeanRequest.java | 2 +- .../server/core/DefaultServer.java | 4 +- .../server/core/OrmQueryRequest.java | 2 +- .../server/core/PersistRequestBean.java | 14 ++-- .../server/core/SpiOrmQueryRequest.java | 2 +- .../deploy/BeanCollectionHelpFactory.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 2 +- .../deploy/BeanLifecycleAdapterFactory.java | 2 +- .../server/deploy/BeanPropertyAssocMany.java | 2 +- .../expression/ExistsQueryExpression.java | 2 +- .../server/expression/InQueryExpression.java | 2 +- .../server/loadcontext/DLoadContext.java | 2 +- .../server/persist/DefaultPersister.java | 18 ++--- .../server/persist/DeleteIdRequest.java | 10 +-- .../persist/DeleteUnloadedForeignKeys.java | 6 +- .../server/persist/ExeCallableSql.java | 2 +- .../server/persist/ExeOrmUpdate.java | 2 +- .../server/persist/ExeUpdateSql.java | 2 +- .../server/persist/SaveManyBase.java | 2 +- .../server/persist/dml/DeleteHandler.java | 2 +- .../server/persist/dml/DmlBeanPersister.java | 4 +- .../server/persist/dml/DmlHandler.java | 4 +- .../server/persist/dml/InsertHandler.java | 2 +- .../server/persist/dml/UpdateHandler.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 8 +-- .../server/query/CQueryBuilder.java | 22 +++--- .../server/query/CQueryBuilderRawSql.java | 8 +-- .../server/query/CQueryEngine.java | 20 +++--- .../query/CQueryFetchSingleAttribute.java | 4 +- .../server/query/CQueryPlan.java | 4 +- .../server/query/CQueryPlanRawSql.java | 2 +- .../server/query/CQueryPredicates.java | 2 +- .../server/query/CQueryRowCount.java | 4 +- .../server/query/CQueryUpdate.java | 4 +- .../server/query/DefaultOrmQueryEngine.java | 4 +- .../server/query/SqlTreeBuilder.java | 4 +- .../transaction/BulkEventListenerMap.java | 2 +- .../docstore/api/DocQueryRequest.java | 4 +- .../event/BeanPersistControllerTest.java | 2 +- ...faultServer_createOrmQueryRequestTest.java | 32 ++++----- .../server/expression/BaseExpressionTest.java | 4 +- .../org/tests/json/TestDbJson_Jackson3.java | 4 +- .../basic/event/SimpleTOneQueryAdapter.java | 2 +- .../event/TWithPreInsertPersistAdapter.java | 4 +- .../tests/model/prnt/MPrinterListener.java | 4 +- 51 files changed, 263 insertions(+), 142 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java index c86ff6c87..66831b69e 100644 --- a/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java +++ b/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java @@ -10,31 +10,62 @@ import io.ebean.Transaction; public interface BeanDeleteIdRequest { /** - * Return the server processing the request. - * @deprecated use {@link #getDatabase()} + * Deprecated migrate to database(). */ + @Deprecated EbeanServer getEbeanServer(); + /** + * Deprecated migrate to database(). + */ + @Deprecated + default Database getDatabase() { + return getEbeanServer(); + } + /** * Return the DB processing the request. */ - default Database getDatabase() { + default Database database() { return getEbeanServer(); } - + /** * Return the Transaction associated with this request. */ - Transaction getTransaction(); - + Transaction transaction(); + + /** + * Deprecated migrate to transaction(). + */ + @Deprecated + default Transaction getTransaction() { + return transaction(); + } + /** * Returns the bean type of the bean being deleted. */ - Class getBeanType(); + Class beanType(); + + /** + * Deprecated migrate to beanType(). + */ + @Deprecated + default Class getBeanType() { + return beanType(); + } /** * Returns the Id value of the bean being deleted. */ - Object getId(); + Object id(); + /** + * Deprecated migrate to id(). + */ + @Deprecated + default Object getId() { + return id(); + } } diff --git a/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java index c5043fb74..57930a107 100644 --- a/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java +++ b/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java @@ -1,5 +1,6 @@ package io.ebean.event; +import io.ebean.Database; import io.ebean.EbeanServer; import io.ebean.Transaction; import io.ebean.ValuePair; @@ -17,20 +18,44 @@ import java.util.Set; public interface BeanPersistRequest { /** - * Return the server processing the request. + * Return the DB processing the request. */ + default Database database() { + return getEbeanServer(); + } + + /** + * Deprecated migrate to database(). + */ + @Deprecated EbeanServer getEbeanServer(); /** * Return the Transaction associated with this request. */ - Transaction getTransaction(); + Transaction transaction(); + + /** + * Deprecated migrate to transaction(). + */ + @Deprecated + default Transaction getTransaction() { + return transaction(); + } /** * For an update or delete of a partially populated bean this is the set of * loaded properties and otherwise returns null. */ - Set getLoadedProperties(); + Set loadedProperties(); + + /** + * Deprecated migrate to loadedProperties(). + */ + @Deprecated + default Set getLoadedProperties() { + return loadedProperties(); + } /** * For an update this is the set of properties that where updated. @@ -39,12 +64,28 @@ public interface BeanPersistRequest { * should be preferred if it satisfies the requirement. *

*/ - Set getUpdatedProperties(); + Set updatedProperties(); + + /** + * Deprecated migrate to updatedProperties(). + */ + @Deprecated + default Set getUpdatedProperties() { + return updatedProperties(); + } /** * Flags set for dirty properties (used by ElasticSearch integration). */ - boolean[] getDirtyProperties(); + boolean[] dirtyProperties(); + + /** + * Deprecated migrate to updatedProperties(). + */ + @Deprecated + default boolean[] getDirtyProperties() { + return dirtyProperties(); + } /** * Return true for an update request if at least one of dirty properties is contained @@ -66,11 +107,27 @@ public interface BeanPersistRequest { /** * Returns the bean being inserted updated or deleted. */ - T getBean(); + T bean(); + + /** + * Deprecated migrate to bean(). + */ + @Deprecated + default T getBean() { + return bean(); + } /** * Returns a map of the properties that have changed and their new and old values. */ - Map getUpdatedValues(); + Map updatedValues(); + + /** + * Deprecated migrate to updatedValues(). + */ + @Deprecated + default Map getUpdatedValues() { + return updatedValues(); + } } diff --git a/ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java index 4c13aee54..a8f2b7a29 100644 --- a/ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java +++ b/ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java @@ -1,5 +1,6 @@ package io.ebean.event; +import io.ebean.Database; import io.ebean.EbeanServer; import io.ebean.Query; import io.ebean.Transaction; @@ -10,19 +11,43 @@ import io.ebean.Transaction; public interface BeanQueryRequest { /** - * Return the server processing the request. + * Return the DB processing the request. */ + default Database database() { + return getEbeanServer(); + } + + /** + * Deprecated migrate to database(). + */ + @Deprecated EbeanServer getEbeanServer(); /** * Return the Transaction associated with this request. */ - Transaction getTransaction(); + Transaction transaction(); + + /** + * Deprecated migrate to transaction(). + */ + @Deprecated + default Transaction getTransaction() { + return transaction(); + } /** * Returns the query. */ - Query getQuery(); + Query query(); + + /** + * Deprecated migrate to query(). + */ + @Deprecated + default Query getQuery() { + return query(); + } /** * Return true if an Id IN expression should have the bind parameters padded. diff --git a/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java b/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java index a10168cf5..d37743303 100644 --- a/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java +++ b/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java @@ -8,7 +8,15 @@ public interface BulkTableEvent { /** * Return the name of the table that was involved. */ - String getTableName(); + String tableName(); + + /** + * Deprecated migrate to tableName(). + */ + @Deprecated + default String getTableName() { + return tableName(); + } /** * Return true if rows were inserted. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java index 090e4bfad..b8259d5b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java @@ -14,7 +14,7 @@ public abstract class LoadRequest { LoadRequest(OrmQueryRequest parentRequest, boolean lazy) { this.parentRequest = parentRequest; - this.transaction = parentRequest == null ? null : parentRequest.getTransaction(); + this.transaction = parentRequest == null ? null : parentRequest.transaction(); this.lazy = lazy; } @@ -45,6 +45,6 @@ public abstract class LoadRequest { * So one of - findIterate(), findEach(), findEachWhile() or findVisit(). */ public boolean isParentFindIterate() { - return parentRequest != null && parentRequest.getQuery().getType() == SpiQuery.Type.ITERATE; + return parentRequest != null && parentRequest.query().getType() == SpiQuery.Type.ITERATE; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java index de55cd163..d9bf0f3a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java @@ -39,7 +39,7 @@ public final class TransactionEventTable implements Serializable, BinaryWritable } public void add(TableIUD newTableIUD) { - TableIUD existingTableIUD = map.put(newTableIUD.getTableName(), newTableIUD); + TableIUD existingTableIUD = map.put(newTableIUD.tableName(), newTableIUD); if (existingTableIUD != null) { newTableIUD.add(existingTableIUD); } @@ -104,7 +104,7 @@ public final class TransactionEventTable implements Serializable, BinaryWritable } @Override - public String getTableName() { + public String tableName() { return table; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java index 74327b5f2..0b57ce2c3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -102,7 +102,7 @@ public abstract class BeanRequest { /** * Return the Transaction associated with this request. */ - public SpiTransaction getTransaction() { + public SpiTransaction transaction() { return transaction; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index e517b37ec..4d97e5a41 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1312,7 +1312,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { SpiOrmQueryRequest request = createQueryRequest(Type.ID_LIST, query, t); Object result = request.getFromQueryCache(); if (result != null) { - if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) { + if (Boolean.FALSE.equals(request.query().isReadOnly())) { return new CopyOnFirstWriteList<>((List) result); } else { return (List) result; @@ -1341,7 +1341,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (ids.isEmpty()) { return 0; } else { - return persister.deleteByIds(request.getBeanDescriptor(), ids, request.getTransaction(), false); + return persister.deleteByIds(request.getBeanDescriptor(), ids, request.transaction(), false); } } } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 0fb83a18f..5cbc7ae32 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -509,7 +509,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } @Override - public SpiQuery getQuery() { + public SpiQuery query() { return query; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 8b3285c7a..038281833 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -424,12 +424,12 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } @Override - public Set getLoadedProperties() { + public Set loadedProperties() { return intercept.getLoadedPropertyNames(); } @Override - public Set getUpdatedProperties() { + public Set updatedProperties() { return intercept.getDirtyPropertyNames(); } @@ -437,7 +437,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return the dirty properties on this request. */ @Override - public boolean[] getDirtyProperties() { + public boolean[] dirtyProperties() { return dirtyProperties; } @@ -462,7 +462,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } @Override - public Map getUpdatedValues() { + public Map updatedValues() { return intercept.getDirtyValues(); } @@ -675,7 +675,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return the bean associated with this request. */ @Override - public T getBean() { + public T bean() { return bean; } @@ -783,7 +783,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP case UPDATE: if (beanPersistListener != null) { // store the updated properties for sending later - updatedProperties = getUpdatedProperties(); + updatedProperties = updatedProperties(); } executeUpdate(); return -1; @@ -1384,7 +1384,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP String key = beanDescriptor.cacheKey(idValue); Map changes = new LinkedHashMap<>(); EntityBean bean = getEntityBean(); - boolean[] dirtyProperties = getDirtyProperties(); + boolean[] dirtyProperties = dirtyProperties(); if (dirtyProperties != null) { for (int i = 0; i < dirtyProperties.length; i++) { if (dirtyProperties[i]) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index 41cfff829..ea59c48da 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -22,7 +22,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ * Return the query. */ @Override - SpiQuery getQuery(); + SpiQuery query(); /** * Return the associated BeanDescriptor. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index c3bda06be..f4bf3a328 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -45,7 +45,7 @@ public final class BeanCollectionHelpFactory { } else if (manyType == SpiQuery.Type.MAP) { BeanDescriptor target = request.getBeanDescriptor(); - ElPropertyValue elProperty = target.getElGetValue(request.getQuery().getMapKey()); + ElPropertyValue elProperty = target.getElGetValue(request.query().getMapKey()); return new BeanMapQueryHelp<>(elProperty); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 6261ab73c..0ea24c1b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -377,7 +377,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy * For SQL based modifications we need to invalidate appropriate parts of the cache. */ public void cacheNotify(TransactionEventTable.TableIUD tableIUD, CacheChangeSet changeSet) { - String tableName = tableIUD.getTableName().toLowerCase(); + String tableName = tableIUD.tableName().toLowerCase(); List> normalBeanTypes = tableToDescMap.get(tableName); if (normalBeanTypes != null) { // 'normal' entity beans based on a "base table" diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index f754c9060..e9d9c5372 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -208,7 +208,7 @@ final class BeanLifecycleAdapterFactory { private void invoke(Method[] methods, BeanPersistRequest request) { for (Method method : methods) { - invoke(method, request.getBean()); + invoke(method, request.bean()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index d07d94843..935fc8d3f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -414,7 +414,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST boolean softDelete = targetDescriptor.isSoftDelete(); boolean needsX2Table = softDelete || getExtraWhere() != null; StringBuilder sb = new StringBuilder(50); - SpiQuery query = request.getQueryRequest().getQuery(); + SpiQuery query = request.getQueryRequest().query(); if (hasJoinTable()) { sb.append(query.isAsDraft() ? intersectionDraftTable : intersectionPublishTable); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java index 438f1a2d5..cf5a6ec99 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java @@ -79,7 +79,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE */ protected CQuery compileSubQuery(BeanQueryRequest queryRequest) { SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer(); - return ebeanServer.compileQuery(Type.SQ_EXISTS, subQuery, queryRequest.getTransaction()); + return ebeanServer.compileQuery(Type.SQ_EXISTS, subQuery, queryRequest.transaction()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java index e53792550..6e80916a0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java @@ -67,7 +67,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD private CQuery compileSubQuery(BeanQueryRequest queryRequest) { SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer(); - return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.getTransaction()); + return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.transaction()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index a7ec0e0c8..b7460a69c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -97,7 +97,7 @@ public final class DLoadContext implements LoadContext { this.defaultBatchSize = request.getLazyLoadBatchSize(); this.rootDescriptor = request.getBeanDescriptor(); - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); this.useDocStore = query.isUseDocStore(); this.asOf = query.getAsOf(); this.asDraft = query.isAsDraft(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index fadc782bc..5270ea8ca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -538,7 +538,7 @@ public final class DefaultPersister implements Persister { request.executeOrQueue(); } else if (logger.isDebugEnabled()) { - logger.debug("Update skipped as bean is unchanged: {}", request.getBean()); + logger.debug("Update skipped as bean is unchanged: {}", request.bean()); } if (request.isPersistCascade()) { @@ -590,7 +590,7 @@ public final class DefaultPersister implements Persister { // skip deleting bean. Used where cascade is on // both sides of a relationship if (logger.isDebugEnabled()) { - logger.debug("skipping delete on alreadyRegistered " + req.getBean()); + logger.debug("skipping delete on alreadyRegistered " + req.bean()); } return 0; } @@ -600,7 +600,7 @@ public final class DefaultPersister implements Persister { int rows = delete(req); if (draftReq != null) { // delete the 'draft' bean ('live' bean deleted first) - draftReq.setTrans(req.getTransaction()); + draftReq.setTrans(req.transaction()); rows = delete(draftReq); } req.commitTransIfRequired(); @@ -908,11 +908,11 @@ public final class DefaultPersister implements Persister { EntityBean parentBean = request.getEntityBean(); BeanDescriptor desc = request.getBeanDescriptor(); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); EntityBean orphanForRemoval = request.getImportedOrphanForRemoval(); if (orphanForRemoval != null) { - delete(orphanForRemoval, request.getTransaction(), true); + delete(orphanForRemoval, request.transaction(), true); } // exported ones with cascade save @@ -977,7 +977,7 @@ public final class DefaultPersister implements Persister { */ private void deleteAssocMany(PersistRequestBean request) { - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); t.depth(-1); BeanDescriptor desc = request.getBeanDescriptor(); @@ -1122,7 +1122,7 @@ public final class DefaultPersister implements Persister { && !prop.isSaveRecurseSkippable(detailBean) && !prop.isReference(detailBean) && !request.isParent(detailBean)) { - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); t.depth(-1); saveRecurse(detailBean, t, null, request.getFlags()); t.depth(+1); @@ -1140,7 +1140,7 @@ public final class DefaultPersister implements Persister { private void deleteOrphan(PersistRequestBean request, BeanPropertyAssocOne prop) { Object origValue = request.getOrigValue(prop); if (origValue instanceof EntityBean) { - delete((EntityBean) origValue, request.getTransaction(), true); + delete((EntityBean) origValue, request.transaction(), true); } } @@ -1180,7 +1180,7 @@ public final class DefaultPersister implements Persister { if (detailBean != null) { EntityBean detail = (EntityBean) detailBean; if (prop.hasId(detail)) { - deleteRecurse(detail, request.getTransaction(), deleteMode); + deleteRecurse(detail, request.transaction(), deleteMode); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java index e98a7919e..714744d36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java @@ -29,17 +29,17 @@ final class DeleteIdRequest implements BeanDeleteIdRequest { } @Override - public Transaction getTransaction() { + public Transaction transaction() { return transaction; } - - @Override - public Class getBeanType() { + + @Override + public Class beanType() { return beanType; } @Override - public Object getId() { + public Object id() { return id; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index 1c258b5bb..e5d8c5877 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -67,7 +67,7 @@ final class DeleteUnloadedForeignKeys { q.setIncludeSoftDeletes(); q.where().idEq(id); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); if (t.isLogSummary()) { t.logSummary("-- Ebean fetching foreign key values for delete of " + descriptor.getName() + " id:" + id); } @@ -87,9 +87,9 @@ final class DeleteUnloadedForeignKeys { // if bean exists with a unique id then delete it if (detailBean != null && prop.hasId((EntityBean) detailBean)) { if (deletePermanent) { - server.deletePermanent(detailBean, request.getTransaction()); + server.deletePermanent(detailBean, request.transaction()); } else { - server.delete(detailBean, request.getTransaction()); + server.delete(detailBean, request.transaction()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index fc2c1e0e5..5728df639 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -57,7 +57,7 @@ final class ExeCallableSql { private CallableStatement bindStmt(PersistRequestCallableSql request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); SpiCallableSql callableSql = request.getCallableSql(); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); String sql = callableSql.getSql(); BindParams bindParams = callableSql.getBindParams(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index ee9ffad23..9b1edb8d9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -69,7 +69,7 @@ final class ExeOrmUpdate { private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); SpiUpdate ormUpdate = request.getOrmUpdate(); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); String sql = ormUpdate.getUpdateStatement(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index 75627671f..5c8e838de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -75,7 +75,7 @@ final class ExeUpdateSql { private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); SpiSqlUpdate updateSql = request.getUpdateSql(); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); BindParams bindParams = updateSql.getBindParams(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java index a31cee3f2..b14311b0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java @@ -33,7 +33,7 @@ abstract class SaveManyBase implements SaveMany { this.server = request.getServer(); this.many = many; this.parentBean = parentBean; - this.transaction = request.getTransaction(); + this.transaction = request.transaction(); this.value = many.getValue(parentBean); this.insertedParent = insertedParent; if (!insertedParent) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java index 846e88f80..df23bea16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -30,7 +30,7 @@ final class DeleteHandler extends DmlHandler { @Override public void bind() throws SQLException { sql = meta.getSql(persistRequest); - SpiTransaction t = persistRequest.getTransaction(); + SpiTransaction t = persistRequest.transaction(); PreparedStatement pstmt; if (persistRequest.isBatched()) { pstmt = getPstmtBatch(t, sql, persistRequest, false); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java index f9d592cf3..043f210aa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -71,8 +71,8 @@ final class DmlBeanPersister implements BeanPersister { } catch (SQLException e) { // log the error to the transaction log String msg = "Error[" + StringHelper.removeNewLines(e.getMessage()) + "]"; - if (request.getTransaction().isLogSummary()) { - request.getTransaction().logSummary(msg); + if (request.transaction().isLogSummary()) { + request.transaction().logSummary(msg); } throw dbPlatform.translate(msg, e); } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 3baeb6551..323f8c369 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -40,7 +40,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { DmlHandler(PersistRequestBean persistRequest) { this.now = System.currentTimeMillis(); this.persistRequest = persistRequest; - this.transaction = persistRequest.getTransaction(); + this.transaction = persistRequest.transaction(); this.logLevelSql = transaction.isLogSql(); if (logLevelSql) { this.bindLog = new StringBuilder(50); @@ -103,7 +103,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { } catch (OptimisticLockException e) { // add the SQL and bind values to error message String m = e.getMessage() + " sql[" + sql + "] bind[" + bindLog + "]"; - persistRequest.getTransaction().logSummary("OptimisticLockException:" + m); + persistRequest.transaction().logSummary("OptimisticLockException:" + m); throw new OptimisticLockException(m, null, e.getEntity()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 113e6ff39..f981679e6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -67,7 +67,7 @@ public final class InsertHandler extends DmlHandler { } } - SpiTransaction t = persistRequest.getTransaction(); + SpiTransaction t = persistRequest.transaction(); // get the appropriate sql sql = meta.getSql(withId, persistRequest.isPublish()); PreparedStatement pstmt; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java index 49f6e1bfb..01c6e3ce9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -38,7 +38,7 @@ public final class UpdateHandler extends DmlHandler { } sql = updatePlan.getSql(); - SpiTransaction t = persistRequest.getTransaction(); + SpiTransaction t = persistRequest.transaction(); PreparedStatement pstmt; if (persistRequest.isBatched()) { pstmt = getPstmtBatch(t, sql, persistRequest, false); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index e9d2281d0..54cb75c8a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -184,7 +184,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi this.request = request; this.audit = request.isAuditReads(); this.queryPlan = queryPlan; - this.query = request.getQuery(); + this.query = request.query(); this.queryMode = query.getMode(); this.lazyLoadManyProperty = query.getLazyLoadMany(); this.readOnly = request.isReadOnly(); @@ -216,7 +216,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi if (request.isFindById()) { return null; } else { - SpiQuery.Type manyType = request.getQuery().getType(); + SpiQuery.Type manyType = request.query().getType(); if (manyType == null) { // subQuery compiled for InQueryExpression return null; @@ -306,7 +306,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi // cancelled before we started query.checkCancelled(); startNano = System.nanoTime(); - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); profileOffset = t.profileOffset(); if (query.isRawSql()) { ResultSet suppliedResultSet = query.getRawSql().getResultSet(); @@ -630,7 +630,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi } public SpiTransaction getTransaction() { - return request.getTransaction(); + return request.transaction(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 09b465893..ca600f46c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -88,7 +88,7 @@ final class CQueryBuilder { * Build the delete query. */ CQueryUpdate buildUpdateQuery(boolean deleteRequest, OrmQueryRequest request) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); String rootTableAlias = query.getAlias(); query.setupForDeleteOrUpdate(); @@ -117,7 +117,7 @@ final class CQueryBuilder { private String buildDeleteSql(OrmQueryRequest request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) { String alias = alias(rootTableAlias); - if (sqlTree.noJoins() && !request.getQuery().hasMaxRowsOrFirstRow()) { + if (sqlTree.noJoins() && !request.query().hasMaxRowsOrFirstRow()) { if (dbPlatform.isSupportsDeleteTableAlias()) { // delete from table ... return aliasReplace(buildSqlDelete("delete", request, predicates, sqlTree).getSql(), alias); @@ -177,7 +177,7 @@ final class CQueryBuilder { } CQueryFetchSingleAttribute buildFetchAttributeQuery(OrmQueryRequest request) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); query.setSingleAttribute(); if (!query.isIncludeSoftDeletes()) { BeanDescriptor desc = request.getBeanDescriptor(); @@ -208,7 +208,7 @@ final class CQueryBuilder { * Build the find ids query. */ CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest request) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); query.setSelectId(); BeanDescriptor desc = request.getBeanDescriptor(); if (!query.isIncludeSoftDeletes() && desc.isSoftDelete()) { @@ -235,7 +235,7 @@ final class CQueryBuilder { * Build the row count query. */ CQueryRowCount buildRowCountQuery(OrmQueryRequest request) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); // always set the order by to null for row count query query.setOrder(null); query.setFirstRow(0); @@ -340,7 +340,7 @@ final class CQueryBuilder { predicates.prepare(true); // Build the tree structure that represents the query. - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); SqlTree sqlTree = createSqlTree(request, predicates); if (query.isAsOfQuery()) { @@ -401,7 +401,7 @@ final class CQueryBuilder { * Create the SqlTree by reading the ResultSetMetaData and mapping table/columns to bean property paths. */ private SqlTree createNativeSqlTree(OrmQueryRequest request, CQueryPredicates predicates) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); // parse named parameters returning the final sql to execute String sql = predicates.parseBindParams(query.getNativeSql()); if (query.hasMaxRowsOrFirstRow()) { @@ -409,7 +409,7 @@ final class CQueryBuilder { } query.setGeneratedSql(sql); - Connection connection = request.getTransaction().getConnection(); + Connection connection = request.transaction().getConnection(); BeanDescriptor desc = request.getBeanDescriptor(); try { @@ -446,7 +446,7 @@ final class CQueryBuilder { private SqlTree createRawSqlSqlTree(OrmQueryRequest request, CQueryPredicates predicates) { BeanDescriptor descriptor = request.getBeanDescriptor(); - ColumnMapping columnMapping = request.getQuery().getRawSql().getColumnMapping(); + ColumnMapping columnMapping = request.query().getRawSql().getColumnMapping(); PathProperties pathProps = new PathProperties(); // convert list of columns into (tree like) PathProperties @@ -523,7 +523,7 @@ final class CQueryBuilder { * Return the SQL response with row limiting (when not an update statement). */ private SqlLimitResponse buildSql(String selectClause, OrmQueryRequest request, CQueryPredicates predicates, SqlTree select) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); if (query.isNativeSql()) { return new SqlLimitResponse(query.getGeneratedSql()); } @@ -562,7 +562,7 @@ final class CQueryBuilder { private BuildReq(String selectClause, OrmQueryRequest request, CQueryPredicates predicates, SqlTree select, boolean updateStatement) { this.selectClause = selectClause; this.request = request; - this.query = request.getQuery(); + this.query = request.query(); this.predicates = predicates; this.select = select; this.updateStatement = updateStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index d3b4e7ca6..dffcc61b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -33,7 +33,7 @@ final class CQueryBuilderRawSql { if (!rsql.isParsed()) { String sql = rsql.getUnparsedSql(); - BindParams bindParams = request.getQuery().getBindParams(); + BindParams bindParams = request.query().getBindParams(); if (bindParams != null && bindParams.requiresNamedParamsPrepare()) { // convert named parameters into positioned parameters sql = BindParamsParser.parse(bindParams, sql); @@ -46,7 +46,7 @@ final class CQueryBuilderRawSql { // build the actual sql String String sql = buildMainQuery(orderBy, request, predicates, rsql); - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); if (query.hasMaxRowsOrFirstRow() && sqlLimiter != null) { // wrap with a limit offset or ROW_NUMBER() etc return sqlLimiter.limit(new OrmQueryLimitRequest(sql, orderBy, query, dbPlatform, rsql.isDistinct() || query.isDistinct())); @@ -66,7 +66,7 @@ final class CQueryBuilderRawSql { sb.append(" "); String s = sql.getPreWhere(); - BindParams bindParams = request.getQuery().getBindParams(); + BindParams bindParams = request.query().getBindParams(); if (bindParams != null && bindParams.requiresNamedParamsPrepare()) { // convert named parameters into positioned parameters // Named Parameters only allowed prior to dynamic where @@ -77,7 +77,7 @@ final class CQueryBuilderRawSql { sb.append(" "); String dynamicWhere = null; - if (request.getQuery().getId() != null) { + if (request.query().getId() != null) { // need to convert this as well. This avoids the // assumption that id has its proper dbColumn assigned // which may change if using multiple raw sql statements diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index b76d0b4e9..0e748402d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -105,13 +105,13 @@ public final class CQueryEngine { logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros()); } if (request.isLogSummary()) { - request.getTransaction().logSummary(rcQuery.getSummary()); + request.transaction().logSummary(rcQuery.getSummary()); } if (request.isQueryCachePut()) { request.addDependentTables(rcQuery.getDependentTables()); list = Collections.unmodifiableList(list); request.putToQueryCache(list); - if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) { + if (Boolean.FALSE.equals(request.query().isReadOnly())) { list = new ArrayList<>(list); } } @@ -125,7 +125,7 @@ public final class CQueryEngine { * Translate the SQLException into a PersistenceException. */ PersistenceException translate(OrmQueryRequest request, String bindLog, String sql, SQLException e) { - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); if (t.isLogSummary()) { // log the error to the transaction log String msg = "ERROR executing query, bindLog[" + bindLog + "] error[" + StringHelper.removeNewLines(e.getMessage()) + "]"; @@ -163,10 +163,10 @@ public final class CQueryEngine { logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros()); } if (request.isLogSummary()) { - request.getTransaction().logSummary(rcQuery.getSummary()); + request.transaction().logSummary(rcQuery.getSummary()); } - if (request.getQuery().isFutureFetch()) { - request.getTransaction().end(); + if (request.query().isFutureFetch()) { + request.transaction().end(); } if (request.isQueryCachePut()) { request.addDependentTables(rcQuery.getDependentTables()); @@ -201,7 +201,7 @@ public final class CQueryEngine { int iterateBufferSize = request.getSecondaryQueriesMinBatchSize(); if (iterateBufferSize < 1) { // not set on query joins so check if batch size set on query itself - int queryBatch = request.getQuery().getLazyLoadBatchSize(); + int queryBatch = request.query().getLazyLoadBatchSize(); if (queryBatch > 0) { iterateBufferSize = queryBatch; } else { @@ -235,7 +235,7 @@ public final class CQueryEngine { * Execute the find versions query returning version beans. */ public List> findVersions(OrmQueryRequest request) { - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); String sysPeriodLower = getSysPeriodLower(query); if (query.isVersionsBetween() && !historySupport.isStandardsBased()) { query.where().lt(sysPeriodLower, query.getVersionEnd()); @@ -417,7 +417,7 @@ public final class CQueryEngine { * Log the FindById summary to the transaction log. */ private void logFindBeanSummary(CQuery q) { - SpiQuery query = q.getQueryRequest().getQuery(); + SpiQuery query = q.getQueryRequest().query(); String loadMode = query.getLoadMode(); String loadDesc = query.getLoadDescription(); String lazyLoadProp = query.getLazyLoadProperty(); @@ -460,7 +460,7 @@ public final class CQueryEngine { * Log the FindMany to the transaction log. */ private void logFindManySummary(CQuery q) { - SpiQuery query = q.getQueryRequest().getQuery(); + SpiQuery query = q.getQueryRequest().query(); String loadMode = query.getLoadMode(); String loadDesc = query.getLoadDescription(); String lazyLoadProp = query.getLazyLoadProperty(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 41f9e7f4d..daf6d7c30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -50,7 +50,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca CQueryFetchSingleAttribute(OrmQueryRequest request, CQueryPredicates predicates, CQueryPlan queryPlan, boolean containsCounts) { this.request = request; this.queryPlan = queryPlan; - this.query = request.getQuery(); + this.query = request.query(); this.sql = queryPlan.getSql(); this.desc = request.getBeanDescriptor(); this.predicates = predicates; @@ -105,7 +105,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca } private SpiTransaction getTransaction() { - return request.getTransaction(); + return request.transaction(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index aef2c1164..8160be906 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -89,7 +89,7 @@ public class CQueryPlan implements SpiQueryPlan { this.dataTimeZone = server.getDataTimeZone(); this.beanType = request.getBeanDescriptor().getBeanType(); this.planKey = request.getQueryPlanKey(); - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); @@ -113,7 +113,7 @@ public class CQueryPlan implements SpiQueryPlan { this.server = request.getServer(); this.dataTimeZone = server.getDataTimeZone(); this.beanType = request.getBeanDescriptor().getBeanType(); - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java index a23114bf2..f35702ee1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java @@ -28,7 +28,7 @@ final class CQueryPlanRawSql extends CQueryPlan { private int[] createIndexPositions(OrmQueryRequest request, SqlTree sqlTree) { List chain = sqlTree.buildRawSqlSelectChain(); - ColumnMapping columnMapping = request.getQuery().getRawSql().getColumnMapping(); + ColumnMapping columnMapping = request.query().getRawSql().getColumnMapping(); int[] indexPositions = new int[chain.size()]; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index 94d4800f2..54c94da52 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -88,7 +88,7 @@ public final class CQueryPredicates { CQueryPredicates(Binder binder, OrmQueryRequest request) { this.binder = binder; this.request = request; - this.query = request.getQuery(); + this.query = request.query(); this.bindParams = query.getBindParams(); this.idValue = query.getId(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index ccfbb3ce6..ac0f9c6f2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -41,7 +41,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer CQueryRowCount(CQueryPlan queryPlan, OrmQueryRequest request, CQueryPredicates predicates) { this.queryPlan = queryPlan; this.request = request; - this.query = request.getQuery(); + this.query = request.query(); this.sql = queryPlan.getSql(); this.desc = request.getBeanDescriptor(); this.predicates = predicates; @@ -120,7 +120,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer } private SpiTransaction getTransaction() { - return request.getTransaction(); + return request.transaction(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index e35615a0c..2e4e1a871 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -37,7 +37,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery CQueryUpdate(OrmQueryRequest request, CQueryPredicates predicates, CQueryPlan queryPlan) { this.request = request; this.queryPlan = queryPlan; - this.query = request.getQuery(); + this.query = request.query(); this.sql = queryPlan.getSql(); this.desc = request.getBeanDescriptor(); this.predicates = predicates; @@ -98,7 +98,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery } private SpiTransaction getTransaction() { - return request.getTransaction(); + return request.transaction(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index 84ea2d737..1b95fc55c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -53,7 +53,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { */ private void flushJdbcBatchOnQuery(OrmQueryRequest request) { - SpiTransaction t = request.getTransaction(); + SpiTransaction t = request.transaction(); if (t.isFlushOnQuery()) { // before we perform a query, we need to flush any // previous persist requests that are queued/batched. @@ -131,7 +131,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { result = queryEngine.findMany(request); } - SpiQuery query = request.getQuery(); + SpiQuery query = request.query(); if (result != null && request.isBeanCachePutMany()) { // load the individual beans into the bean cache diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index c3e3fb736..e127726de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -61,7 +61,7 @@ public final class SqlTreeBuilder { this.rawSql = true; this.desc = request.getBeanDescriptor(); this.rawNoId = rawNoId; - this.disableLazyLoad = request.getQuery().isDisableLazyLoading(); + this.disableLazyLoad = request.query().isDisableLazyLoading(); this.query = null; this.subQuery = false; this.distinctOnPlatform = false; @@ -83,7 +83,7 @@ public final class SqlTreeBuilder { this.rawSql = false; this.rawNoId = false; this.desc = request.getBeanDescriptor(); - this.query = request.getQuery(); + this.query = request.query(); this.temporalMode = SpiQuery.TemporalMode.of(query); this.disableLazyLoad = query.isDisableLazyLoading(); this.subQuery = Type.SQ_EXISTS == query.getType() diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java index bcc91909f..5f14a8e2c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java @@ -28,7 +28,7 @@ public final class BulkEventListenerMap { } public void process(BulkTableEvent event) { - Entry entry = map.get(event.getTableName()); + Entry entry = map.get(event.tableName()); if (entry != null) { entry.process(event); } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java index 004047976..c9951d67e 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java @@ -13,7 +13,7 @@ public interface DocQueryRequest extends DocQueryContext { /** * Return the transaction for this request (can be null for document store only queries). */ - SpiTransaction getTransaction(); + SpiTransaction transaction(); /** * Set the (document store) transaction to use for this query. @@ -23,7 +23,7 @@ public interface DocQueryRequest extends DocQueryContext { /** * Return the query for this request. */ - SpiQuery getQuery(); + SpiQuery query(); /** * Create JsonReadOptions taking into account persistence context and lazy loading support. diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java index 2d2625067..3cbb0b3ba 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java @@ -168,7 +168,7 @@ public class BeanPersistControllerTest { public boolean preUpdate(BeanPersistRequest request) { methodsCalled.add("preUpdate"); - Object bean = request.getBean(); + Object bean = request.bean(); if (bean instanceof UTDetail) { UTDetail detail = (UTDetail)bean; // invoke lazy loading ... which invoke the flush of the jdbc batch diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 1a5484f16..160bb6fbb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -23,7 +23,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { } OrmQueryDetail detail(Query query) { - return queryRequest(query).getQuery().getDetail(); + return queryRequest(query).query().getDetail(); } @Test @@ -120,7 +120,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "details"); } @@ -134,7 +134,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .where().eq("customer.name", "rob").query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("details"); } @@ -148,7 +148,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -162,7 +162,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -176,7 +176,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("details", FetchConfig.ofLazy()); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -190,7 +190,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetchLazy("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -205,7 +205,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("details.product"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -220,7 +220,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -235,7 +235,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -250,7 +250,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("customer.contacts"); // second many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -266,7 +266,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -282,7 +282,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -299,7 +299,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -316,7 +316,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); } @@ -333,7 +333,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.getQuery().getDetail(); + OrmQueryDetail detail = queryRequest.query().getDetail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index c11ed25b5..ef44734b8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -67,12 +67,12 @@ public abstract class BaseExpressionTest extends BaseTestCase { } @Override - public Transaction getTransaction() { + public Transaction transaction() { return null; } @Override - public Query getQuery() { + public Query query() { return null; } diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 1eafa2328..0c16edc7d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -33,13 +33,13 @@ public class TestDbJson_Jackson3 extends BaseTestCase { @Override public boolean preInsert(BeanPersistRequest request) { - updatedValues = request.getUpdatedValues(); + updatedValues = request.updatedValues(); return true; } @Override public boolean preUpdate(BeanPersistRequest request) { - updatedValues = request.getUpdatedValues(); + updatedValues = request.updatedValues(); return true; } } diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java b/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java index 6a4ccd346..d32597d9f 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java +++ b/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java @@ -21,7 +21,7 @@ public class SimpleTOneQueryAdapter implements BeanQueryAdapter { @Override public void preQuery(BeanQueryRequest request) { - Query query = request.getQuery(); + Query query = request.query(); switch (query.getQueryType()) { case DELETE: { diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java index 06018dcec..41b6fe141 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java +++ b/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java @@ -14,7 +14,7 @@ public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { @Override public boolean preInsert(BeanPersistRequest request) { - TWithPreInsert e = (TWithPreInsert) request.getBean(); + TWithPreInsert e = (TWithPreInsert) request.bean(); if (e.getName() == null) { e.setName("set on preInsert"); } @@ -24,7 +24,7 @@ public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { @Override public boolean preUpdate(BeanPersistRequest request) { - TWithPreInsert b = (TWithPreInsert) request.getBean(); + TWithPreInsert b = (TWithPreInsert) request.bean(); System.out.println("preUpdate - title is: " + b.getTitle()); if (b.getTitle() == null) { b.setTitle("set on preUpdate"); diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java b/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java index a658f7cf1..01ceb7972 100644 --- a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java +++ b/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java @@ -18,8 +18,8 @@ public class MPrinterListener extends BeanPersistAdapter { public boolean preUpdate(BeanPersistRequest request) { logger.info("preUpdate ..."); - logger.info("preUpdate ..." + request.getUpdatedValues()); - request.getUpdatedProperties(); + logger.info("preUpdate ..." + request.updatedValues()); + request.updatedProperties(); return super.preUpdate(request); } } From 5ea5b5588246c7bf66cad93209ef59a1db4aed89 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 19:04:48 +1200 Subject: [PATCH 042/102] #2353 Refactor rename internal methods for BeanRequest --- .../server/core/BeanRequest.java | 42 ++++++++----------- .../server/core/OrmQueryRequest.java | 20 ++++----- .../server/core/PersistRequest.java | 9 ++-- .../server/core/PersistRequestBean.java | 12 +++--- .../server/deploy/BeanDescriptor.java | 4 +- .../server/loadcontext/DLoadContext.java | 2 +- .../server/persist/BatchedBeanHolder.java | 4 +- .../server/persist/ExeCallableSql.java | 2 +- .../server/persist/SaveManyBase.java | 2 +- .../server/persist/dml/DmlHandler.java | 2 +- .../server/query/CQueryEngine.java | 28 ++++++------- .../query/CQueryFetchSingleAttribute.java | 2 +- .../server/query/CQueryPlan.java | 4 +- .../docstore/api/DocQueryRequest.java | 2 +- 14 files changed, 63 insertions(+), 72 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java index 0b57ce2c3..5a56719c5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -14,21 +14,13 @@ public abstract class BeanRequest { static final Logger log = LoggerFactory.getLogger(BeanRequest.class); - /** - * The server processing the request. - */ - protected final SpiEbeanServer ebeanServer; - - /** - * The transaction this is part of. - */ + protected final SpiEbeanServer server; protected SpiTransaction transaction; - protected boolean createdTransaction; - public BeanRequest(SpiEbeanServer ebeanServer, SpiTransaction t) { - this.ebeanServer = ebeanServer; - this.transaction = t; + public BeanRequest(SpiEbeanServer server, SpiTransaction transaction) { + this.server = server; + this.transaction = transaction; } /** @@ -44,10 +36,10 @@ public abstract class BeanRequest { if (transaction != null) { return false; } - transaction = ebeanServer.currentServerTransaction(); + transaction = server.currentServerTransaction(); if (transaction == null || !transaction.isActive()) { // create an implicit transaction to execute this query - transaction = ebeanServer.beginServerTransaction(); + transaction = server.beginServerTransaction(); createdTransaction = true; } return true; @@ -58,7 +50,7 @@ public abstract class BeanRequest { */ public void commitTransIfRequired() { if (createdTransaction) { - ebeanServer.commitTransaction(); + server.commitTransaction(); } } @@ -68,7 +60,7 @@ public abstract class BeanRequest { public void rollbackTransIfRequired() { if (createdTransaction) { try { - ebeanServer.endTransaction(); + server.endTransaction(); } catch (Exception e) { // Just log this and carry on. A previous exception has been // thrown and if this rollback throws exception it likely means @@ -83,7 +75,7 @@ public abstract class BeanRequest { */ public void clearTransIfRequired() { if (createdTransaction) { - ebeanServer.clearServerTransaction(); + server.clearServerTransaction(); } } @@ -92,11 +84,11 @@ public abstract class BeanRequest { * BeanController and BeanFinder. */ public EbeanServer getEbeanServer() { - return ebeanServer; + return server; } - public SpiEbeanServer getServer() { - return ebeanServer; + public SpiEbeanServer server() { + return server; } /** @@ -109,28 +101,28 @@ public abstract class BeanRequest { /** * Set the transaction to use for this request. */ - public void setTransaction(SpiTransaction transaction) { + public void transaction(SpiTransaction transaction) { this.transaction = transaction; } /** * Return true if SQL should be logged for this transaction. */ - public boolean isLogSql() { + public boolean logSql() { return transaction.isLogSql(); } /** * Return true if SUMMARY information should be logged for this transaction. */ - public boolean isLogSummary() { + public boolean logSummary() { return transaction.isLogSummary(); } /** * Return the DataTimeZone to use. */ - public DataTimeZone getDataTimeZone() { - return ebeanServer.getDataTimeZone(); + public DataTimeZone dataTimeZone() { + return server.getDataTimeZone(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 5cbc7ae32..3fba544c6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -146,7 +146,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String getDBLikeClause(boolean rawLikeExpression) { - return ebeanServer.getDatabasePlatform().getLikeClause(rawLikeExpression); + return server.getDatabasePlatform().getLikeClause(rawLikeExpression); } /** @@ -154,7 +154,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String escapeLikeString(String value) { - return ebeanServer.getDatabasePlatform().escapeLikeString(value); + return server.getDatabasePlatform().escapeLikeString(value); } @Override @@ -271,11 +271,11 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery if (transaction == null) { if (query.getType().isUpdate()) { // bulk update or delete query - transaction = ebeanServer.beginServerTransaction(); + transaction = server.beginServerTransaction(); } else { // create an implicit transaction to execute this query // potentially using read-only DataSource with autoCommit - transaction = ebeanServer.createReadOnlyTransaction(query.getTenantId()); + transaction = server.createReadOnlyTransaction(query.getTenantId()); } createdTransaction = true; } @@ -343,7 +343,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery if (ctx != null) return ctx; // determine the scope (from the query and then server) - PersistenceContextScope scope = ebeanServer.getPersistenceContextScope(query); + PersistenceContextScope scope = server.getPersistenceContextScope(query); if (scope == PersistenceContextScope.QUERY || t == null) { return new DefaultPersistenceContext(); } @@ -365,7 +365,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery transaction.commit(); if (query.getType().isUpdate()) { // for implicit update/delete queries clear the thread local - ebeanServer.clearServerTransaction(); + server.clearServerTransaction(); } } } @@ -688,7 +688,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery public Object getFromQueryCache() { if (query.getUseQueryCache() == CacheMode.OFF || (transaction != null && transaction.isSkipCache()) - || ebeanServer.isDisableL2Cache()) { + || server.isDisableL2Cache()) { return null; } else { cacheKey = query.queryHash(); @@ -768,7 +768,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ public int getLazyLoadBatchSize() { int batchSize = query.getLazyLoadBatchSize(); - return (batchSize > 0) ? batchSize : ebeanServer.getLazyLoadBatchSize(); + return (batchSize > 0) ? batchSize : server.getLazyLoadBatchSize(); } /** @@ -806,7 +806,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Check for slow query event. */ public void slowQueryCheck(long executionTimeMicros, int rowCount) { - ebeanServer.slowQueryCheck(executionTimeMicros, rowCount, query); + server.slowQueryCheck(executionTimeMicros, rowCount, query); } public void setInlineCountDistinct() { @@ -830,6 +830,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return true if no MaxRows or use LIMIT in SQL update. */ public boolean isInlineSqlUpdateLimit() { - return query.getMaxRows() < 1 || ebeanServer.getDatabasePlatform().isInlineSqlUpdateLimit(); + return query.getMaxRows() < 1 || server.getDatabasePlatform().isInlineSqlUpdateLimit(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index af6ed1aeb..dddfc032c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -95,12 +95,12 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe } @Override - public boolean isLogSql() { + public boolean logSql() { return transaction.isLogSql(); } @Override - public boolean isLogSummary() { + public boolean logSummary() { return transaction.isLogSummary(); } @@ -149,10 +149,9 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe } /** - * Return the type of this request. One of INSERT, UPDATE, DELETE, UPDATESQL - * or CALLABLESQL. + * Return the type of this request. One of INSERT, UPDATE, DELETE, UPDATESQL or CALLABLESQL. */ - public Type getType() { + public Type type() { return type; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 038281833..17a2d1907 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -937,8 +937,8 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } addPostCommitListeners(); notifyCacheOnPostExecute(); - if (isLogSummary()) { - logSummary(); + if (logSummary()) { + logSummaryMessage(); } } @@ -985,7 +985,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } } - private void logSummary() { + private void logSummaryMessage() { String draft = (beanDescriptor.isDraftable() && !publish) ? " draft[true]" : ""; String name = beanDescriptor.getName(); switch (type) { @@ -1031,7 +1031,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Register the derived relationships to get executed later (on JDBC batch flush or commit). */ public void deferredRelationship(EntityBean assocBean, ImportedId importedId, EntityBean bean) { - transaction.registerDeferred(new PersistDeferredRelationship(ebeanServer, beanDescriptor, assocBean, importedId, bean)); + transaction.registerDeferred(new PersistDeferredRelationship(server, beanDescriptor, assocBean, importedId, bean)); } private void postInsert() { @@ -1175,7 +1175,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP requestUpdateAllLoadedProps = txnUpdateAll; } else { // if using batch use the server default setting - requestUpdateAllLoadedProps = isBatchThisRequest() && ebeanServer.isUpdateAllPropertiesInBatch(); + requestUpdateAllLoadedProps = isBatchThisRequest() && server.isUpdateAllPropertiesInBatch(); } return requestUpdateAllLoadedProps; } @@ -1313,7 +1313,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ public long now() { if (now == 0) { - now = ebeanServer.clockNow(); + now = server.clockNow(); } return now; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index f9f8fa97d..42b5aebe6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -777,7 +777,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return true if this request should be included in the change log. */ public BeanChange getChangeLogBean(PersistRequestBean request) { - switch (request.getType()) { + switch (request.type()) { case INSERT: return changeLogFilter.includeInsert(request) ? insertBeanChange(request) : null; case UPDATE: @@ -786,7 +786,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { case DELETE: return changeLogFilter.includeDelete(request) ? deleteBeanChange(request) : null; default: - throw new IllegalStateException("Unhandled request type " + request.getType()); + throw new IllegalStateException("Unhandled request type " + request.type()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index b7460a69c..b42049e87 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -93,7 +93,7 @@ public final class DLoadContext implements LoadContext { public DLoadContext(OrmQueryRequest request, SpiQuerySecondary secondaryQueries) { this.tenantId = request.getTenantId(); this.persistenceContext = request.getPersistenceContext(); - this.ebeanServer = request.getServer(); + this.ebeanServer = request.server(); this.defaultBatchSize = request.getLazyLoadBatchSize(); this.rootDescriptor = request.getBeanDescriptor(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java index db6d85a35..06bc8a1d1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -127,7 +127,7 @@ final class BatchedBeanHolder { public int append(PersistRequestBean request) { empty = false; request.setBatched(); - switch (request.getType()) { + switch (request.type()) { case INSERT: if (inserts == null) { inserts = new ArrayList<>(); @@ -151,7 +151,7 @@ final class BatchedBeanHolder { return deletes.size(); default: - throw new RuntimeException("Invalid type code " + request.getType()); + throw new RuntimeException("Invalid type code " + request.type()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index 5728df639..f4cbacb42 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -64,7 +64,7 @@ final class ExeCallableSql { // process named parameters if required sql = BindParamsParser.parse(bindParams, sql); - boolean logSql = request.isLogSql(); + boolean logSql = request.logSql(); CallableStatement cstmt; if (batchThisRequest) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java index b14311b0b..9353ebd31 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java @@ -30,7 +30,7 @@ abstract class SaveManyBase implements SaveMany { SaveManyBase(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany many, EntityBean parentBean, PersistRequestBean request) { this.persister = persister; this.request = request; - this.server = request.getServer(); + this.server = request.server(); this.many = many; this.parentBean = parentBean; this.transaction = request.transaction(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 323f8c369..7785223c6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -68,7 +68,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { * Bind to the statement returning the DataBind. */ DataBind bind(PreparedStatement stmt) { - return new DataBind(persistRequest.getDataTimeZone(), stmt, transaction.getInternalConnection()); + return new DataBind(persistRequest.dataTimeZone(), stmt, transaction.getInternalConnection()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 0e748402d..1380de179 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -79,7 +79,7 @@ public final class CQueryEngine { private int executeUpdate(OrmQueryRequest request, CQueryUpdate query) { try { int rows = query.execute(); - if (request.isLogSql()) { + if (request.logSql()) { request.logSql(Str.add(query.getGeneratedSql(), "; --bind(", query.getBindLog(), ") --micros(", query.micros() + ") --rows(", rows + ")")); } return rows; @@ -101,10 +101,10 @@ public final class CQueryEngine { private List findAttributeList(OrmQueryRequest request, CQueryFetchSingleAttribute rcQuery) { try { List list = (List) rcQuery.findList(); - if (request.isLogSql()) { + if (request.logSql()) { logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros()); } - if (request.isLogSummary()) { + if (request.logSummary()) { request.transaction().logSummary(rcQuery.getSummary()); } if (request.isQueryCachePut()) { @@ -159,10 +159,10 @@ public final class CQueryEngine { request.setCancelableQuery(rcQuery); try { int count = rcQuery.findCount(); - if (request.isLogSql()) { + if (request.logSql()) { logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros()); } - if (request.isLogSummary()) { + if (request.logSummary()) { request.transaction().logSummary(rcQuery.getSummary()); } if (request.query().isFutureFetch()) { @@ -194,7 +194,7 @@ public final class CQueryEngine { logger.trace("Future fetch already cancelled"); return null; } - if (request.isLogSql()) { + if (request.logSql()) { logSql(cquery); } // first check batch sizes set on query joins @@ -210,7 +210,7 @@ public final class CQueryEngine { } QueryIterator readIterate = cquery.readIterate(iterateBufferSize, request); - if (request.isLogSummary()) { + if (request.logSummary()) { logFindManySummary(cquery); } if (request.isAuditReads()) { @@ -248,7 +248,7 @@ public final class CQueryEngine { request.setCancelableQuery(cquery); try { cquery.prepareBindExecuteQuery(); - if (request.isLogSql()) { + if (request.logSql()) { logSql(cquery); } List> versions = cquery.readVersions(); @@ -256,7 +256,7 @@ public final class CQueryEngine { // is not universally supported, not expect huge list here versions.sort(OrderVersionDesc.INSTANCE); deriveVersionDiffs(versions, request); - if (request.isLogSummary()) { + if (request.logSummary()) { logFindManySummary(cquery); } if (request.isAuditReads()) { @@ -324,7 +324,7 @@ public final class CQueryEngine { } } ResultSet resultSet = cquery.prepareResultSet(fwdOnly); - if (request.isLogSql()) { + if (request.logSql()) { logSql(cquery); } return new SpiResultSet(cquery.getPstmt(), resultSet); @@ -350,11 +350,11 @@ public final class CQueryEngine { logger.trace("Future fetch already cancelled"); return null; } - if (request.isLogSql()) { + if (request.logSql()) { logSql(cquery); } BeanCollection beanCollection = cquery.readCollection(); - if (request.isLogSummary()) { + if (request.logSummary()) { logFindManySummary(cquery); } if (request.isAuditReads()) { @@ -385,13 +385,13 @@ public final class CQueryEngine { request.setCancelableQuery(cquery); try { cquery.prepareBindExecuteQuery(); - if (request.isLogSql()) { + if (request.logSql()) { logSql(cquery); } if (cquery.readBean()) { bean = cquery.next(); } - if (request.isLogSummary()) { + if (request.logSummary()) { logFindBeanSummary(cquery); } if (request.isAuditReads()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index daf6d7c30..2f45f1b2e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -140,7 +140,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca } finally { lock.unlock(); } - dataReader = new RsetDataReader(request.getDataTimeZone(), pstmt.executeQuery()); + dataReader = new RsetDataReader(request.dataTimeZone(), pstmt.executeQuery()); query.checkCancelled(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 8160be906..c40fcf939 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -85,7 +85,7 @@ public class CQueryPlan implements SpiQueryPlan { * Create a query plan based on a OrmQueryRequest. */ CQueryPlan(OrmQueryRequest request, SqlLimitResponse sqlRes, SqlTree sqlTree, boolean rawSql, String logWhereSql) { - this.server = request.getServer(); + this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); this.beanType = request.getBeanDescriptor().getBeanType(); this.planKey = request.getQueryPlanKey(); @@ -110,7 +110,7 @@ public class CQueryPlan implements SpiQueryPlan { * Create a query plan for a raw sql query. */ CQueryPlan(OrmQueryRequest request, String sql, SqlTree sqlTree, String logWhereSql) { - this.server = request.getServer(); + this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); this.beanType = request.getBeanDescriptor().getBeanType(); SpiQuery query = request.query(); diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java index c9951d67e..d8548d1b2 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java @@ -18,7 +18,7 @@ public interface DocQueryRequest extends DocQueryContext { /** * Set the (document store) transaction to use for this query. */ - void setTransaction(SpiTransaction transaction); + void transaction(SpiTransaction transaction); /** * Return the query for this request. From 25b9b37ac0a3ce54b4e2c490a4d10f8be976b335 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 19:53:36 +1200 Subject: [PATCH 043/102] #2354 - Refactor internals - refactor rename methods in BeanRequest etc --- .../server/core/BeanRequest.java | 1 - .../server/core/DefaultServer.java | 6 +- .../server/core/OrmQueryRequest.java | 60 ++++--------- .../server/core/PersistRequest.java | 9 +- .../server/core/PersistRequestBean.java | 86 ++++--------------- .../core/PersistRequestCallableSql.java | 16 +--- .../server/core/PersistRequestOrmUpdate.java | 19 +--- .../server/core/PersistRequestUpdateSql.java | 11 +-- .../server/core/SpiOrmQueryRequest.java | 8 +- .../deploy/BeanCollectionHelpFactory.java | 2 +- .../server/deploy/BeanDescriptor.java | 10 +-- .../deploy/BeanDescriptorCacheHelp.java | 8 +- .../expression/DefaultExpressionRequest.java | 4 +- .../server/loadcontext/DLoadContext.java | 8 +- .../server/persist/BatchControl.java | 4 +- .../server/persist/DefaultPersister.java | 24 +++--- .../persist/DeleteUnloadedForeignKeys.java | 4 +- .../server/persist/ExeCallableSql.java | 2 +- .../server/persist/ExeOrmUpdate.java | 8 +- .../server/persist/ExeUpdateSql.java | 2 +- .../server/persist/SaveManyBase.java | 2 +- .../server/persist/SaveManyBeans.java | 6 +- .../persist/SaveManyElementCollection.java | 2 +- .../persist/SaveManyElementCollectionMap.java | 2 +- .../server/persist/dml/DeleteMeta.java | 10 +-- .../persist/dml/DocStoreBeanPersister.java | 4 +- .../server/persist/dml/InsertHandler.java | 4 +- .../server/persist/dml/UpdateMeta.java | 12 +-- .../persist/dmlbind/BindableIdEmbedded.java | 2 +- .../persist/dmlbind/BindableOrderColumn.java | 2 +- .../dmlbind/BindableUnidirectional.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 12 +-- .../server/query/CQueryBuilder.java | 32 +++---- .../server/query/CQueryBuilderRawSql.java | 2 +- .../server/query/CQueryEngine.java | 4 +- .../query/CQueryFetchSingleAttribute.java | 2 +- .../server/query/CQueryPlan.java | 10 +-- .../server/query/CQueryPredicates.java | 10 +-- .../server/query/CQueryRowCount.java | 2 +- .../server/query/CQueryUpdate.java | 2 +- .../server/query/DefaultOrmQueryEngine.java | 8 +- .../server/query/SqlTreeBuilder.java | 6 +- .../support/DocStoreEmbeddedInvalidation.java | 2 +- ...ocStoreEmbeddedInvalidationProperties.java | 2 +- .../server/loadcontext/DLoadContextTest.java | 12 +-- 45 files changed, 164 insertions(+), 282 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java index 5a56719c5..bce3efb0c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -28,7 +28,6 @@ public abstract class BeanRequest { *

* A transaction may have been passed in or active in the thread local. If * not then create one implicitly to handle the request. - *

* * @return True if a transaction was set (from current or created). */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 4d97e5a41..265e0f5dd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1227,7 +1227,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { request.resetBeanCacheAutoMode(false); if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache - return request.getBeanCacheHitsAsMap(); + return request.beanCacheHitsAsMap(); } Object result = request.getFromQueryCache(); if (result != null) { @@ -1341,7 +1341,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (ids.isEmpty()) { return 0; } else { - return persister.deleteByIds(request.getBeanDescriptor(), ids, request.transaction(), false); + return persister.deleteByIds(request.descriptor(), ids, request.transaction(), false); } } } finally { @@ -1504,7 +1504,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { request.resetBeanCacheAutoMode(findOne); if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache - return request.getBeanCacheHits(); + return request.beanCacheHits(); } request.prepareQuery(); Object result = request.getFromQueryCache(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 3fba544c6..c2f3ad4c0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -60,38 +60,21 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery private static final Logger log = LoggerFactory.getLogger(OrmQueryRequest.class); private final BeanDescriptor beanDescriptor; - private final OrmQueryEngine queryEngine; - private final SpiQuery query; - private final BeanFindController finder; - private final Boolean readOnly; - private LoadContext loadContext; - private PersistenceContext persistenceContext; - private JsonReadOptions jsonRead; - private HashQuery cacheKey; - private CQueryPlanKey queryPlanKey; - private SpiQuerySecondary secondaryQueries; - private List cacheBeans; - private BeanPropertyAssocMany manyProperty; - private boolean inlineCountDistinct; - private Set dependentTables; - /** - * Create the InternalQueryRequest. - */ public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery query, SpiTransaction t) { super(server, t); this.beanDescriptor = query.getBeanDescriptor(); @@ -145,7 +128,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return the database platform like clause. */ @Override - public String getDBLikeClause(boolean rawLikeExpression) { + public String dbLikeClause(boolean rawLikeExpression) { return server.getDatabasePlatform().getLikeClause(rawLikeExpression); } @@ -171,9 +154,8 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery *

* If -1 is returned then NO secondary queries are registered and simple * iteration is fine. - *

*/ - public int getSecondaryQueriesMinBatchSize() { + public int secondaryQueriesMinBatchSize() { return loadContext.getSecondaryQueriesMinBatchSize(); } @@ -188,14 +170,14 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return the BeanDescriptor for the associated bean. */ @Override - public BeanDescriptor getBeanDescriptor() { + public BeanDescriptor descriptor() { return beanDescriptor; } /** * Return the graph context for this query. */ - public LoadContext getGraphContext() { + public LoadContext loadContext() { return loadContext; } @@ -244,7 +226,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return the PersistenceContext used for this request. */ - public PersistenceContext getPersistenceContext() { + public PersistenceContext persistenceContext() { return persistenceContext; } @@ -279,7 +261,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } createdTransaction = true; } - persistenceContext = getPersistenceContext(query, transaction); + persistenceContext = persistenceContext(query, transaction); loadContext = new DLoadContext(this, secondaryQueries); } @@ -305,7 +287,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public JsonReadOptions createJsonReadOptions() { - persistenceContext = getPersistenceContext(query, transaction); + persistenceContext = persistenceContext(query, transaction); if (query.getPersistenceContext() == null) { query.setPersistenceContext(persistenceContext); } @@ -336,7 +318,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Get the TransactionContext either explicitly set on the query or * transaction scoped. */ - private PersistenceContext getPersistenceContext(SpiQuery query, SpiTransaction t) { + private PersistenceContext persistenceContext(SpiQuery query, SpiTransaction t) { // check if there is already a persistence context set which is the case // when lazy loading or query joins are executed PersistenceContext ctx = query.getPersistenceContext(); @@ -504,7 +486,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return a bean specific finder if one has been set. */ - public BeanFindController getBeanFinder() { + public BeanFindController finder() { return finder; } @@ -524,7 +506,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return the many property that is fetched in the query or null if there is not one. */ - public BeanPropertyAssocMany getManyProperty() { + public BeanPropertyAssocMany manyProperty() { return manyProperty; } @@ -532,7 +514,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return a queryPlan for the current query if one exists. Returns null if no * query plan for this query exists. */ - public CQueryPlan getQueryPlan() { + public CQueryPlan queryPlan() { return beanDescriptor.getQueryPlan(queryPlanKey); } @@ -542,9 +524,8 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * This identifies the query plan for a given bean type. It effectively * matches a SQL statement with ? bind variables. A query plan can be reused * with just the bind variables changing. - *

*/ - public CQueryPlanKey getQueryPlanKey() { + public CQueryPlanKey queryPlanKey() { return queryPlanKey; } @@ -608,7 +589,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } @Override - public List getBeanCacheHits() { + public List beanCacheHits() { OrderBy orderBy = query.getOrderBy(); if (orderBy != null) { beanDescriptor.sort(cacheBeans, orderBy.toStringFormat()); @@ -617,7 +598,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } @Override - public Map getBeanCacheHitsAsMap() { + public Map beanCacheHitsAsMap() { OrderBy orderBy = query.getOrderBy(); if (orderBy != null) { beanDescriptor.sort(cacheBeans, orderBy.toStringFormat()); @@ -665,7 +646,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery if (!beanDescriptor.isNaturalKeyCaching()) { return false; } - NaturalKeyQueryData data = query.naturalKey(); if (data != null) { NaturalKeySet naturalKeySet = data.buildKeys(); @@ -693,13 +673,11 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } else { cacheKey = query.queryHash(); } - if (!query.getUseQueryCache().isGet()) { return null; } Object cached = beanDescriptor.queryCacheGet(cacheKey); - if (cached != null && isAuditReads() && readAuditQueryType()) { if (cached instanceof BeanCollection) { // raw sql can't use L2 cache so normal queries only in here @@ -711,7 +689,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery beanDescriptor.readAuditMany(queryPlanKey.getPartialKey(), "l2-query-cache", ids); } } - if (Boolean.FALSE.equals(query.isReadOnly())) { // return shallow copies if readonly is explicitly set to false if (cached instanceof BeanCollection) { @@ -750,7 +727,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } /** - * Set an Query object that owns the PreparedStatement that can be cancelled. + * Set a Query object that owns the PreparedStatement that can be cancelled. */ public void setCancelableQuery(CancelableQuery cancelableQuery) { query.setCancelableQuery(cancelableQuery); @@ -766,7 +743,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return the batch size for lazy loading on this bean query request. */ - public int getLazyLoadBatchSize() { + public int lazyLoadBatchSize() { int batchSize = query.getLazyLoadBatchSize(); return (batchSize > 0) ? batchSize : server.getLazyLoadBatchSize(); } @@ -775,7 +752,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return true if read auditing is on for this query request. *

* This means that read audit is on for this bean type and that query has not explicitly disabled it. - *

*/ public boolean isAuditReads() { return beanDescriptor.isReadAuditing() && !query.isDisableReadAudit(); @@ -784,7 +760,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return the base table alias for this query. */ - public String getBaseTableAlias() { + public String baseTableAlias() { return query.getAlias(beanDescriptor.getBaseTableAlias()); } @@ -798,7 +774,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery /** * Return the tenantId associated with this request. */ - public Object getTenantId() { + public Object tenantId() { return (transaction == null) ? null : transaction.getTenantId(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index dddfc032c..1eab09911 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -31,17 +31,10 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe } } - boolean persistCascade; - - /** - * One of INSERT, UPDATE, DELETE, UPDATESQL or CALLABLESQL. - */ protected Type type; - + boolean persistCascade; final PersistExecute persistExecute; - protected String label; - protected long startNanos; PersistRequest(SpiEbeanServer server, SpiTransaction t, PersistExecute persistExecute) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 17a2d1907..a5074ced4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -50,142 +50,94 @@ import java.util.Set; public final class PersistRequestBean extends PersistRequest implements BeanPersistRequest, DocStoreUpdate, PreGetterCallback, SpiProfileTransactionEvent { private final BeanManager beanManager; - private final BeanDescriptor beanDescriptor; - private final BeanPersistListener beanPersistListener; - - /** - * For per post insert update delete control. - */ private final BeanPersistController controller; - - /** - * The bean being persisted. - */ private final T bean; - private final EntityBean entityBean; - - /** - * The associated intercept. - */ private final EntityBeanIntercept intercept; - /** * The parent bean for unidirectional save. */ private final Object parentBean; - private final boolean dirty; - private final boolean publish; - private int flags; - private boolean saveRecurse; - private DocStoreMode docStoreMode; - private final ConcurrencyMode concurrencyMode; - /** * The unique id used for logging summary. */ private Object idValue; - /** * Hash value used to handle cascade delete both ways in a relationship. */ private Integer beanHash; - - /** - * Flag set if this is a stateless update. - */ private boolean statelessUpdate; - private boolean notifyCache; - /** * Flag used to detect when only many properties where updated via a cascade. Used to ensure * appropriate caches are updated in that case. */ private boolean updatedManysOnly; - /** * Element collection change as part of bean cache. */ private Map collectionChanges; - /** * Set true when the request includes cascade save to a many. */ private boolean updatedMany; - /** * Many properties that were cascade saved (and hence might need caches updated later). */ private List> updatedManys; - /** * Need to get and store the updated properties because the persist listener is notified * later on a different thread and the bean has been reset at that point. */ private Set updatedProperties; - /** * Flags indicating the dirty properties on the bean. */ private boolean[] dirtyProperties; - /** * Imported OneToOne orphan that needs to be deleted. */ private EntityBean orphanBean; - /** * Flag set when request is added to JDBC batch. */ private boolean batched; - /** * Flag set when batchOnCascade to avoid using batch on the top bean. */ private boolean skipBatchForTopLevel; - /** * Flag set when batch mode is turned on for a persist cascade. */ private boolean batchOnCascadeSet; - /** * Set for updates to determine if all loaded properties are included in the update. */ private boolean requestUpdateAllLoadedProps; - private long version; - private long now; - private long profileOffset; - /** * Flag set when request is added to JDBC batch registered as a "getter callback" to automatically flush batch. */ private boolean getterCallback; - private boolean pendingPostUpdateNotify; - /** * Set to true when post execute has occurred (so includes batch flush). */ private boolean postExecute; - /** * Set to true after many properties have been persisted (so includes element collections). */ private boolean complete; - /** * Many to many intersection table changes that are held for later batch processing. */ @@ -582,8 +534,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } /** - * Return true if this bean has been already been persisted (inserted or updated) in this - * transaction. + * Return true if this bean has been already been persisted (inserted or updated) in this transaction. */ public boolean isRegisteredBean() { return transaction.isRegisteredBean(bean); @@ -600,7 +551,6 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * The hash used to register the bean with the transaction. *

* Takes into account the class type and id value. - *

*/ private Integer getBeanHash() { if (beanHash == null) { @@ -631,7 +581,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the BeanDescriptor for the associated bean. */ - public BeanDescriptor getBeanDescriptor() { + public BeanDescriptor descriptor() { return beanDescriptor; } @@ -656,7 +606,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the concurrency mode used for this persist. */ - public ConcurrencyMode getConcurrencyMode() { + public ConcurrencyMode concurrencyMode() { return concurrencyMode; } @@ -667,7 +617,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Used to determine common persist requests for queueing and statement batching. *

*/ - public String getFullName() { + public String fullName() { return beanDescriptor.getFullName(); } @@ -679,14 +629,14 @@ public final class PersistRequestBean extends PersistRequest implements BeanP return bean; } - public EntityBean getEntityBean() { + public EntityBean entityBean() { return entityBean; } /** * Return the Id value for the bean. */ - public Object getBeanId() { + public Object beanId() { return beanDescriptor.getId(entityBean); } @@ -694,7 +644,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Create and return a new reference bean matching this beans Id value. */ public T createReference() { - return beanDescriptor.createRef(getBeanId(), null); + return beanDescriptor.createRef(beanId(), null); } /** @@ -739,14 +689,14 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the parent bean for cascading save with unidirectional relationship. */ - public Object getParentBean() { + public Object parentBean() { return parentBean; } /** * Return the intercept if there is one. */ - public EntityBeanIntercept getEntityBeanIntercept() { + public EntityBeanIntercept intercept() { return intercept; } @@ -854,7 +804,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Check for optimistic concurrency exception. */ @Override - public final void checkRowCount(int rowCount) { + public void checkRowCount(int rowCount) { if (rowCount != 1 && rowCount != Statement.SUCCESS_NO_INFO) { if (ConcurrencyMode.VERSION == concurrencyMode) { throw new OptimisticLockException("Data has changed. updated row count " + rowCount, null, bean); @@ -1074,7 +1024,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the list of updated many properties for L2 cache update (can be null). */ - public List> getUpdatedManyForL2Cache() { + public List> updatedManyForL2Cache() { return updatedManys; } @@ -1183,7 +1133,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the flags set on this persist request. */ - public int getFlags() { + public int flags() { return flags; } @@ -1197,7 +1147,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the key for an update persist request. */ - public String getUpdatePlanHash() { + public String updatePlanHash() { StringBuilder key; if (determineUpdateAllLoadedProperties()) { key = intercept.getLoadedPropertyKey(); @@ -1219,7 +1169,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the table to update depending if the request is a 'publish' one or normal. */ - public String getUpdateTable() { + public String updateTable() { return publish ? beanDescriptor.getBaseTable() : beanDescriptor.getDraftTable(); } @@ -1240,7 +1190,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP /** * Return the version in long form (if set). */ - public long getVersion() { + public long version() { return version; } @@ -1383,7 +1333,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP String key = beanDescriptor.cacheKey(idValue); Map changes = new LinkedHashMap<>(); - EntityBean bean = getEntityBean(); + EntityBean bean = entityBean(); boolean[] dirtyProperties = dirtyProperties(); if (dirtyProperties != null) { for (int i = 0; i < dirtyProperties.length; i++) { @@ -1405,7 +1355,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP // add element collection update changes.putAll(collectionChanges); } - changeSet.addBeanUpdate(beanDescriptor, key, changes, updateNaturalKey, getVersion()); + changeSet.addBeanUpdate(beanDescriptor, key, changes, updateNaturalKey, version()); } } @@ -1419,7 +1369,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } } - public EntityBean getImportedOrphanForRemoval() { + public EntityBean importedOrphanForRemoval() { return orphanBean; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java index 806691f5f..1edabf5bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java @@ -19,20 +19,15 @@ import java.util.List; public final class PersistRequestCallableSql extends PersistRequest { private final SpiCallableSql callableSql; - private int rowCount; - private String bindLog; - private CallableStatement cstmt; - private BindParams bindParam; /** * Create. */ public PersistRequestCallableSql(SpiEbeanServer server, CallableSql cs, SpiTransaction t, PersistExecute persistExecute) { - super(server, t, persistExecute, cs.getLabel()); this.type = PersistRequest.Type.CALLABLESQL; this.callableSql = (SpiCallableSql) cs; @@ -56,7 +51,7 @@ public final class PersistRequestCallableSql extends PersistRequest { /** * Return the CallableSql. */ - public SpiCallableSql getCallableSql() { + public SpiCallableSql callableSql() { return callableSql; } @@ -97,13 +92,11 @@ public final class PersistRequestCallableSql extends PersistRequest { // register table modifications with the transaction event TransactionEventTable tableEvents = callableSql.getTransactionEventTable(); - if (tableEvents != null && !tableEvents.isEmpty()) { transaction.getEvent().add(tableEvents); } else { transaction.markNotQueryOnly(); } - } /** @@ -120,7 +113,6 @@ public final class PersistRequestCallableSql extends PersistRequest { * Execute the statement in normal non batch mode. */ public int executeUpdate() throws SQLException { - // check to see if the execution has been overridden // only works in non-batch mode if (callableSql.executeOverride(cstmt)) { @@ -129,20 +121,15 @@ public final class PersistRequestCallableSql extends PersistRequest { // rowCount = callableSql.getRowCount(); // return rowCount; } - rowCount = cstmt.executeUpdate(); - // only read in non-batch mode readOutParams(); - return rowCount; } private void readOutParams() throws SQLException { - List list = bindParam.positionedParameters(); int pos = 0; - for (Param param : list) { pos++; if (param.isOutParam()) { @@ -151,5 +138,4 @@ public final class PersistRequestCallableSql extends PersistRequest { } } } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index 807feadd8..0ada82876 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java @@ -14,19 +14,11 @@ import io.ebeaninternal.server.persist.PersistExecute; public final class PersistRequestOrmUpdate extends PersistRequest { private final BeanDescriptor beanDescriptor; - private final SpiUpdate ormUpdate; - private int rowCount; - private String bindLog; - /** - * Create. - */ - public PersistRequestOrmUpdate(SpiEbeanServer server, BeanManager mgr, SpiUpdate ormUpdate, - SpiTransaction t, PersistExecute persistExecute) { - + public PersistRequestOrmUpdate(SpiEbeanServer server, BeanManager mgr, SpiUpdate ormUpdate, SpiTransaction t, PersistExecute persistExecute) { super(server, t, persistExecute, ormUpdate.getLabel()); this.beanDescriptor = mgr.getBeanDescriptor(); this.ormUpdate = ormUpdate; @@ -37,7 +29,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest { profileBase(EVT_ORMUPDATE, offset, beanDescriptor.getName(), flushCount); } - public BeanDescriptor getBeanDescriptor() { + public BeanDescriptor descriptor() { return beanDescriptor; } @@ -51,11 +43,10 @@ public final class PersistRequestOrmUpdate extends PersistRequest { return executeStatement(); } - /** * Return the UpdateSql. */ - public SpiUpdate getOrmUpdate() { + public SpiUpdate ormUpdate() { return ormUpdate; } @@ -91,14 +82,11 @@ public final class PersistRequestOrmUpdate extends PersistRequest { } OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType(); String tableName = ormUpdate.getBaseTable(); - if (transaction.isLogSummary()) { String m = ormUpdateType + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]"; transaction.logSummary(m); } - if (ormUpdate.isNotifyCache()) { - // add the modification info to the TransactionEvent // this is used to invalidate cached objects etc switch (ormUpdateType) { @@ -116,5 +104,4 @@ public final class PersistRequestOrmUpdate extends PersistRequest { } } } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index ae16bbd4b..63f31434a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -18,25 +18,17 @@ public final class PersistRequestUpdateSql extends PersistRequest { } private final SpiSqlUpdate updateSql; - private int rowCount; - private String bindLog; - private SqlType sqlType; - private String tableName; - private boolean addBatch; - private final boolean forceNoBatch; - private boolean batchThisRequest; private boolean flushQueue; public PersistRequestUpdateSql(SpiEbeanServer server, SpiSqlUpdate sqlUpdate, SpiTransaction t, PersistExecute persistExecute, boolean forceNoBatch) { - super(server, t, persistExecute, sqlUpdate.getLabel()); this.type = Type.UPDATESQL; this.updateSql = sqlUpdate; @@ -105,7 +97,7 @@ public final class PersistRequestUpdateSql extends PersistRequest { /** * Return the UpdateSql. */ - public SpiSqlUpdate getUpdateSql() { + public SpiSqlUpdate updateSql() { return updateSql; } @@ -171,7 +163,6 @@ public final class PersistRequestUpdateSql extends PersistRequest { if (transaction.isLogSql() && !batchThisRequest) { transaction.logSql(Str.add(TrimLogSql.trim(updateSql.getGeneratedSql()), "; -- bind(", bindLog, ") rows(", String.valueOf(rowCount), ")")); } - if (updateSql.isAutoTableMod()) { // add the modification info to the TransactionEvent // this is used to invalidate cached objects etc diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index ea59c48da..3c7139476 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -27,7 +27,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ /** * Return the associated BeanDescriptor. */ - BeanDescriptor getBeanDescriptor(); + BeanDescriptor descriptor(); /** * Prepare the query for execution. @@ -145,12 +145,12 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ /** * Return the bean cache hits (when all hits / no misses). */ - List getBeanCacheHits(); + List beanCacheHits(); /** * Return the bean cache hits for findMap (when all hits / no misses). */ - Map getBeanCacheHitsAsMap(); + Map beanCacheHitsAsMap(); /** * Reset Bean cache mode AUTO - require explicit setting for bean cache use with findList(). @@ -160,7 +160,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ /** * Return the Database platform like clause. */ - String getDBLikeClause(boolean rawLikeExpression); + String dbLikeClause(boolean rawLikeExpression); /** * Escapes a string to use it as exact match in Like clause. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index f4bf3a328..209767fc6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -44,7 +44,7 @@ public final class BeanCollectionHelpFactory { return SET_HELP; } else if (manyType == SpiQuery.Type.MAP) { - BeanDescriptor target = request.getBeanDescriptor(); + BeanDescriptor target = request.descriptor(); ElPropertyValue elProperty = target.getElGetValue(request.query().getMapKey()); return new BeanMapQueryHelp<>(elProperty); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 42b5aebe6..66610694b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -799,7 +799,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the bean change for a delete. */ private BeanChange deleteBeanChange(PersistRequestBean request) { - return beanChange(ChangeType.DELETE, request.getBeanId(), null, null); + return beanChange(ChangeType.DELETE, request.beanId(), null, null); } /** @@ -808,9 +808,9 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { private BeanChange updateBeanChange(PersistRequestBean request) { try { BeanChangeJson changeJson = new BeanChangeJson(this, request.isStatelessUpdate()); - request.getEntityBeanIntercept().addDirtyPropertyValues(changeJson); + request.intercept().addDirtyPropertyValues(changeJson); changeJson.flush(); - return beanChange(ChangeType.UPDATE, request.getBeanId(), changeJson.newJson(), changeJson.oldJson()); + return beanChange(ChangeType.UPDATE, request.beanId(), changeJson.newJson(), changeJson.oldJson()); } catch (RuntimeException e) { logger.error("Failed to write ChangeLog entry for update", e); return null; @@ -824,9 +824,9 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { try { StringWriter writer = new StringWriter(200); SpiJsonWriter jsonWriter = createJsonWriter(writer); - jsonWriteForInsert(jsonWriter, request.getEntityBean()); + jsonWriteForInsert(jsonWriter, request.entityBean()); jsonWriter.flush(); - return beanChange(ChangeType.INSERT, request.getBeanId(), writer.toString(), null); + return beanChange(ChangeType.INSERT, request.beanId(), writer.toString(), null); } catch (IOException e) { logger.error("Failed to write ChangeLog entry for insert", e); return null; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index d2c95d76c..6eceddca4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -803,7 +803,7 @@ final class BeanDescriptorCacheHelp { if (beanCache != null) { changeSet.addBeanRemove(desc, id); } - cacheDeleteImported(true, deleteRequest.getEntityBean(), changeSet); + cacheDeleteImported(true, deleteRequest.entityBean(), changeSet); } } @@ -815,7 +815,7 @@ final class BeanDescriptorCacheHelp { changeSet.addInvalidate(desc); } else { queryCacheClear(changeSet); - cacheDeleteImported(false, insertRequest.getEntityBean(), changeSet); + cacheDeleteImported(false, insertRequest.entityBean(), changeSet); changeSet.addBeanInsert(desc.getBaseTable()); } } @@ -839,10 +839,10 @@ final class BeanDescriptorCacheHelp { // query caching only return; } - List> manyCollections = updateRequest.getUpdatedManyForL2Cache(); + List> manyCollections = updateRequest.updatedManyForL2Cache(); if (manyCollections != null) { for (BeanPropertyAssocMany many : manyCollections) { - Object details = many.getValue(updateRequest.getEntityBean()); + Object details = many.getValue(updateRequest.entityBean()); CachedManyIds entry = createManyIds(many, details); if (entry != null) { changeSet.addManyPut(desc, many.getName(), id, entry); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java index 09ff401af..89273c230 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java @@ -28,7 +28,7 @@ public final class DefaultExpressionRequest implements SpiExpressionRequest { public DefaultExpressionRequest(SpiOrmQueryRequest queryRequest, DeployParser deployParser, Binder binder, SpiExpressionList expressionList) { this.queryRequest = queryRequest; - this.beanDescriptor = queryRequest.getBeanDescriptor(); + this.beanDescriptor = queryRequest.descriptor(); this.deployParser = deployParser; this.binder = binder; this.expressionList = expressionList; @@ -84,7 +84,7 @@ public final class DefaultExpressionRequest implements SpiExpressionRequest { @Override public void appendLike(boolean rawLikeExpression) { sql.append(" "); - sql.append(queryRequest.getDBLikeClause(rawLikeExpression)); + sql.append(queryRequest.dbLikeClause(rawLikeExpression)); sql.append(" "); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index b42049e87..3bfba1459 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -91,11 +91,11 @@ public final class DLoadContext implements LoadContext { } public DLoadContext(OrmQueryRequest request, SpiQuerySecondary secondaryQueries) { - this.tenantId = request.getTenantId(); - this.persistenceContext = request.getPersistenceContext(); + this.tenantId = request.tenantId(); + this.persistenceContext = request.persistenceContext(); this.ebeanServer = request.server(); - this.defaultBatchSize = request.getLazyLoadBatchSize(); - this.rootDescriptor = request.getBeanDescriptor(); + this.defaultBatchSize = request.lazyLoadBatchSize(); + this.rootDescriptor = request.descriptor(); SpiQuery query = request.query(); this.useDocStore = query.isUseDocStore(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java index f276bb331..c2a2c834c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java @@ -181,7 +181,7 @@ public final class BatchControl { * Add the request to the batch and return true if we should flush. */ private boolean addToBatch(PersistRequestBean request) { - Object alreadyInBatch = persistedBeans.put(request.getEntityBean(), DUMMY); + Object alreadyInBatch = persistedBeans.put(request.entityBean(), DUMMY); if (alreadyInBatch != null) { // special case where the same bean instance has already been // added to the batch (doesn't really occur with non-batching @@ -345,7 +345,7 @@ public final class BatchControl { private BatchedBeanHolder getBeanHolder(PersistRequestBean request) { int depth = transaction.depth(); - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); // batching by bean type AND depth String key = desc.rootName() + ":" + depth; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 5270ea8ca..fa877ae90 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -906,11 +906,11 @@ public final class DefaultPersister implements Persister { */ private void saveAssocMany(PersistRequestBean request) { - EntityBean parentBean = request.getEntityBean(); - BeanDescriptor desc = request.getBeanDescriptor(); + EntityBean parentBean = request.entityBean(); + BeanDescriptor desc = request.descriptor(); SpiTransaction t = request.transaction(); - EntityBean orphanForRemoval = request.getImportedOrphanForRemoval(); + EntityBean orphanForRemoval = request.importedOrphanForRemoval(); if (orphanForRemoval != null) { delete(orphanForRemoval, request.transaction(), true); } @@ -924,7 +924,7 @@ public final class DefaultPersister implements Persister { if (!prop.isSaveRecurseSkippable(detailBean)) { t.depth(+1); prop.setParentBeanToChild(parentBean, detailBean); - saveRecurse(detailBean, t, parentBean, request.getFlags()); + saveRecurse(detailBean, t, parentBean, request.flags()); t.depth(-1); } } @@ -980,8 +980,8 @@ public final class DefaultPersister implements Persister { SpiTransaction t = request.transaction(); t.depth(-1); - BeanDescriptor desc = request.getBeanDescriptor(); - EntityBean parentBean = request.getEntityBean(); + BeanDescriptor desc = request.descriptor(); + EntityBean parentBean = request.entityBean(); DeleteMode deleteMode = request.deleteMode(); BeanPropertyAssocOne[] expOnes = desc.propertiesOneExportedDelete(); @@ -1107,7 +1107,7 @@ public final class DefaultPersister implements Persister { */ private void saveAssocOne(PersistRequestBean request) { - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); // imported ones with save cascade for (BeanPropertyAssocOne prop : desc.propertiesOneImportedSave()) { @@ -1117,14 +1117,14 @@ public final class DefaultPersister implements Persister { } if (request.isLoadedProperty(prop)) { - EntityBean detailBean = prop.getValueAsEntityBean(request.getEntityBean()); + EntityBean detailBean = prop.getValueAsEntityBean(request.entityBean()); if (detailBean != null && !prop.isSaveRecurseSkippable(detailBean) && !prop.isReference(detailBean) && !request.isParent(detailBean)) { SpiTransaction t = request.transaction(); t.depth(-1); - saveRecurse(detailBean, t, null, request.getFlags()); + saveRecurse(detailBean, t, null, request.flags()); t.depth(+1); } } @@ -1152,7 +1152,7 @@ public final class DefaultPersister implements Persister { DeleteUnloadedForeignKeys fkeys = null; - for (BeanPropertyAssocOne one : request.getBeanDescriptor().propertiesOneImportedDelete()) { + for (BeanPropertyAssocOne one : request.descriptor().propertiesOneImportedDelete()) { if (!request.isLoadedProperty(one)) { // we have cascade Delete on a partially populated bean and // this property was not loaded (so we are going to have to fetch it) @@ -1173,10 +1173,10 @@ public final class DefaultPersister implements Persister { DeleteMode deleteMode = request.deleteMode(); - for (BeanPropertyAssocOne prop : request.getBeanDescriptor().propertiesOneImportedDelete()) { + for (BeanPropertyAssocOne prop : request.descriptor().propertiesOneImportedDelete()) { if (deleteMode.isHard() || prop.isTargetSoftDelete()) { if (request.isLoadedProperty(prop)) { - Object detailBean = prop.getValue(request.getEntityBean()); + Object detailBean = prop.getValue(request.entityBean()); if (detailBean != null) { EntityBean detail = (EntityBean) detailBean; if (prop.hasId(detail)) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index e5d8c5877..ed183afaf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -49,10 +49,10 @@ final class DeleteUnloadedForeignKeys { */ void queryForeignKeys() { - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); SpiQuery q = (SpiQuery) server.createQuery(descriptor.getBeanType()); - Object id = request.getBeanId(); + Object id = request.beanId(); StringBuilder sb = new StringBuilder(30); for (BeanPropertyAssocOne aPropList : propList) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index f4cbacb42..150e02050 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -56,7 +56,7 @@ final class ExeCallableSql { private CallableStatement bindStmt(PersistRequestCallableSql request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); - SpiCallableSql callableSql = request.getCallableSql(); + SpiCallableSql callableSql = request.callableSql(); SpiTransaction t = request.transaction(); String sql = callableSql.getSql(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index 9b1edb8d9..d6839adca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -38,7 +38,7 @@ final class ExeOrmUpdate { // return -1 to indicate batch mode return -1; } else { - SpiUpdate ormUpdate = request.getOrmUpdate(); + SpiUpdate ormUpdate = request.ormUpdate(); if (ormUpdate.getTimeout() > 0) { pstmt.setQueryTimeout(ormUpdate.getTimeout()); } @@ -49,7 +49,7 @@ final class ExeOrmUpdate { } } catch (SQLException ex) { - throw new PersistenceException("Error executing: " + request.getOrmUpdate().getGeneratedSql(), ex); + throw new PersistenceException("Error executing: " + request.ormUpdate().getGeneratedSql(), ex); } finally { if (!batchThisRequest) { @@ -62,13 +62,13 @@ final class ExeOrmUpdate { * Convert bean and property names to db table and columns. */ private String translate(PersistRequestOrmUpdate request, String sql) { - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); return descriptor.convertOrmUpdateToSql(sql); } private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); - SpiUpdate ormUpdate = request.getOrmUpdate(); + SpiUpdate ormUpdate = request.ormUpdate(); SpiTransaction t = request.transaction(); String sql = ormUpdate.getUpdateStatement(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index 5c8e838de..2261c81b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -74,7 +74,7 @@ final class ExeUpdateSql { private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batchThisRequest) throws SQLException { request.startBind(batchThisRequest); - SpiSqlUpdate updateSql = request.getUpdateSql(); + SpiSqlUpdate updateSql = request.updateSql(); SpiTransaction t = request.transaction(); BindParams bindParams = updateSql.getBindParams(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java index 9353ebd31..130ce23e3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java @@ -49,7 +49,7 @@ abstract class SaveManyBase implements SaveMany { final void preElementCollectionUpdate() { if (!insertedParent) { request.preElementCollectionUpdate(); - persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 1); + persister.addToFlushQueue(many.deleteByParentId(request.beanId(), null), transaction, 1); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index e48a7dd9d..6e842863e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -186,7 +186,7 @@ public final class SaveManyBeans extends SaveManyBase { } if (!skipSavingThisBean) { - persister.saveRecurse(detail, transaction, parentBean, request.getFlags()); + persister.saveRecurse(detail, transaction, parentBean, request.flags()); if (many.hasOrderColumn()) { // Clear the bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed final BeanDescriptor beanDescriptor = many.getBeanDescriptor(); @@ -344,7 +344,7 @@ public final class SaveManyBeans extends SaveManyBase { } if (!(value instanceof BeanCollection)) { if (!insertedParent && cascade && isChangedProperty()) { - persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0); + persister.addToFlushQueue(many.deleteByParentId(request.beanId(), null), transaction, 0); } } else { BeanCollection c = (BeanCollection) value; @@ -363,7 +363,7 @@ public final class SaveManyBeans extends SaveManyBase { EntityBean eb = (EntityBean) removedBean; if (eb._ebean_intercept().isOrphanDelete()) { // only delete if the bean was loaded meaning that it is known to exist in the DB - persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, request.getFlags())); + persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, request.flags())); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java index 8b577da93..874505b83 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java @@ -43,7 +43,7 @@ final class SaveManyElementCollection extends SaveManyBase { private void saveCollection() { SpiSqlUpdate proto = many.insertElementCollection(); - Object parentId = request.getBeanId(); + Object parentId = request.beanId(); for (Object value : collection) { final SpiSqlUpdate sqlInsert = proto.copy(); sqlInsert.setParameter(parentId); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java index 2941a1499..f57a44d3d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java @@ -45,7 +45,7 @@ final class SaveManyElementCollectionMap extends SaveManyBase { private void saveCollection() { SpiSqlUpdate proto = many.insertElementCollection(); - Object parentId = request.getBeanId(); + Object parentId = request.beanId(); for (Map.Entry entry : entries) { final SpiSqlUpdate sqlInsert = proto.copy(); sqlInsert.setParameter(parentId); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index 7baac04ab..78f653af3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -40,13 +40,13 @@ final class DeleteMeta extends BaseMeta { * Bind the request based on the concurrency mode. */ public void bind(PersistRequestBean persist, DmlHandler bind) throws SQLException { - EntityBean bean = persist.getEntityBean(); + EntityBean bean = persist.entityBean(); id.dmlBind(bind, bean); if (tenantId != null) { tenantId.dmlBind(bind, bean); } - if (persist.getConcurrencyMode() == ConcurrencyMode.VERSION) { + if (persist.concurrencyMode() == ConcurrencyMode.VERSION) { version.dmlBind(bind, bean); } } @@ -56,11 +56,11 @@ final class DeleteMeta extends BaseMeta { */ public String getSql(PersistRequestBean request) { if (id.isEmpty()) { - throw new IllegalStateException("Can not deleteById on " + request.getFullName() + " as no @Id property"); + throw new IllegalStateException("Can not deleteById on " + request.fullName() + " as no @Id property"); } boolean publish = request.isPublish(); - switch (request.getConcurrencyMode()) { + switch (request.concurrencyMode()) { case NONE: return publish ? sqlNone : sqlDraftNone; @@ -68,7 +68,7 @@ final class DeleteMeta extends BaseMeta { return publish ? sqlVersion : sqlDraftVersion; default: - throw new RuntimeException("Invalid mode " + request.getConcurrencyMode()); + throw new RuntimeException("Invalid mode " + request.concurrencyMode()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java index 9b9a9c2cf..b805da26e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java @@ -19,13 +19,13 @@ final class DocStoreBeanPersister implements BeanPersister { @Override public void insert(PersistRequestBean request) throws PersistenceException { //request.setIdValueForDocStore(); - generatedProperties.preInsert(request.getEntityBean(), request.now()); + generatedProperties.preInsert(request.entityBean(), request.now()); request.docStorePersist(); } @Override public void update(PersistRequestBean request) throws PersistenceException { - generatedProperties.preUpdate(request.getEntityBean(), request.now()); + generatedProperties.preUpdate(request.entityBean(), request.now()); request.docStorePersist(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index f981679e6..0e6d6ff80 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -47,8 +47,8 @@ public final class InsertHandler extends DmlHandler { */ @Override public void bind() throws SQLException { - BeanDescriptor desc = persistRequest.getBeanDescriptor(); - EntityBean bean = persistRequest.getEntityBean(); + BeanDescriptor desc = persistRequest.descriptor(); + EntityBean bean = persistRequest.entityBean(); Object idValue = desc.getId(bean); boolean withId = !isNullOrZero(idValue); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java index 4b667e521..d2c511a50 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -30,13 +30,13 @@ final class UpdateMeta extends BaseMeta { * Bind the request based on the concurrency mode. */ public void bind(PersistRequestBean persist, DmlHandler bind, SpiUpdatePlan updatePlan) throws SQLException { - EntityBean bean = persist.getEntityBean(); + EntityBean bean = persist.entityBean(); updatePlan.bindSet(bind, bean); id.dmlBind(bind, bean); if (tenantId != null) { tenantId.dmlBind(bind, bean); } - if (persist.getConcurrencyMode() == ConcurrencyMode.VERSION) { + if (persist.concurrencyMode() == ConcurrencyMode.VERSION) { version.dmlBind(bind, bean); } } @@ -49,9 +49,9 @@ final class UpdateMeta extends BaseMeta { } private SpiUpdatePlan getDynamicUpdatePlan(PersistRequestBean persistRequest) { - String key = persistRequest.getUpdatePlanHash(); + String key = persistRequest.updatePlanHash(); // check if we can use a cached UpdatePlan - BeanDescriptor beanDescriptor = persistRequest.getBeanDescriptor(); + BeanDescriptor beanDescriptor = persistRequest.descriptor(); SpiUpdatePlan updatePlan = beanDescriptor.getUpdatePlan(key); if (updatePlan != null) { return updatePlan; @@ -64,9 +64,9 @@ final class UpdateMeta extends BaseMeta { set.addToUpdate(persistRequest, list); BindableList bindableList = new BindableList(list); - ConcurrencyMode mode = persistRequest.getConcurrencyMode(); + ConcurrencyMode mode = persistRequest.concurrencyMode(); // build the SQL for this update statement - String sql = genSql(mode, bindableList, persistRequest.getUpdateTable()); + String sql = genSql(mode, bindableList, persistRequest.updateTable()); updatePlan = new UpdatePlan(key, mode, sql, bindableList); // add the UpdatePlan to the cache diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 1f094b0c5..a62135f46 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -90,7 +90,7 @@ final class BindableIdEmbedded implements BindableId { throw new PersistenceException(m); } - EntityBean bean = persist.getEntityBean(); + EntityBean bean = persist.entityBean(); // create the new id EntityBean newId = (EntityBean) embId.createEmbeddedId(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java index 7879d192c..7f3e44e0c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java @@ -18,7 +18,7 @@ public final class BindableOrderColumn extends BindableProperty { @Override public void addToUpdate(PersistRequestBean request, List list) { - int sortOrder = request.getEntityBeanIntercept().getSortOrder(); + int sortOrder = request.intercept().getSortOrder(); if (sortOrder > 0) { list.add(this); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 2ea853644..768fd380d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -54,7 +54,7 @@ public final class BindableUnidirectional implements Bindable { @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { PersistRequestBean persistRequest = request.getPersistRequest(); - Object parentBean = persistRequest.getParentBean(); + Object parentBean = persistRequest.parentBean(); if (parentBean == null) { Class localType = desc.getBeanType(); Class targetType = unidirectional.getTargetType(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index 54cb75c8a..c517341e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -202,7 +202,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi this.sql = queryPlan.getSql(); this.rawSql = queryPlan.isRawSql(); this.logWhereSql = queryPlan.getLogWhereSql(); - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.predicates = predicates; if (lazyLoadManyProperty != null) { this.help = NOOP_ADD; @@ -370,7 +370,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi */ @Override public PersistenceContext getPersistenceContext() { - return request.getPersistenceContext(); + return request.persistenceContext(); } @Override @@ -586,19 +586,19 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi @Override public void registerBeanInherit(BeanPropertyAssocOne property, EntityBeanIntercept ebi) { String path = getPath(property.getName()); - request.getGraphContext().register(path, ebi, property); + request.loadContext().register(path, ebi, property); } @Override public void register(String path, EntityBeanIntercept ebi) { path = getPath(path); - request.getGraphContext().register(path, ebi); + request.loadContext().register(path, ebi); } @Override public void register(BeanPropertyAssocMany many, BeanCollection bc) { String path = getPath(many.getName()); - request.getGraphContext().register(path, many, bc); + request.loadContext().register(path, many, bc); } /** @@ -683,7 +683,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi @Override public void profileBean(EntityBeanIntercept ebi, String prefix) { - ObjectGraphNode node = request.getGraphContext().getObjectGraphNode(prefix); + ObjectGraphNode node = request.loadContext().getObjectGraphNode(prefix); ebi.setNodeUsageCollector(new NodeUsageCollector(node, profilingListenerRef)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index ca600f46c..709653a30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -93,7 +93,7 @@ final class CQueryBuilder { query.setupForDeleteOrUpdate(); CQueryPredicates predicates = new CQueryPredicates(binder, request); - CQueryPlan queryPlan = request.getQueryPlan(); + CQueryPlan queryPlan = request.queryPlan(); if (queryPlan != null) { // skip building the SqlTree and Sql string predicates.prepare(false); @@ -130,7 +130,7 @@ final class CQueryBuilder { } // wrap as - delete from table where id in (select id ...) String sql = buildSqlDelete(null, request, predicates, sqlTree).getSql(); - sql = request.getBeanDescriptor().getDeleteByIdInSql() + "in (" + sql + ")"; + sql = request.descriptor().getDeleteByIdInSql() + "in (" + sql + ")"; sql = aliasReplace(sql, alias); return sql; } @@ -145,7 +145,7 @@ final class CQueryBuilder { private String buildUpdateSql(OrmQueryRequest request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) { StringBuilder sb = new StringBuilder(200); - sb.append("update ").append(request.getBeanDescriptor().getBaseTable()); + sb.append("update ").append(request.descriptor().getBaseTable()); if (rootTableAlias != null) { sb.append(" ").append(rootTableAlias); } @@ -157,7 +157,7 @@ final class CQueryBuilder { } // wrap as - update table set ... where id in (select id ...) String sql = buildSqlUpdate(null, request, predicates, sqlTree).getSql(); - sql = updateClause + " " + request.getBeanDescriptor().getWhereIdInSql() + "in (" + sql + ")"; + sql = updateClause + " " + request.descriptor().getWhereIdInSql() + "in (" + sql + ")"; sql = aliasReplace(sql, alias(rootTableAlias)); return sql; } @@ -180,14 +180,14 @@ final class CQueryBuilder { SpiQuery query = request.query(); query.setSingleAttribute(); if (!query.isIncludeSoftDeletes()) { - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); if (desc.isSoftDelete()) { query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias()))); } } CQueryPredicates predicates = new CQueryPredicates(binder, request); - CQueryPlan queryPlan = request.getQueryPlan(); + CQueryPlan queryPlan = request.queryPlan(); if (queryPlan != null) { predicates.prepare(false); return new CQueryFetchSingleAttribute(request, predicates, queryPlan, query.isCountDistinct()); @@ -210,7 +210,7 @@ final class CQueryBuilder { CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest request) { SpiQuery query = request.query(); query.setSelectId(); - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); if (!query.isIncludeSoftDeletes() && desc.isSoftDelete()) { query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias()))); } @@ -252,7 +252,7 @@ final class CQueryBuilder { } CQueryPredicates predicates = new CQueryPredicates(binder, request); - CQueryPlan queryPlan = request.getQueryPlan(); + CQueryPlan queryPlan = request.queryPlan(); if (queryPlan != null) { // skip building the SqlTree and Sql string predicates.prepare(false); @@ -304,7 +304,7 @@ final class CQueryBuilder { * Return true if the query includes an aggregation property. */ private boolean includesAggregation(OrmQueryRequest request, SpiQuery query) { - return request.getBeanDescriptor().includesAggregation(query.getDetail()); + return request.descriptor().includesAggregation(query.getDetail()); } private String wrapSelectCount(String sql) { @@ -321,7 +321,7 @@ final class CQueryBuilder { */ CQuery buildQuery(OrmQueryRequest request) { CQueryPredicates predicates = new CQueryPredicates(binder, request); - CQueryPlan queryPlan = request.getQueryPlan(); + CQueryPlan queryPlan = request.queryPlan(); if (queryPlan != null) { // Reuse the query plan so skip generating SqlTree and SQL. // We do prepare and bind the new parameters @@ -358,7 +358,7 @@ final class CQueryBuilder { queryPlan = new CQueryPlan(request, res, sqlTree, false, predicates.getLogWhereSql()); } - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); if (desc.isReadAuditing()) { // log the query plan based bean type (i.e. ignoring query disabling for logging the sql/plan) desc.getReadAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.getFullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql())); @@ -411,7 +411,7 @@ final class CQueryBuilder { Connection connection = request.transaction().getConnection(); - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); try { // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable // statement here by specifying ResultSet.CONCUR_UPDATABLE @@ -445,7 +445,7 @@ final class CQueryBuilder { } private SqlTree createRawSqlSqlTree(OrmQueryRequest request, CQueryPredicates predicates) { - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); ColumnMapping columnMapping = request.query().getRawSql().getColumnMapping(); PathProperties pathProps = new PathProperties(); @@ -583,7 +583,7 @@ final class CQueryBuilder { sb.append("r1.attribute_, count(*) from (select "); if (distinct) { sb.append("distinct t0."); - sb.append(request.getBeanDescriptor().getIdProperty().getDbColumn()).append(", "); + sb.append(request.descriptor().getIdProperty().getDbColumn()).append(", "); } sb.append(select.getSelectSql()).append(" as attribute_"); } else { @@ -652,7 +652,7 @@ final class CQueryBuilder { private void appendHistoryAsOfPredicate() { if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) { appendAndOrWhere(); - sb.append(historySupport.getAsOfPredicate(request.getBaseTableAlias())); + sb.append(historySupport.getAsOfPredicate(request.baseTableAlias())); } } @@ -660,7 +660,7 @@ final class CQueryBuilder { if (request.isFindById() || query.getId() != null) { appendAndOrWhere(); - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); String idSql = desc.getIdBinderIdSql(query.getAlias()); if (idSql.isEmpty()) { throw new IllegalStateException("Executing FindById query on entity bean " + desc.getName() diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index dffcc61b2..a46d571c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -82,7 +82,7 @@ final class CQueryBuilderRawSql { // assumption that id has its proper dbColumn assigned // which may change if using multiple raw sql statements // against the same bean. - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); //FIXME: I think this is broken... needs to be logical // and then parsed for RawSqlSelect... dynamicWhere = descriptor.getIdBinderIdSql(null); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 1380de179..56142b51d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -198,7 +198,7 @@ public final class CQueryEngine { logSql(cquery); } // first check batch sizes set on query joins - int iterateBufferSize = request.getSecondaryQueriesMinBatchSize(); + int iterateBufferSize = request.secondaryQueriesMinBatchSize(); if (iterateBufferSize < 1) { // not set on query joins so check if batch size set on query itself int queryBatch = request.query().getLazyLoadBatchSize(); @@ -274,7 +274,7 @@ public final class CQueryEngine { } private void deriveVersionDiffs(List> versions, OrmQueryRequest request) { - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); if (!versions.isEmpty()) { Version current = versions.get(0); if (versions.size() > 1) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 2f45f1b2e..466f812ed 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -52,7 +52,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca this.queryPlan = queryPlan; this.query = request.query(); this.sql = queryPlan.getSql(); - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.predicates = predicates; this.containsCounts = containsCounts; this.reader = queryPlan.getSingleAttributeScalarType(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index c40fcf939..ba6a3a459 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -87,13 +87,13 @@ public class CQueryPlan implements SpiQueryPlan { CQueryPlan(OrmQueryRequest request, SqlLimitResponse sqlRes, SqlTree sqlTree, boolean rawSql, String logWhereSql) { this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); - this.beanType = request.getBeanDescriptor().getBeanType(); - this.planKey = request.getQueryPlanKey(); + this.beanType = request.descriptor().getBeanType(); + this.planKey = request.queryPlanKey(); SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName()); + this.name = deriveName(label, query.getType(), request.descriptor().getSimpleName()); this.asOfTableCount = query.getAsOfTableCount(); this.sql = sqlRes.getSql(); this.sqlTree = sqlTree; @@ -112,12 +112,12 @@ public class CQueryPlan implements SpiQueryPlan { CQueryPlan(OrmQueryRequest request, String sql, SqlTree sqlTree, String logWhereSql) { this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); - this.beanType = request.getBeanDescriptor().getBeanType(); + this.beanType = request.descriptor().getBeanType(); SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName()); + this.name = deriveName(label, query.getType(), request.descriptor().getSimpleName()); this.planKey = buildPlanKey(sql, logWhereSql); this.asOfTableCount = 0; this.sql = sql; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index 54c94da52..cab8530fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -115,7 +115,7 @@ public final class CQueryPredicates { dataBind.append(", "); } - CQueryPlan queryPlan = request.getQueryPlan(); + CQueryPlan queryPlan = request.queryPlan(); if (queryPlan != null) { int asOfTableCount = queryPlan.getAsOfTableCount(); if (asOfTableCount > 0) { @@ -132,7 +132,7 @@ public final class CQueryPredicates { if (idValue != null) { // this is a find by id type query... - request.getBeanDescriptor().bindId(dataBind, idValue); + request.descriptor().bindId(dataBind, idValue); dataBind.append(idValue); dataBind.append(", "); } @@ -244,7 +244,7 @@ public final class CQueryPredicates { private void parsePropertiesToDbColumns(DeployParser deployParser) { // order by is dependent on the manyProperty (if there is one) - String logicalOrderBy = deriveOrderByWithMany(request.getManyProperty()); + String logicalOrderBy = deriveOrderByWithMany(request.manyProperty()); if (logicalOrderBy != null) { dbOrderBy = deployParser.parse(logicalOrderBy); } @@ -312,7 +312,7 @@ public final class CQueryPredicates { if (orderBy == null) { return null; } - return CQueryOrderBy.parse(request.getBeanDescriptor(), orderBy); + return CQueryOrderBy.parse(request.descriptor(), orderBy); } /** @@ -327,7 +327,7 @@ public final class CQueryPredicates { String orderBy = parseOrderBy(); - BeanDescriptor desc = request.getBeanDescriptor(); + BeanDescriptor desc = request.descriptor(); String orderById = desc.getDefaultOrderBy(); if (orderBy == null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index ac0f9c6f2..78b4093f7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -43,7 +43,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer this.request = request; this.query = request.query(); this.sql = queryPlan.getSql(); - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.predicates = predicates; query.setGeneratedSql(sql); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index 2e4e1a871..b49849cfd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -39,7 +39,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery this.queryPlan = queryPlan; this.query = request.query(); this.sql = queryPlan.getSql(); - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.predicates = predicates; query.setGeneratedSql(sql); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index 1b95fc55c..adbeee6d5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -121,7 +121,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { flushJdbcBatchOnQuery(request); - BeanFindController finder = request.getBeanFinder(); + BeanFindController finder = request.finder(); BeanCollection result; if (finder != null && finder.isInterceptFindMany(request)) { @@ -135,7 +135,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { if (result != null && request.isBeanCachePutMany()) { // load the individual beans into the bean cache - BeanDescriptor descriptor = request.getBeanDescriptor(); + BeanDescriptor descriptor = request.descriptor(); Collection c = result.getActualDetails(); descriptor.cacheBeanPutAll(c); } @@ -162,7 +162,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { flushJdbcBatchOnQuery(request); - BeanFindController finder = request.getBeanFinder(); + BeanFindController finder = request.finder(); T result; if (finder != null && finder.isInterceptFind(request)) { @@ -172,7 +172,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine { } if (result != null && request.isBeanCachePut()) { - request.getBeanDescriptor().cacheBeanPut((EntityBean) result); + request.descriptor().cacheBeanPut((EntityBean) result); } return result; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index e127726de..f1768bb39 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -59,7 +59,7 @@ public final class SqlTreeBuilder { */ SqlTreeBuilder(OrmQueryRequest request, CQueryPredicates predicates, OrmQueryDetail queryDetail, boolean rawNoId) { this.rawSql = true; - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.rawNoId = rawNoId; this.disableLazyLoad = request.query().isDisableLazyLoading(); this.query = null; @@ -82,7 +82,7 @@ public final class SqlTreeBuilder { SqlTreeBuilder(String columnAliasPrefix, CQueryBuilder builder, OrmQueryRequest request, CQueryPredicates predicates) { this.rawSql = false; this.rawNoId = false; - this.desc = request.getBeanDescriptor(); + this.desc = request.descriptor(); this.query = request.query(); this.temporalMode = SpiQuery.TemporalMode.of(query); this.disableLazyLoad = query.isDisableLazyLoading(); @@ -95,7 +95,7 @@ public final class SqlTreeBuilder { this.manyWhereJoins = query.getManyWhereJoins(); this.queryDetail = query.getDetail(); this.predicates = predicates; - this.alias = new SqlTreeAlias(request.getBaseTableAlias(), temporalMode); + this.alias = new SqlTreeAlias(request.baseTableAlias(), temporalMode); this.distinctOnPlatform = builder.isPlatformDistinctOn(); String fromForUpdate = builder.fromForUpdate(query); CQueryHistorySupport historySupport = builder.getHistorySupport(query); diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java index 3a8e22403..bbf5ca009 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java @@ -18,6 +18,6 @@ public class DocStoreEmbeddedInvalidation { } public void embeddedInvalidate(PersistRequestBean request, DocStoreUpdates docStoreUpdates) { - docStoreUpdates.addNested(queueId, path, request.getBeanId()); + docStoreUpdates.addNested(queueId, path, request.beanId()); } } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java index 56b8cf39d..38f93a8a8 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java @@ -23,7 +23,7 @@ public final class DocStoreEmbeddedInvalidationProperties extends DocStoreEmbedd @Override public void embeddedInvalidate(PersistRequestBean request, DocStoreUpdates docStoreUpdates) { if (request.hasDirtyProperty(properties)) { - docStoreUpdates.addNested(queueId, path, request.getBeanId()); + docStoreUpdates.addNested(queueId, path, request.beanId()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index 4bffce7d8..991198b3e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -28,7 +28,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.batchSize).isEqualTo(10); @@ -41,7 +41,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.batchSize).isEqualTo(100); @@ -54,7 +54,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.batchSize).isEqualTo(100); @@ -67,7 +67,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.batchSize).isEqualTo(50); @@ -80,7 +80,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.batchSize).isEqualTo(100); @@ -95,7 +95,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); DLoadManyContext details = graphContext.getManyContext("details", many); assertThat(details.batchSize).isEqualTo(100); From d072dd52cf1380e1a30e935272fbdc5dd2535ccc Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 20:17:12 +1200 Subject: [PATCH 044/102] #2355 - Rename methods in SpiServer with deprecation --- .../main/java/io/ebean/plugin/SpiServer.java | 60 +++++++++++++++++-- .../changelog/DefaultChangeLogListener.java | 2 +- .../server/core/DefaultBeanLoader.java | 2 +- .../server/core/DefaultServer.java | 12 ++-- .../java/io/ebean/plugin/BeanTypeTest.java | 2 +- .../io/ebean/plugin/ExpressionPathTest.java | 2 +- .../java/io/ebean/plugin/PropertyTest.java | 2 +- .../java/io/ebean/plugin/SpiServerTest.java | 10 ++-- .../server/rawsql/TestRawSqlBuilder.java | 4 +- .../api/support/DocStoreDeleteEventTest.java | 2 +- .../api/support/DocStoreIndexEventTest.java | 2 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 2 +- .../java/org/tests/el/TestPathExpression.java | 2 +- .../org/tests/json/TestDbJson_Jackson.java | 4 +- .../org/tests/json/TestDbJson_Jackson2.java | 2 +- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../org/tests/query/TestQueryFindIterate.java | 2 +- .../sqlquery/TestNativeILikeExpression.java | 2 +- .../text/json/TestTextJsonInvokeLazy.java | 2 +- .../java/org/tests/types/TestNewTypes.java | 2 +- .../platform/PlatformDdl_AlterColumnTest.java | 2 +- .../platform/PlatformDdl_CreateIndexTest.java | 2 +- 22 files changed, 86 insertions(+), 38 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java index 257829a5e..96bf6eed1 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java +++ b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java @@ -16,32 +16,80 @@ public interface SpiServer extends Database { /** * Return the DatabaseConfig. */ - DatabaseConfig getServerConfig(); + DatabaseConfig config(); + + /** + * Migrate to config(). + */ + @Deprecated + default DatabaseConfig getServerConfig() { + return config(); + } /** * Return the DatabasePlatform for this database. */ - DatabasePlatform getDatabasePlatform(); + DatabasePlatform databasePlatform(); + + /** + * Migrate to config(). + */ + @Deprecated + default DatabasePlatform getDatabasePlatform() { + return databasePlatform(); + } /** * Return all the bean types registered on this server instance. */ - List> getBeanTypes(); + List> beanTypes(); + + /** + * Migrate to beanTypes(). + */ + @Deprecated + default List> getBeanTypes() { + return beanTypes(); + } /** * Return the bean type for a given entity bean class. */ - BeanType getBeanType(Class beanClass); + BeanType beanType(Class beanClass); + + /** + * Migrate to beanType(). + */ + @Deprecated + default BeanType getBeanType(Class beanClass) { + return beanType(beanClass); + } /** * Return the bean types mapped to the given base table. */ - List> getBeanTypes(String baseTableName); + List> beanTypes(String baseTableName); + + /** + * Migrate to beanTypes(). + */ + @Deprecated + default List> getBeanTypes(String baseTableName) { + return beanTypes(baseTableName); + } /** * Return the bean type for a given doc store queueId. */ - BeanType getBeanTypeForQueueId(String queueId); + BeanType beanTypeForQueueId(String queueId); + + /** + * Migrate to beanTypes(). + */ + @Deprecated + default BeanType getBeanTypeForQueueId(String queueId) { + return beanTypeForQueueId(queueId); + } /** * Return a BeanLoader. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java index 6e12aa31d..5cda1ed36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java @@ -46,7 +46,7 @@ public final class DefaultChangeLogListener implements ChangeLogListener, Plugin @Override public void configure(SpiServer server) { jsonBuilder = new ChangeJsonBuilder(); - Properties properties = server.getServerConfig().getProperties(); + Properties properties = server.config().getProperties(); if (properties != null) { String bufferSize = properties.getProperty("ebean.changeLog.bufferSize"); if (bufferSize != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 8a42ed12f..330ec53a9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -35,7 +35,7 @@ final class DefaultBeanLoader { DefaultBeanLoader(DefaultServer server) { this.server = server; - this.onIterateUseExtraTxn = server.getDatabasePlatform().useExtraTransactionOnIterateSecondaryQueries(); + this.onIterateUseExtraTxn = server.databasePlatform().useExtraTransactionOnIterateSecondaryQueries(); } void loadMany(LoadManyRequest loadRequest) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 265e0f5dd..27aae1b29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -305,12 +305,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DatabaseConfig getServerConfig() { + public DatabaseConfig config() { return config; } @Override - public DatabasePlatform getDatabasePlatform() { + public DatabasePlatform databasePlatform() { return databasePlatform; } @@ -2118,7 +2118,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return all the SPI BeanTypes. */ @Override - public List> getBeanTypes() { + public List> beanTypes() { return getBeanDescriptors(); } @@ -2126,12 +2126,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the SPI bean types mapped to the given table. */ @Override - public List> getBeanTypes(String tableName) { + public List> beanTypes(String tableName) { return beanDescriptorManager.getBeanTypes(tableName); } @Override - public BeanType getBeanTypeForQueueId(String queueId) { + public BeanType beanTypeForQueueId(String queueId) { return getBeanDescriptorByQueueId(queueId); } @@ -2144,7 +2144,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the SPI bean types for the given bean class. */ @Override - public BeanType getBeanType(Class beanType) { + public BeanType beanType(Class beanType) { return getBeanDescriptor(beanType); } diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index 222dd2508..6557867e9 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -28,7 +28,7 @@ public class BeanTypeTest { private static Database db = DB.getDefault(); private BeanType beanType(Class cls) { - return db.pluginApi().getBeanType(cls); + return db.pluginApi().beanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index de6a79308..e48ffbe25 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java @@ -15,7 +15,7 @@ public class ExpressionPathTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.pluginApi().getBeanType(cls); + return server.pluginApi().beanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index 1e3fcf472..cc546b742 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -15,7 +15,7 @@ public class PropertyTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.pluginApi().getBeanType(cls); + return server.pluginApi().beanType(cls); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index 507df1339..54776a643 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -25,9 +25,9 @@ public class SpiServerTest extends BaseTestCase { EbeanServer defaultServer = Ebean.getDefaultServer(); SpiServer pluginApi = defaultServer.pluginApi(); - BeanType beanType = pluginApi.getBeanType(Customer.class); + BeanType beanType = pluginApi.beanType(Customer.class); assertEquals("o_customer", beanType.getBaseTable()); - assertNotNull(pluginApi.getDatabasePlatform()); + assertNotNull(pluginApi.databasePlatform()); assertNull(beanType.getFindController()); assertNotNull(beanType.getPersistController()); assertNull(beanType.getPersistListener()); @@ -45,15 +45,15 @@ public class SpiServerTest extends BaseTestCase { assertEquals(42, beanType.getBeanId(customer)); - List> beanTypes = pluginApi.getBeanTypes("o_customer"); + List> beanTypes = pluginApi.beanTypes("o_customer"); assertEquals(2, beanTypes.size()); - BeanType vwBeanType = pluginApi.getBeanType(VwCustomer.class); + BeanType vwBeanType = pluginApi.beanType(VwCustomer.class); assertThat(beanTypes.contains(beanType)).isTrue(); assertThat(beanTypes.contains(vwBeanType)).isTrue(); - List> allTypes = pluginApi.getBeanTypes(); + List> allTypes = pluginApi.beanTypes(); assertFalse(allTypes.isEmpty()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 9fa3fd0a9..274e98a7f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -302,7 +302,7 @@ public class TestRawSqlBuilder extends BaseTestCase { final String sql = "select description from ebasic_clob where id = ?"; List rows = new ArrayList<>(); - final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig(); + final DataSourceConfig config = ((DefaultServer) DB.getDefault()).config().getDataSourceConfig(); try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword()); PreparedStatement stmt = connection.prepareStatement(sql)) { @@ -327,7 +327,7 @@ public class TestRawSqlBuilder extends BaseTestCase { DB.save(pfc); List rows = new ArrayList<>(); - final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig(); + final DataSourceConfig config = ((DefaultServer) DB.getDefault()).config().getDataSourceConfig(); final String sql = "select content from persistent_file_content where id = ?"; try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword()); diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 6bfb125fa..14eacd3ed 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -22,7 +22,7 @@ public class DocStoreDeleteEventTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.pluginApi().getBeanType(cls); + return server.pluginApi().beanType(cls); } BeanType orderType() { diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index b2b8dd3ce..eb95708f1 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -20,7 +20,7 @@ public class DocStoreIndexEventTest { static EbeanServer server = Ebean.getDefaultServer(); BeanType beanType(Class cls) { - return server.pluginApi().getBeanType(cls); + return server.pluginApi().beanType(cls); } BeanType orderType() { diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 9dc2ec555..260a98962 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -33,7 +33,7 @@ public class TestDPersonEl { SpiServer server = Ebean.getDefaultServer().pluginApi(); - BeanType descriptor = server.getBeanType(DPerson.class); + BeanType descriptor = server.beanType(DPerson.class); JsonContext jsonContext = server.json(); diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index a39d63f9a..0852b6327 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -21,7 +21,7 @@ public class TestPathExpression { public TestPathExpression() { SpiServer server = Ebean.getDefaultServer().pluginApi(); - beanType = server.getBeanType(Customer.class); + beanType = server.beanType(Customer.class); billingId = beanType.getExpressionPath("billingAddress.id"); line1 = beanType.getExpressionPath("billingAddress.line1"); city = beanType.getExpressionPath("billingAddress.city"); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java index 3fb42e561..1107c6b8d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -37,7 +37,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, "one"); bean.getValueMap().put(2, "two"); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); EBasicJsonJackson found = mapper.readValue(json, EBasicJsonJackson.class); @@ -83,7 +83,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); assertThat(json) diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java index ef258ec86..01b971ab8 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -34,7 +34,7 @@ public class TestDbJson_Jackson2 extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); found = mapper.readValue(json, EBasicJsonJackson2.class); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 7eff8c97f..bfbb97d46 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -20,7 +20,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { ResetBasicData.reset(); - BeanType embType = Ebean.getDefaultServer().pluginApi().getBeanType(EAddr.class); + BeanType embType = Ebean.getDefaultServer().pluginApi().beanType(EAddr.class); Ebean.getDefaultServer().cacheManager().clearAll(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 7fb3b3863..7ad3fe99e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -233,7 +233,7 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); SpiServer pluginApi = server().pluginApi(); - DataSourcePool dsPool = (DataSourcePool) pluginApi.getServerConfig().getReadOnlyDataSource(); + DataSourcePool dsPool = (DataSourcePool) pluginApi.config().getReadOnlyDataSource(); if (dsPool == null) { dsPool = (DataSourcePool) server().dataSource(); } diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index 37963ead5..bc96f4e46 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -37,7 +37,7 @@ public class TestNativeILikeExpression extends BaseTestCase { private boolean isExpectNative() { SpiServer pluginApi = server().pluginApi(); - boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike(); + boolean expressionNativeIlike = pluginApi.config().isExpressionNativeIlike(); Platform platform = pluginApi.platform().base(); return expressionNativeIlike && platform == Platform.POSTGRES; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index 99b0dd279..fa11fc3e4 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -16,7 +16,7 @@ public class TestTextJsonInvokeLazy extends BaseTestCase { @Before public void clearBeanCache() { - server().pluginApi().getBeanType(Customer.class).clearBeanCache(); + server().pluginApi().beanType(Customer.class).clearBeanCache(); } @Test diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java index eb0210564..b55a37d0e 100644 --- a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java @@ -216,7 +216,7 @@ public class TestNewTypes extends BaseTestCase { private void testSetGetPath(SomeNewTypesBean refBean) { SomeNewTypesBean testBean = new SomeNewTypesBean(); - BeanType beanType = DB.getDefault().pluginApi().getBeanType(SomeNewTypesBean.class); + BeanType beanType = DB.getDefault().pluginApi().beanType(SomeNewTypesBean.class); ExpressionPath localDate = beanType.getExpressionPath("localDate"); ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime"); ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime"); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 0ddbcbca1..4b3044375 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -33,7 +33,7 @@ public class PlatformDdl_AlterColumnTest { private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); { - DatabaseConfig serverConfig = DB.getDefault().pluginApi().getServerConfig(); + DatabaseConfig serverConfig = DB.getDefault().pluginApi().config(); sqlServerDdl.configure(serverConfig); } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java index c1871d4db..31cd89ae5 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java @@ -25,7 +25,7 @@ public class PlatformDdl_CreateIndexTest { private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); { - DatabaseConfig config = DB.getDefault().pluginApi().getServerConfig(); + DatabaseConfig config = DB.getDefault().pluginApi().config(); h2Ddl.configure(config); pgDdl.configure(config); mysqlDdl.configure(config); From 4d4065c54b0f426cc990ad425a566847a6368c1b Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sat, 4 Sep 2021 21:55:23 +1200 Subject: [PATCH 045/102] #2355 - Rename methods in SpiServer with deprecation --- .../main/java/io/ebean/plugin/BeanType.java | 3 +- .../io/ebeaninternal/api/SpiEbeanServer.java | 13 +- .../server/core/AbstractSqlQueryRequest.java | 2 +- .../server/core/DScriptRunner.java | 2 +- .../server/core/DefaultServer.java | 2 +- .../server/core/OrmQueryRequest.java | 6 +- .../deploy/BeanDescriptorCacheHelp.java | 2 +- .../server/persist/DefaultPersister.java | 6 +- .../server/querydefn/DefaultOrmQuery.java | 4 +- .../server/text/json/DJsonContext.java | 4 +- .../src/test/java/io/ebean/BaseTestCase.java | 14 +- .../java/io/ebean/plugin/BeanTypeTest.java | 3 - .../java/io/ebean/plugin/SpiServerTest.java | 2 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 46 +- .../io/ebeaninternal/api/TDSpiServer.java | 643 ++++++++++++++++++ .../org/tests/basic/encrypt/TestEncrypt.java | 2 +- .../batchinsert/TestBatchInsertSimple.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 2 +- .../TestElementCollectionBasicCache.java | 2 +- .../TestElementCollectionBasicMapCache.java | 2 +- ebean-ddl-generator/pom.xml | 1 + .../dbmigration/DdlGenerator.java | 12 +- 22 files changed, 687 insertions(+), 88 deletions(-) create mode 100644 ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java index e44474cd3..bd79be5eb 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -121,8 +121,9 @@ public interface BeanType { Object beanId(Object bean); /** - * Return the id value for the given bean. + * Deprecated migrate to beanId() */ + @Deprecated Object getBeanId(T bean); /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index fae60f49d..b964d2296 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -8,6 +8,7 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.MetricVisitor; +import io.ebean.plugin.SpiServer; import io.ebeaninternal.api.SpiQuery.Type; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.core.timezone.DataTimeZone; @@ -23,7 +24,7 @@ import java.util.stream.Stream; /** * Service Provider extension to EbeanServer. */ -public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollectionLoader { +public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, BeanCollectionLoader { /** * Return true if the L2 cache has been disabled. @@ -50,16 +51,6 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect */ Object currentTenantId(); - /** - * Return the server configuration. - */ - DatabaseConfig getServerConfig(); - - /** - * Return the DatabasePlatform for this server. - */ - DatabasePlatform getDatabasePlatform(); - /** * Create an object to represent the current CallStack. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index a88f1bbe9..f11cf9f8e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -121,7 +121,7 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery { int firstRow = query.getFirstRow(); int maxRows = query.getMaxRows(); if (firstRow > 0 || maxRows > 0) { - return server.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows); + return server.databasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows); } return sql; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 0844bdd36..2b4c81f0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -26,7 +26,7 @@ final class DScriptRunner implements ScriptRunner { DScriptRunner(SpiEbeanServer server) { this.server = server; - this.platformName = this.server.getDatabasePlatform().getPlatform().base().name(); + this.platformName = this.server.platform().base().name(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 27aae1b29..c4afdf5ab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -305,7 +305,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DatabaseConfig config() { + public DatabaseConfig getServerConfig() { return config; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index c2f3ad4c0..6d88c4fa9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -129,7 +129,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String dbLikeClause(boolean rawLikeExpression) { - return server.getDatabasePlatform().getLikeClause(rawLikeExpression); + return server.databasePlatform().getLikeClause(rawLikeExpression); } /** @@ -137,7 +137,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String escapeLikeString(String value) { - return server.getDatabasePlatform().escapeLikeString(value); + return server.databasePlatform().escapeLikeString(value); } @Override @@ -806,6 +806,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return true if no MaxRows or use LIMIT in SQL update. */ public boolean isInlineSqlUpdateLimit() { - return query.getMaxRows() < 1 || server.getDatabasePlatform().isInlineSqlUpdateLimit(); + return query.getMaxRows() < 1 || server.databasePlatform().isInlineSqlUpdateLimit(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 6eceddca4..06a13382c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -375,7 +375,7 @@ final class BeanDescriptorCacheHelp { for (Map.Entry entry : beanDataMap.entrySet()) { CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue(); T bean = convertToBean(entry.getKey(), false, context, cachedBeanData); - result.add(bean, desc.getBeanId(bean)); + result.add(bean, desc.beanId(bean)); } return result; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index fa877ae90..d41676f94 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -73,7 +73,7 @@ public final class DefaultPersister implements Persister { public DefaultPersister(SpiEbeanServer server, Binder binder, BeanDescriptorManager descMgr) { this.server = server; this.beanDescriptorManager = descMgr; - this.persistExecute = new DefaultPersistExecute(binder, server.getServerConfig().getPersistBatchSize()); + this.persistExecute = new DefaultPersistExecute(binder, server.config().getPersistBatchSize()); } @Override @@ -208,7 +208,7 @@ public final class DefaultPersister implements Persister { private List getBeanIds(BeanDescriptor desc, List beans) { List idList = new ArrayList<>(beans.size()); for (T liveBean : beans) { - idList.add(desc.getBeanId(liveBean)); + idList.add(desc.beanId(liveBean)); } return idList; } @@ -348,7 +348,7 @@ public final class DefaultPersister implements Persister { * Publish/restore the values from the sourceBean to the matching destination bean. */ T publishToDestinationBean(T sourceBean) { - id = desc.getBeanId(sourceBean); + id = desc.beanId(sourceBean); T destBean = destBeans.get(id); insert = (destBean == null); // apply changes from liveBean to draftBean diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 04f2ffc4c..9d5d7d613 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -167,8 +167,8 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< this.rootBeanDescriptor = desc; this.beanType = desc.getBeanType(); this.server = server; - this.orderById = server.getServerConfig().isDefaultOrderById(); - this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading(); + this.orderById = server.config().isDefaultOrderById(); + this.disableLazyLoading = server.config().isDisableLazyLoading(); this.expressionFactory = expressionFactory; this.detail = new OrmQueryDetail(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index b0706173c..12866b61c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -62,8 +62,8 @@ public final class DJsonContext implements SpiJsonContext { public DJsonContext(SpiEbeanServer server, JsonFactory jsonFactory, TypeManager typeManager) { this.server = server; this.jsonFactory = (jsonFactory != null) ? jsonFactory : new JsonFactory(); - this.defaultObjectMapper = this.server.getServerConfig().getObjectMapper(); - this.defaultInclude = this.server.getServerConfig().getJsonInclude(); + this.defaultObjectMapper = this.server.config().getObjectMapper(); + this.defaultInclude = this.server.config().getJsonInclude(); this.jsonScalar = new DJsonScalar(typeManager); } diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index e33900534..3e144debc 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -167,7 +167,7 @@ public abstract class BaseTestCase { } public boolean isPlatformCaseSensitive() { - return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation(); + return spiEbeanServer().databasePlatform().isCaseSensitiveCollation(); } /** @@ -215,7 +215,7 @@ public abstract class BaseTestCase { } public boolean isPlatformBooleanNative() { - return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType(); + return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType(); } public boolean isPlatformOrderNullsSupport() { @@ -223,11 +223,11 @@ public abstract class BaseTestCase { } public boolean isPlatformSupportsDeleteTableAlias() { - return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias(); + return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias(); } public boolean isPersistBatchOnCascade() { - return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } /** @@ -246,11 +246,11 @@ public abstract class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().databasePlatform().getPlatform().base(); } protected IdType idType() { - return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType(); + return spiEbeanServer().databasePlatform().getDbIdentity().getIdType(); } protected SpiEbeanServer spiEbeanServer() { @@ -299,7 +299,7 @@ public abstract class BaseTestCase { } protected String concat(String property0, String separator, String property1, String suffix) { - DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform()); + DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); return dbExpressionHandler.concat(property0, separator, property1, suffix); } diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index 6557867e9..d6edb3f0c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -92,10 +92,7 @@ public class BeanTypeTest { order.setId(42); Object id1 = beanType(Order.class).beanId(order); - Object id2 = beanType(Order.class).getBeanId(order); - assertThat(id1).isEqualTo(order.getId()); - assertThat(id2).isEqualTo(order.getId()); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index 54776a643..f94cf6059 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -43,7 +43,7 @@ public class SpiServerTest extends BaseTestCase { Customer customer = new Customer(); customer.setId(42); - assertEquals(42, beanType.getBeanId(customer)); + assertEquals(42, beanType.beanId(customer)); List> beanTypes = pluginApi.beanTypes("o_customer"); assertEquals(2, beanTypes.size()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 7dc5a0b63..ae80084f4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -1,41 +1,12 @@ package io.ebeaninternal.api; -import io.ebean.AutoTune; -import io.ebean.BackgroundExecutor; -import io.ebean.BeanState; -import io.ebean.CallableSql; -import io.ebean.DocumentStore; -import io.ebean.DtoQuery; -import io.ebean.ExpressionFactory; -import io.ebean.ExtendedServer; -import io.ebean.Filter; -import io.ebean.FutureIds; -import io.ebean.FutureList; -import io.ebean.FutureRowCount; -import io.ebean.MergeOptions; -import io.ebean.PagedList; -import io.ebean.PersistenceContextScope; -import io.ebean.Query; -import io.ebean.QueryIterator; -import io.ebean.RowConsumer; -import io.ebean.RowMapper; -import io.ebean.ScriptRunner; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; -import io.ebean.TransactionCallback; -import io.ebean.TxScope; -import io.ebean.Update; -import io.ebean.UpdateQuery; -import io.ebean.ValuePair; -import io.ebean.Version; +import io.ebean.*; import io.ebean.annotation.Platform; import io.ebean.annotation.TxIsolation; import io.ebean.bean.BeanCollection; import io.ebean.bean.CallOrigin; import io.ebean.cache.ServerCacheManager; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; @@ -56,12 +27,7 @@ import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; import javax.sql.DataSource; import java.time.Clock; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.Callable; import java.util.function.Consumer; import java.util.function.Predicate; @@ -71,7 +37,7 @@ import java.util.stream.Stream; /** * Test double for SpiEbeanServer. */ -public class TDSpiEbeanServer implements SpiEbeanServer { +public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { String name; @@ -158,12 +124,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public ServerConfig getServerConfig() { + public DatabaseConfig config() { return null; } @Override - public DatabasePlatform getDatabasePlatform() { + public DatabasePlatform databasePlatform() { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java new file mode 100644 index 000000000..fdb304332 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java @@ -0,0 +1,643 @@ +package io.ebeaninternal.api; + +import io.ebean.*; +import io.ebean.annotation.Platform; +import io.ebean.annotation.TxIsolation; +import io.ebean.bean.BeanLoader; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.cache.ServerCacheManager; +import io.ebean.config.DatabaseConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.meta.MetaInfoManager; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; +import io.ebean.plugin.SpiServer; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.json.JsonContext; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.persistence.OptimisticLockException; +import javax.persistence.PersistenceException; +import javax.sql.DataSource; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; + +public class TDSpiServer implements SpiServer { + @Override + public void shutdown() { + + } + + @Override + public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) { + + } + + @Override + public AutoTune autoTune() { + return null; + } + + @Override + public DataSource dataSource() { + return null; + } + + @Override + public DataSource readOnlyDataSource() { + return null; + } + + @Override + public String name() { + return null; + } + + @Override + public ExpressionFactory expressionFactory() { + return null; + } + + @Override + public MetaInfoManager metaInfo() { + return null; + } + + @Override + public Platform platform() { + return null; + } + + @Override + public SpiServer pluginApi() { + return null; + } + + @Override + public BeanState beanState(Object bean) { + return null; + } + + @Override + public Object beanId(Object bean) { + return null; + } + + @Override + public Object beanId(Object bean, Object id) { + return null; + } + + @Override + public Map diff(Object newBean, Object oldBean) { + return null; + } + + @Override + public T createEntityBean(Class type) { + return null; + } + + @Override + public CsvReader createCsvReader(Class beanType) { + return null; + } + + @Override + public UpdateQuery update(Class beanType) { + return null; + } + + @Override + public Query createNamedQuery(Class beanType, String namedQuery) { + return null; + } + + @Override + public Query createQuery(Class beanType) { + return null; + } + + @Override + public Query createQuery(Class beanType, String ormQuery) { + return null; + } + + @Override + public Query find(Class beanType) { + return null; + } + + @Override + public Query findNative(Class beanType, String nativeSql) { + return null; + } + + @Override + public Object nextId(Class beanType) { + return null; + } + + @Override + public Filter filter(Class beanType) { + return null; + } + + @Override + public void sort(List list, String sortByClause) { + + } + + @Override + public Update createUpdate(Class beanType, String ormUpdate) { + return null; + } + + @Override + public DtoQuery findDto(Class dtoType, String sql) { + return null; + } + + @Override + public DtoQuery createNamedDtoQuery(Class dtoType, String namedQuery) { + return null; + } + + @Override + public SqlQuery sqlQuery(String sql) { + return null; + } + + @Override + public SqlQuery createSqlQuery(String sql) { + return null; + } + + @Override + public SqlUpdate sqlUpdate(String sql) { + return null; + } + + @Override + public SqlUpdate createSqlUpdate(String sql) { + return null; + } + + @Override + public CallableSql createCallableSql(String callableSql) { + return null; + } + + @Override + public void register(TransactionCallback transactionCallback) throws PersistenceException { + + } + + @Override + public Transaction createTransaction() { + return null; + } + + @Override + public Transaction createTransaction(TxIsolation isolation) { + return null; + } + + @Override + public Transaction beginTransaction() { + return null; + } + + @Override + public Transaction beginTransaction(TxIsolation isolation) { + return null; + } + + @Override + public Transaction beginTransaction(TxScope scope) { + return null; + } + + @Override + public Transaction currentTransaction() { + return null; + } + + @Override + public void flush() { + + } + + @Override + public void commitTransaction() { + + } + + @Override + public void rollbackTransaction() { + + } + + @Override + public void endTransaction() { + + } + + @Override + public void refresh(Object bean) { + + } + + @Override + public void refreshMany(Object bean, String propertyName) { + + } + + @Nullable + @Override + public T find(Class beanType, Object id) { + return null; + } + + @Nonnull + @Override + public T reference(Class beanType, Object id) { + return null; + } + + @Override + public ExtendedServer extended() { + return null; + } + + @Override + public void save(Object bean) throws OptimisticLockException { + + } + + @Override + public int saveAll(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int saveAll(Object... beans) throws OptimisticLockException { + return 0; + } + + @Override + public boolean delete(Object bean) throws OptimisticLockException { + return false; + } + + @Override + public boolean delete(Object bean, Transaction transaction) throws OptimisticLockException { + return false; + } + + @Override + public boolean deletePermanent(Object bean) throws OptimisticLockException { + return false; + } + + @Override + public boolean deletePermanent(Object bean, Transaction transaction) throws OptimisticLockException { + return false; + } + + @Override + public int deleteAllPermanent(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAllPermanent(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Override + public int delete(Class beanType, Object id) { + return 0; + } + + @Override + public int delete(Class beanType, Object id, Transaction transaction) { + return 0; + } + + @Override + public int deletePermanent(Class beanType, Object id) { + return 0; + } + + @Override + public int deletePermanent(Class beanType, Object id, Transaction transaction) { + return 0; + } + + @Override + public int deleteAll(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAll(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAll(Class beanType, Collection ids) { + return 0; + } + + @Override + public int deleteAll(Class beanType, Collection ids, Transaction transaction) { + return 0; + } + + @Override + public int deleteAllPermanent(Class beanType, Collection ids) { + return 0; + } + + @Override + public int deleteAllPermanent(Class beanType, Collection ids, Transaction transaction) { + return 0; + } + + @Override + public int execute(SqlUpdate sqlUpdate) { + return 0; + } + + @Override + public int execute(Update update) { + return 0; + } + + @Override + public int execute(Update update, Transaction transaction) { + return 0; + } + + @Override + public int execute(CallableSql callableSql) { + return 0; + } + + @Override + public void externalModification(String tableName, boolean inserted, boolean updated, boolean deleted) { + + } + + @Override + public T find(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public void save(Object bean, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public int saveAll(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Nonnull + @Override + public Set checkUniqueness(Object bean) { + return null; + } + + @Nonnull + @Override + public Set checkUniqueness(Object bean, Transaction transaction) { + return null; + } + + @Override + public void markAsDirty(Object bean) { + + } + + @Override + public void update(Object bean) throws OptimisticLockException { + + } + + @Override + public void update(Object bean, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public void updateAll(Collection beans) throws OptimisticLockException { + + } + + @Override + public void updateAll(Collection beans, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public void merge(Object bean) { + + } + + @Override + public void merge(Object bean, MergeOptions options) { + + } + + @Override + public void merge(Object bean, MergeOptions options, Transaction transaction) { + + } + + @Override + public void insert(Object bean) { + + } + + @Override + public void insert(Object bean, Transaction transaction) { + + } + + @Override + public void insertAll(Collection beans) { + + } + + @Override + public void insertAll(Collection beans, Transaction transaction) { + + } + + @Override + public int execute(SqlUpdate updSql, Transaction transaction) { + return 0; + } + + @Override + public int execute(CallableSql callableSql, Transaction transaction) { + return 0; + } + + @Override + public void execute(TxScope scope, Runnable runnable) { + + } + + @Override + public void execute(Runnable runnable) { + + } + + @Override + public T executeCall(TxScope scope, Callable callable) { + return null; + } + + @Override + public T executeCall(Callable callable) { + return null; + } + + @Override + public ServerCacheManager cacheManager() { + return null; + } + + @Override + public BackgroundExecutor backgroundExecutor() { + return null; + } + + @Override + public JsonContext json() { + return null; + } + + @Override + public ScriptRunner script() { + return null; + } + + @Override + public DocumentStore docStore() { + return null; + } + + @Override + public T publish(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public T publish(Class beanType, Object id) { + return null; + } + + @Override + public List publish(Query query, Transaction transaction) { + return null; + } + + @Override + public List publish(Query query) { + return null; + } + + @Override + public T draftRestore(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public T draftRestore(Class beanType, Object id) { + return null; + } + + @Override + public List draftRestore(Query query, Transaction transaction) { + return null; + } + + @Override + public List draftRestore(Query query) { + return null; + } + + @Override + public Set validateQuery(Query query) { + return null; + } + + @Override + public void truncate(String... tables) { + + } + + @Override + public void truncate(Class... tables) { + + } + + @Override + public DatabaseConfig getServerConfig() { + return null; + } + + @Override + public DatabasePlatform databasePlatform() { + return null; + } + + @Override + public List> beanTypes() { + return null; + } + + @Override + public BeanType beanType(Class beanClass) { + return null; + } + + @Override + public List> beanTypes(String baseTableName) { + return null; + } + + @Override + public BeanType beanTypeForQueueId(String queueId) { + return null; + } + + @Override + public BeanLoader beanLoader() { + return null; + } + + @Override + public void loadBeanRef(EntityBeanIntercept ebi) { + + } + + @Override + public void loadBeanL2(EntityBeanIntercept ebi) { + + } + + @Override + public void loadBean(EntityBeanIntercept ebi) { + + } +} diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index fb80fcabb..74eeec665 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -134,7 +134,7 @@ public class TestEncrypt extends BaseTestCase { assertEquals(EBasicEncrypt.Status.ONE, e2.getStatus()); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - DbEncrypt dbEncrypt = server.getDatabasePlatform().getDbEncrypt(); + DbEncrypt dbEncrypt = server.databasePlatform().getDbEncrypt(); if (dbEncrypt == null) { // can not test the where clause diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 376feef41..e6d75eef2 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -135,7 +135,7 @@ public class TestBatchInsertSimple extends BaseTestCase { Transaction transaction = Ebean.beginTransaction(); try { transaction.setBatchMode(true); - transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade())); + transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade())); transaction.setBatchSize(20); // escalate based on batchOnCascade value diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index a1a084dcb..947b904d4 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -90,7 +90,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { Transaction txn = server.beginTransaction(); try { assertThat(txn.isBatchMode()).isFalse(); - assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade())); + assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade())); failingOperation.run(); Assertions.fail("PersistenceException expected"); diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3e03fb46c..dee55eeea 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -92,6 +92,6 @@ public class TestElementCollectionBasicCache extends BaseTestCase { @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index a73e62c47..564c00b8d 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -98,6 +98,6 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 44cdee7e6..b20090a61 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -10,6 +10,7 @@ ebean ddl generation DDL and DB Migration generation ebean-ddl-generator + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index f5250827b..69a4af033 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -58,13 +58,13 @@ public class DdlGenerator implements SpiDdlGenerator { public DdlGenerator(SpiEbeanServer server) { this.server = server; - final DatabaseConfig config = server.getServerConfig(); + final DatabaseConfig config = server.config(); this.jaxbPresent = Detect.isJAXBPresent(config); this.generateDdl = config.isDdlGenerate(); this.extraDdl = config.isDdlExtra(); this.createOnly = config.isDdlCreateOnly(); this.dbSchema = config.getDbSchema(); - final DatabasePlatform databasePlatform = server.getDatabasePlatform(); + final DatabasePlatform databasePlatform = server.databasePlatform(); this.platform = databasePlatform.getPlatform(); this.platformName = platform.base().name(); if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) { @@ -150,7 +150,7 @@ public class DdlGenerator implements SpiDdlGenerator { private void createSchemaIfRequired(Connection connection) { try { for (String schema : dbSchema.split(",")) { - server.getDatabasePlatform().createSchemaIfNotExists(schema, connection); + server.databasePlatform().createSchemaIfNotExists(schema, connection); } } catch (SQLException e) { throw new PersistenceException("Failed to create DB Schema", e); @@ -231,7 +231,7 @@ public class DdlGenerator implements SpiDdlGenerator { * extra-ddl.xml should have some partition initialisation but this helps people get going. */ private void checkInitialTablePartitions(Connection connection) { - DatabasePlatform databasePlatform = server.getDatabasePlatform(); + DatabasePlatform databasePlatform = server.databasePlatform(); try { StringBuilder sb = new StringBuilder(); for (MTable table : currentModel.getPartitionedTables()) { @@ -255,11 +255,11 @@ public class DdlGenerator implements SpiDdlGenerator { } protected void runInitSql(Connection connection) throws IOException { - runResourceScript(connection, server.getServerConfig().getDdlInitSql()); + runResourceScript(connection, server.config().getDdlInitSql()); } protected void runSeedSql(Connection connection) throws IOException { - runResourceScript(connection, server.getServerConfig().getDdlSeedSql()); + runResourceScript(connection, server.config().getDdlSeedSql()); } protected void runResourceScript(Connection connection, String sqlScript) throws IOException { From a2f49a544cf1d4c741bf3a346fb196d1ec44d8b9 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sat, 4 Sep 2021 22:01:16 +1200 Subject: [PATCH 046/102] #2355 - Rename methods in SpiServer with deprecation --- .../main/java/io/ebeaninternal/server/core/DefaultServer.java | 2 +- ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index c4afdf5ab..27aae1b29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -305,7 +305,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DatabaseConfig getServerConfig() { + public DatabaseConfig config() { return config; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java index fdb304332..2ea3b617d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java @@ -592,7 +592,7 @@ public class TDSpiServer implements SpiServer { } @Override - public DatabaseConfig getServerConfig() { + public DatabaseConfig config() { return null; } From 4ce70e401d31102dc6e632ae38da9d91e0ee5075 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sat, 4 Sep 2021 22:24:59 +1200 Subject: [PATCH 047/102] No functional change - Simplify BeanDescriptor.isIdLoaded() --- .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 66610694b..6d2b7699b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -3087,7 +3087,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public boolean isIdLoaded(EntityBeanIntercept ebi) { // assume id loaded for IdClass case with idPropertyIndex == -1 - return idPropertyIndex == -1 ? true : ebi.isLoadedProperty(idPropertyIndex); + return idPropertyIndex == -1 || ebi.isLoadedProperty(idPropertyIndex); } boolean hasIdValue(EntityBean bean) { From 30aa05a243102cd51374ec9e9cac21f7305dd55a Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sun, 5 Sep 2021 10:54:17 +1200 Subject: [PATCH 048/102] [maven-release-plugin] prepare release ebean-parent-12.11.3 --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 9bb40a671..e297801c4 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 79101340c..ab8bc171e 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.3 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 5cd61b30c..af5dd7c30 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-api - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-core-type - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-ddl-generator - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-externalmapping-api - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-externalmapping-xml - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-autotune - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-querybean - 12.11.3-SNAPSHOT + 12.11.3 io.ebean querybean-generator - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean kotlin-querybean-generator - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean ebean-test - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean ebean-postgis - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-redis - 12.11.3-SNAPSHOT + 12.11.3 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index ebe821cc6..1943bfd01 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.3-SNAPSHOT + 12.11.3 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 3ca1e8a3b..cd8100a72 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.3 @@ -78,19 +78,19 @@ io.ebean ebean-api - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-core-type - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-externalmapping-api - 12.11.3-SNAPSHOT + 12.11.3 diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index b20090a61..ba77af78f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean ddl generation @@ -29,14 +29,14 @@ io.ebean ebean-core-type - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index f620a73b1..108ecc696 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 8fc4b1715..47153ad58 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.3 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.3-SNAPSHOT + 12.11.3 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean ebean-ddl-generator - 12.11.3-SNAPSHOT + 12.11.3 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 5fc612855..091431825 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.3-SNAPSHOT + 12.11.3 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 946d9c61a..8518e51e6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean querybean-generator - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean ebean-test - 12.11.3-SNAPSHOT + 12.11.3 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 0006d6a65..8a5bdff02 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean ebean-querybean - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean querybean-generator - 12.11.3-SNAPSHOT + 12.11.3 test io.ebean ebean-test - 12.11.3-SNAPSHOT + 12.11.3 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c8c51c856..7ce87af95 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 provided io.ebean ebean-ddl-generator - 12.11.3-SNAPSHOT + 12.11.3 diff --git a/ebean/pom.xml b/ebean/pom.xml index dcd62a0d1..6ed27d845 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 io.ebean ebean-querybean - 12.11.3-SNAPSHOT + 12.11.3 diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index b573491cb..1e082d4cc 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.3-SNAPSHOT + 12.11.3 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.3-SNAPSHOT + 12.11.3 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.3-SNAPSHOT + 12.11.3 test diff --git a/pom.xml b/pom.xml index 02228496e..d6038c767 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.3-SNAPSHOT + 12.11.3 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.3 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 540ef7273..7812e8670 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3-SNAPSHOT + 12.11.3 querybean generator From 23c5bd65cfab7f74f24b7c467c56364e430bd913 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sun, 5 Sep 2021 10:54:24 +1200 Subject: [PATCH 049/102] [maven-release-plugin] prepare for next development iteration --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index e297801c4..e6d69f2e2 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index ab8bc171e..fe5c2d720 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.3 + ebean-parent-12.8.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index af5dd7c30..0d6fea6c8 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-api - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-core-type - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-ddl-generator - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-autotune - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-querybean - 12.11.3 + 12.11.4-SNAPSHOT io.ebean querybean-generator - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean ebean-test - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean ebean-postgis - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-redis - 12.11.3 + 12.11.4-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 1943bfd01..b892e1dad 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.3 + 12.11.4-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index cd8100a72..fd7e161b4 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.3 + ebean-parent-12.8.0 @@ -78,19 +78,19 @@ io.ebean ebean-api - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-core-type - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.3 + 12.11.4-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index ba77af78f..f83727127 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean ddl generation @@ -29,14 +29,14 @@ io.ebean ebean-core-type - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 108ecc696..e09f3c5c0 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 47153ad58..ef434006e 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.3 + ebean-parent-12.8.0 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.3 + 12.11.4-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean ebean-ddl-generator - 12.11.3 + 12.11.4-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 091431825..765091145 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.3 + 12.11.4-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 8518e51e6..32ab014a6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean querybean-generator - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean ebean-test - 12.11.3 + 12.11.4-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 8a5bdff02..ec3dd66a3 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean ebean-querybean - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean querybean-generator - 12.11.3 + 12.11.4-SNAPSHOT test io.ebean ebean-test - 12.11.3 + 12.11.4-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7ce87af95..6d1f4224a 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.11.3 + 12.11.4-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 6ed27d845..02f283b23 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT io.ebean ebean-querybean - 12.11.3 + 12.11.4-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 1e082d4cc..c08f1eebc 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.3 + 12.11.4-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.3 + 12.11.4-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.3 + 12.11.4-SNAPSHOT test diff --git a/pom.xml b/pom.xml index d6038c767..c4e03b79a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.3 + 12.11.4-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.11.3 + ebean-parent-12.8.0 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 7812e8670..720713c49 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.3 + 12.11.4-SNAPSHOT querybean generator From bf70470b9aa25c3b9dfc079fb99aca43fcc6ae3b Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 16:55:11 +1200 Subject: [PATCH 050/102] Junit5 bump - remove parent junit dependency --- ebean-api/pom.xml | 7 +++++++ pom.xml | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index e6d69f2e2..db07c4dac 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -104,6 +104,13 @@ true + + org.avaje.composite + junit + 1.1 + test + + diff --git a/pom.xml b/pom.xml index c4e03b79a..0943bc0f6 100644 --- a/pom.xml +++ b/pom.xml @@ -65,13 +65,6 @@ test - - org.avaje.composite - junit - 1.1 - test - - From 0ddcfec70d706697ac5f3e075eebdeaed17b142b Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 17:49:06 +1200 Subject: [PATCH 051/102] Junit5 bump - ebean-ddl-generator, autotune and api --- ebean-api/pom.xml | 4 +- ebean-autotune/pom.xml | 4 +- .../service/AutoTuneXmlReaderTest.java | 2 +- .../autotune/service/ProfileOriginTest.java | 2 +- ebean-ddl-generator/pom.xml | 4 +- .../src/test/java/io/ebean/BaseTestCase.java | 33 ++++++------ .../java/io/ebean/ConditionalTestRunner.java | 48 ------------------ .../test/java/io/ebean/PlatformCondition.java | 37 ++++++++++++++ .../dbmigration/DbMigrationSqlServerTest.java | 13 ++--- .../DbMigrationDropHistoryTest.java | 2 +- .../dbmigration/DbMigrationGenerateTest.java | 2 +- .../dbmigration/DbMigrationTest.java | 2 +- .../dbmigration/DefaultDbMigrationTest.java | 4 +- .../dbmigration/H2PlatformTest.java | 2 +- .../dbmigration/HanaPlatformTest.java | 2 +- .../dbmigration/IndexMigrationTest.java | 2 +- .../dbmigration/LastMigrationTest.java | 2 +- .../dbmigration/MChecksumTest.java | 2 +- .../dbmigration/MySqlPlatformTest.java | 2 +- .../dbmigration/OraclePlatformTest.java | 2 +- .../dbmigration/PostgresPlatformTest.java | 2 +- .../dbmigration/SqlserverPlatformTest.java | 2 +- .../ddlgeneration/BaseDdlHandlerTest.java | 8 +-- .../platform/BaseTableDdlTest.java | 4 +- .../platform/ClickHouseDbArrayTest.java | 2 +- .../platform/DbNameNormaliseTest.java | 2 +- .../platform/H2HistoryDdlTest.java | 2 +- .../ddlgeneration/platform/HanaDdlTest.java | 4 +- .../platform/HistoryTableUpdateTest.java | 2 +- .../ddlgeneration/platform/IndexSetTest.java | 6 +-- .../platform/NativeDbArrayTest.java | 2 +- .../ddlgeneration/platform/OracleDdlTest.java | 2 +- .../platform/PlatformDdl_AlterColumnTest.java | 8 +-- .../platform/PlatformDdl_CreateIndexTest.java | 4 +- .../PlatformDdl_dropUniqueConstraintTest.java | 4 +- .../platform/PlatformTypeConverterTest.java | 2 +- .../platform/PostgresDdlTest.java | 2 +- .../platform/SqlServerHistoryDdlTest.java | 2 +- .../platform/util/VowelRemoverTest.java | 4 +- .../MigrationXmlWriterTest.java | 2 +- .../dbmigration/model/EntryTest.java | 2 +- .../dbmigration/model/MColumnTest.java | 2 +- .../dbmigration/model/MTableIdentityTest.java | 5 +- .../dbmigration/model/MTableTest.java | 16 +++--- .../model/MigrationVersionTest.java | 2 +- .../model/ModelContainerApplyTest.java | 2 +- .../dbmigration/model/ModelContainerTest.java | 4 +- .../dbmigration/model/ModelDiffTest.java | 2 +- .../dbmigration/model/PendingDropsTest.java | 50 +++++++++---------- .../build/ModelBuildBeanVisitorTest.java | 2 +- .../build/ModelBuild_compoundKeyTest.java | 2 +- .../ModelBuild_compound_IdClassTest.java | 2 +- .../ModelBuild_explicitSequencesTest.java | 2 +- .../company/domain/TestInheritAbstract.java | 21 ++++---- pom.xml | 7 +++ 55 files changed, 173 insertions(+), 185 deletions(-) delete mode 100644 ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java create mode 100644 ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index db07c4dac..e3872012e 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -105,9 +105,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index fe5c2d720..5248a7359 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -46,9 +46,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java index 845e68624..d67f2ec64 100644 --- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java +++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.autotune.service; import io.ebeaninternal.server.autotune.model.Autotune; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java index b1f982024..9f981a404 100644 --- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java +++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java @@ -5,7 +5,7 @@ import io.ebean.bean.ObjectGraphNode; import io.ebean.bean.ObjectGraphOrigin; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.autofetch.BaseTestCase; import org.tests.model.basic.Order; diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f83727127..31216b1a4 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -50,9 +50,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 5b76d754f..1d7d8d057 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -12,12 +12,8 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory; -import io.ebeaninternal.server.transaction.TransactionScopeManager; import org.assertj.core.api.AbstractCharSequenceAssert; -import org.junit.After; -import org.junit.Rule; -import org.junit.rules.TestName; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,25 +22,24 @@ import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; -@RunWith(ConditionalTestRunner.class) +@ExtendWith(PlatformCondition.class) public abstract class BaseTestCase { protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class); - @Rule public TestName name = new TestName(); - - @After - public void checkForLeak() { - TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope(); - SpiTransaction trans = scope.getInScope(); - if (trans != null) { - String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans; - scope.clearExternal(); // clear for next test - fail(msg); - } - } +// @Rule public TestName name = new TestName(); +// +// @After +// public void checkForLeak() { +// TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope(); +// SpiTransaction trans = scope.getInScope(); +// if (trans != null) { +// String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans; +// scope.clearExternal(); // clear for next test +// fail(msg); +// } +// } /** diff --git a/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java deleted file mode 100644 index d0dea0067..000000000 --- a/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.ebean; - -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; -import io.ebean.annotation.Platform; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; - -/** - * This testrunner checks for an {@link IgnorePlatform} annotation and ignores the test. - * - * @author Roland Praml, FOCONIS AG - */ -public class ConditionalTestRunner extends BlockJUnit4ClassRunner { - public ConditionalTestRunner(Class klass) throws InitializationError { - super(klass); - } - @Override - public void runChild(FrameworkMethod method, RunNotifier notifier) { - ForPlatform forPlatform = method.getAnnotation(ForPlatform.class); - if (forPlatform != null) { - if (!platformMath(forPlatform.value())) { - notifier.fireTestIgnored(describeChild(method)); - return; - } - } - - IgnorePlatform ignore = method.getAnnotation(IgnorePlatform.class); - - if (ignore == null || !platformMath(ignore.value())) { - super.runChild(method, notifier); - } else { - notifier.fireTestIgnored(describeChild(method)); - } - - } - private boolean platformMath(Platform[] platforms) { - Platform basePlatform = DB.getDefault().platform().base(); - for (Platform platform : platforms) { - if (platform.equals(basePlatform)) { - return true; - } - } - return false; - } -} diff --git a/ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java b/ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java new file mode 100644 index 000000000..b04f3db1c --- /dev/null +++ b/ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java @@ -0,0 +1,37 @@ +package io.ebean; + +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.lang.reflect.AnnotatedElement; +import java.util.Optional; + +public class PlatformCondition implements ExecutionCondition { + + private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled("ForPlatform is not present"); + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + Optional element = context.getElement(); + if (element.isPresent()) { + final ForPlatform annotation = element.get().getAnnotation(ForPlatform.class); + if (annotation != null && !platformMath(annotation.value())) { + return ConditionEvaluationResult.disabled("@ForPlatform"); + } + } + return ENABLED; + } + + private boolean platformMath(Platform[] platforms) { + Platform basePlatform = DB.getDefault().platform().base(); + for (Platform platform : platforms) { + if (platform.equals(basePlatform)) { + return true; + } + } + return false; + } +} diff --git a/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java index 2ee20516c..b30bcbc8b 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java @@ -2,16 +2,19 @@ package io.ebean.dbmigration; import io.ebean.annotation.Platform; import io.ebeaninternal.api.DbOffline; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; public class DbMigrationSqlServerTest { - @Test(expected = IllegalArgumentException.class) + @Test public void need_explicitPlatform() { - try { DbMigration dbMigration = DbMigration.create(); - dbMigration.setPlatform(Platform.SQLSERVER); + assertThrows(IllegalArgumentException.class, + () -> dbMigration.setPlatform(Platform.SQLSERVER)); } finally { DbOffline.reset(); } @@ -19,7 +22,6 @@ public class DbMigrationSqlServerTest { @Test public void explicit_16_isGood() { - DbMigration dbMigration = DbMigration.create(); dbMigration.setPlatform(Platform.SQLSERVER16); DbOffline.reset(); @@ -27,7 +29,6 @@ public class DbMigrationSqlServerTest { @Test public void explicit_17_isGood() { - DbMigration dbMigration = DbMigration.create(); dbMigration.setPlatform(Platform.SQLSERVER17); DbOffline.reset(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java index 320406a7c..56752e7f2 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java index f5bf01a56..cdfc3df13 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java @@ -4,7 +4,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index a659a2b65..6eacdc2ac 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -6,7 +6,7 @@ import io.ebean.SqlUpdate; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.dbmigration.ddlgeneration.Helper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java index 642b3dc2c..dc787935f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultDbMigrationTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java index 8f68a49d9..f282b75fc 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java index bd0dea4c5..5bafff7e0 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java @@ -5,7 +5,7 @@ import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java index a22a42ec7..f953088b9 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java index e0adf54b2..3571b21cc 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java index e52c43755..0f41e7ba0 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java index 69486c4c7..8cfcae78a 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java index ff7472eb5..9f38f6879 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.config.dbplatform.oracle.OraclePlatform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java index c18e224cf..a374afbeb 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java index 0230b3534..9d80285a2 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java @@ -5,7 +5,7 @@ import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index f9742350e..cef125750 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java @@ -11,8 +11,8 @@ import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.model.CurrentModel; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -223,7 +223,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast); } - @Ignore + @Disabled @Test public void generateChangeSetFromModel() throws Exception { @@ -243,7 +243,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast); } - @Ignore + @Disabled @Test public void generateChangeSetFromModel_given_postgresTypes() throws Exception { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index c32d6ad80..b087803db 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java @@ -13,13 +13,13 @@ import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateTable; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BaseTableDdlTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java index 181630396..7e9dc946c 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java index d2c8e855c..bbdb51294 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.DbConstraintNormalise; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 87441f89e..62b0f535c 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -9,7 +9,7 @@ import io.ebeaninternal.dbmigration.model.MConfiguration; import io.ebeaninternal.dbmigration.model.ModelContainer; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java index 6fc27e34d..3e467babe 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java @@ -3,11 +3,11 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; import io.ebeaninternal.dbmigration.migration.Column; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HanaDdlTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java index 7e9e2e490..a2f2c6080 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java index ce91ab2e1..8a171b52e 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class IndexSetTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java index 7d37363e4..3c609a2ba 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java index c9eb698ab..5d74e0b68 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.annotation.ConstraintMode; import io.ebean.config.dbplatform.oracle.OraclePlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 4b3044375..5da1a25a8 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -14,14 +14,14 @@ import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; import io.ebeaninternal.dbmigration.migration.Column; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PlatformDdl_AlterColumnTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java index 31cd89ae5..e7b8fab30 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java @@ -10,10 +10,10 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.migration.CreateIndex; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PlatformDdl_CreateIndexTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java index 3d345623b..0139565dd 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java @@ -8,9 +8,9 @@ import io.ebean.config.dbplatform.oracle.OraclePlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PlatformDdl_dropUniqueConstraintTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java index c6a9d1953..45dbd60b6 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java @@ -4,7 +4,7 @@ import io.ebean.config.dbplatform.DbPlatformTypeMapping; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java index 611ec94dd..3d12d29b7 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java index f1ac32365..73dd7c57f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java index 894760ce8..46318bbbd 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class VowelRemoverTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java index c0b87b47e..9805a263c 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.dbmigration.migrationreader; import io.ebeaninternal.dbmigration.migration.Migration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java index df9657e5d..7c2fe8de1 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration.model; import io.ebean.migration.MigrationVersion; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.DropColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java index 4cbd63cfa..29d01efdc 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.dbmigration.model; import io.ebeaninternal.dbmigration.migration.AlterColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java index 5c76d62c0..7774d91c2 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java @@ -6,11 +6,12 @@ import io.ebeaninternal.dbmigration.migration.CreateTable; import io.ebeaninternal.dbmigration.migration.IdentityType; import io.ebeaninternal.server.deploy.IdentityMode; import io.ebeaninternal.server.deploy.meta.DeployIdentityMode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigInteger; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class MTableIdentityTest { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java index 290cff30a..f3e2d5648 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java @@ -6,13 +6,12 @@ import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.DropColumn; import io.ebeaninternal.dbmigration.migration.DropHistoryTable; import io.ebeaninternal.dbmigration.migration.DropTable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.*; public class MTableTest { @@ -155,27 +154,26 @@ public class MTableTest { assertThat(base.getColumn("name")).isNull(); } - @Test(expected = IllegalStateException.class) + @Test public void test_apply_dropColumn_doesNotExist() { - MTable base = base(); DropColumn dropColumn = new DropColumn(); dropColumn.setTableName(base.getName()); dropColumn.setColumnName("DoesNotExist"); - base.apply(dropColumn); + assertThrows(IllegalStateException.class, () -> base.apply(dropColumn)); } - @Test(expected = IllegalStateException.class) + @Test public void test_apply_alterColumn_doesNotExist() { - MTable base = base(); AlterColumn alterColumn = new AlterColumn(); alterColumn.setTableName(base.getName()); alterColumn.setColumnName("DoesNotExist"); alterColumn.setType("integer"); - base.apply(alterColumn); + + assertThrows(IllegalStateException.class, () -> base.apply(alterColumn)); } @Test diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java index 87a4fecd9..b3c4d5240 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.model; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.migration.MigrationVersion; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java index 895b24f3f..da493f9ef 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.dbmigration.migration.CreateTable; import io.ebeaninternal.dbmigration.migration.DropColumn; import io.ebeaninternal.dbmigration.migration.Migration; import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java index c9c1dc8c0..c76906fd1 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.dbmigration.migration.DropIndex; import io.ebeaninternal.dbmigration.migration.DropTable; import io.ebeaninternal.dbmigration.migration.Migration; import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; @@ -158,7 +158,7 @@ public class ModelContainerTest { public void apply_renameColumn() { ModelContainer container = new ModelContainer(); container.apply(mig("6.0__renameColumn.model.xml"), ver("6.0")); - + final MTable table = container.getTable("document"); assertThat(table.getColumn("title")).isNotNull(); assertThat(table.getColumn("short_title")).isNull(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java index e2cdde859..15245e921 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.model; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java index df58fbc45..66e091aae 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java @@ -4,29 +4,29 @@ import io.ebean.migration.MigrationVersion; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.DropColumn; import io.ebeaninternal.dbmigration.migration.Migration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class PendingDropsTest { static final MigrationVersion V1_1 = MigrationVersion.parse("1.1"); - static final MigrationVersion V1_2 = MigrationVersion.parse("1.2"); @Test - public void test_add() throws Exception { + public void test_add() { PendingDrops pendingDrops = new PendingDrops(); pendingDrops.add(V1_1, new ChangeSet()); } @Test - public void test_appliedDropsFor_when_matchesSome_then_removesMatched() throws Exception { + public void test_appliedDropsFor_when_matchesSome_then_removesMatched() { PendingDrops pendingDrops = new PendingDrops(); @@ -45,7 +45,7 @@ public class PendingDropsTest { } @Test - public void test_appliedDropsFor_when_matchesAll_then_removesChangeSet() throws Exception { + public void test_appliedDropsFor_when_matchesAll_then_removesChangeSet() { PendingDrops pendingDrops = new PendingDrops(); @@ -63,7 +63,7 @@ public class PendingDropsTest { } @Test - public void test_appliedDropsFor_when_changeSetSuppressed_isIgnored() throws Exception { + public void test_appliedDropsFor_when_changeSetSuppressed_isIgnored() { PendingDrops pendingDrops = new PendingDrops(); @@ -81,7 +81,7 @@ public class PendingDropsTest { @Test - public void test_pendingDrops() throws Exception { + public void test_pendingDrops() { PendingDrops pendingDrops = new PendingDrops(); assertThat(pendingDrops.pendingDrops()).isEmpty(); @@ -92,7 +92,7 @@ public class PendingDropsTest { } @Test - public void test_pendingDrops_when_suppressForever() throws Exception { + public void test_pendingDrops_when_suppressForever() { PendingDrops pendingDrops = new PendingDrops(); assertThat(pendingDrops.pendingDrops()).isEmpty(); @@ -105,7 +105,7 @@ public class PendingDropsTest { } @Test - public void test_pendingDrops_when_both() throws Exception { + public void test_pendingDrops_when_both() { PendingDrops pendingDrops = new PendingDrops(); assertThat(pendingDrops.pendingDrops()).isEmpty(); @@ -119,7 +119,7 @@ public class PendingDropsTest { } @Test - public void test_migrationForVersion() throws Exception { + public void test_migrationForVersion() { PendingDrops pendingDrops = new PendingDrops(); @@ -137,7 +137,7 @@ public class PendingDropsTest { } @Test - public void test_migrationForVersion_when_both() throws Exception { + public void test_migrationForVersion_when_both() { PendingDrops pendingDrops = new PendingDrops(); @@ -153,7 +153,7 @@ public class PendingDropsTest { } @Test - public void test_migrationForVersion_when_next() throws Exception { + public void test_migrationForVersion_when_next() { PendingDrops pendingDrops = new PendingDrops(); MigrationVersion version = V1_1; @@ -168,32 +168,28 @@ public class PendingDropsTest { assertThat(pendingDrops.testContainsEntryFor(version)).isTrue(); } - @Test(expected = IllegalArgumentException.class) - public void test_migrationForVersion_when_next_isSuppressForever() throws Exception { - + @Test + public void test_migrationForVersion_when_next_isSuppressForever() { PendingDrops pendingDrops = new PendingDrops(); pendingDrops.add(V1_1, newSuppressForeverChangeSet()); - pendingDrops.migrationForVersion("next"); + assertThrows(IllegalArgumentException.class, () -> pendingDrops.migrationForVersion("next")); } - @Test(expected = IllegalArgumentException.class) - public void test_migrationForVersion_when_doesNotExist() throws Exception { - + @Test + public void test_migrationForVersion_when_doesNotExist() { PendingDrops pendingDrops = new PendingDrops(); - pendingDrops.migrationForVersion("1_1"); + assertThrows(IllegalArgumentException.class, () -> pendingDrops.migrationForVersion("1_1")); } - @Test(expected = IllegalArgumentException.class) - public void test_migrationForVersion_when_next_doesNotExist() throws Exception { - + @Test + public void test_migrationForVersion_when_next_doesNotExist(){ PendingDrops pendingDrops = new PendingDrops(); - pendingDrops.migrationForVersion("next"); + assertThrows(IllegalArgumentException.class, () -> pendingDrops.migrationForVersion("next")); } @Test - public void test_registerPendingHistoryDropColumns() throws Exception { - + public void test_registerPendingHistoryDropColumns() { TDModelContainer modelContainer = new TDModelContainer(); DropColumn drop1 = col("one"); @@ -210,7 +206,7 @@ public class PendingDropsTest { assertThat(modelContainer.drops).containsExactly(changeSet); } - class TDModelContainer extends ModelContainer { + static class TDModelContainer extends ModelContainer { List drops = new ArrayList<>(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java index 3d94d859f..70c0d70e1 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java @@ -15,7 +15,7 @@ import io.ebeaninternal.dbmigration.model.MCompoundForeignKey; import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.dbmigration.model.ModelContainer; import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java index 7db211782..3d95eb951 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java @@ -11,7 +11,7 @@ import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader; import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.dbmigration.model.ModelContainer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java index fa435937a..6cd16314d 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java @@ -11,7 +11,7 @@ import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader; import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.dbmigration.model.ModelContainer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java index b65a1b061..07f29e34e 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions; import io.ebeaninternal.dbmigration.ddlgeneration.Helper; import io.ebeaninternal.dbmigration.model.CurrentModel; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Person; import org.tests.model.basic.Phone; diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 4e4e5b64a..46596e2a3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -2,13 +2,16 @@ package org.tests.inheritance.company.domain; import io.ebean.Ebean; import io.ebean.EbeanServer; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Test; import java.util.List; -public class TestInheritAbstract extends TestCase { +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +public class TestInheritAbstract { + + @Test public void testMe() { EbeanServer server = Ebean.getServer(null); @@ -16,13 +19,13 @@ public class TestInheritAbstract extends TestCase { List list0 = server.find(AbstractBar.class) .findList(); - Assert.assertNotNull(list0); + assertNotNull(list0); List list1 = server.find(AbstractBar.class) .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list1); + assertNotNull(list1); Foo f = new Foo(); f.setImportantText("blah"); @@ -37,16 +40,14 @@ public class TestInheritAbstract extends TestCase { .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list2); - Assert.assertTrue(!list2.isEmpty()); + assertNotNull(list2); + assertThat(list2).isNotEmpty(); for (AbstractBar abstractBar : list2) { Foo foo = abstractBar.getFoo(); String importantText = foo.getImportantText(); - Assert.assertNotNull(importantText); + assertNotNull(importantText); } - - } } diff --git a/pom.xml b/pom.xml index 0943bc0f6..e1d70a943 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,13 @@ test + + com.h2database + h2 + 1.4.199 + test + + From a7462e86c8c274522ab2f7caf2569eeb8a16fd3a Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 17:49:23 +1200 Subject: [PATCH 052/102] Junit5 bump - ebean-ddl-generator, autotune and api --- .../java/io/ebean/config/dbplatform/DbDefaultValueTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/src/test/java/io/ebean/config/dbplatform/DbDefaultValueTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/DbDefaultValueTest.java index 2c94e989a..54c003c9c 100644 --- a/ebean-api/src/test/java/io/ebean/config/dbplatform/DbDefaultValueTest.java +++ b/ebean-api/src/test/java/io/ebean/config/dbplatform/DbDefaultValueTest.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; import java.time.LocalDate; From a6f27ca19fe23b246f9140741c35ee800abe5fe5 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 17:53:17 +1200 Subject: [PATCH 053/102] Junit5 bump - ebean-externalmapping-xml --- ebean-externalmapping-xml/pom.xml | 4 ++-- .../ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java | 4 ++-- .../java/org/tests/model/basic/test/NamedDtoQueryTest.java | 2 +- .../org/tests/model/basic/test/NamedLocalAndExternalTest.java | 2 +- .../tests/model/basic/test/OrderAggregateNamedRawSqlTest.java | 2 +- .../java/org/tests/model/basic/test/RawSqlOrmQueryTest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index ef434006e..bc2d2f3a8 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -71,9 +71,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java b/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java index b8586e3da..c76eda519 100644 --- a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java +++ b/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.xmlmapping.model; import io.ebeaninternal.xmlmapping.XmlMappingReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.InputStream; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class XmlMappingReaderTest { diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java index 86e40ee86..30a7c82a2 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java @@ -1,7 +1,7 @@ package org.tests.model.basic.test; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CustDto; import org.tests.model.basic.Customer; diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java index 61776857f..442f40269 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java @@ -3,7 +3,7 @@ package org.tests.model.basic.test; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java index 578c4a6d3..f28f01fb9 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java @@ -3,7 +3,7 @@ package org.tests.model.basic.test; import io.ebean.DB; import io.ebean.Query; import org.assertj.core.api.AbstractCharSequenceAssert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; public class OrderAggregateNamedRawSqlTest { diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java index 96667bb22..0e9350dc0 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java @@ -2,7 +2,7 @@ package org.tests.model.basic.test; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import java.util.List; From 43451c5342a1e5bfcf52a6e4afed1796bd703871 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 17:59:01 +1200 Subject: [PATCH 054/102] Junit5 bump - ebean-postgis --- ebean-postgis/pom.xml | 6 +++--- .../org/example/domain/TestInsertQuery.java | 14 ++++++------- .../example/domain/TestOtherInsertQuery.java | 18 ++++++++-------- .../java/org/example/domain/TestQuery.java | 21 ++++++++----------- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 765091145..cabdf629a 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -86,9 +86,9 @@ - org.avaje.composite - composite-testing - 3.1 + io.avaje + junit + 1.0 test diff --git a/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java index e5aba6a5f..c12d1765e 100644 --- a/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java +++ b/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java @@ -1,13 +1,13 @@ package org.example.domain; -import io.ebean.Ebean; +import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.postgis.LineString; import org.postgis.MultiLineString; import org.postgis.MultiPoint; import org.postgis.MultiPolygon; import org.postgis.Point; import org.postgis.Polygon; -import org.testng.annotations.Test; import java.sql.SQLException; import java.util.List; @@ -17,16 +17,16 @@ public class TestInsertQuery { /** * Not automated this test yet. */ - @Test(enabled = false) + @Test public void insert() throws SQLException { - List list = Ebean.find(MyBean.class).findList(); + List list = DB.find(MyBean.class).findList(); for (MyBean MyBean : list) { System.out.println(MyBean.getPoint()); } - List list1 = Ebean.find(MyBean.class) + List list1 = DB.find(MyBean.class) .where() .raw("st_within(st_pointfromwkb(st_point(?, ?), 4674), poly)", 1.9, 1.9) .findList(); @@ -50,10 +50,10 @@ public class TestInsertQuery { p.setMultiPoint(multiPoint); p.setMpoly(mpoly); - Ebean.save(p); + DB.save(p); List content = - Ebean.find(MyBean.class) + DB.find(MyBean.class) .select("ST_AsText(lineString)::String") .findSingleAttributeList(); diff --git a/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java index 316ab4bc1..2596c8936 100644 --- a/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java +++ b/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java @@ -1,6 +1,6 @@ package org.example.domain; -import io.ebean.Ebean; +import io.ebean.DB; import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; import org.geolatte.geom.codec.Wkt; @@ -8,9 +8,9 @@ import org.geolatte.geom.LineString; import org.geolatte.geom.MultiLineString; import org.geolatte.geom.MultiPoint; import org.geolatte.geom.MultiPolygon; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import java.sql.SQLException; import java.util.List; public class TestOtherInsertQuery { @@ -18,16 +18,16 @@ public class TestOtherInsertQuery { /** * Not automated this test yet. */ - @Test(enabled = false) - public void insert() throws SQLException { + @Disabled + @Test + public void insert() { - - List list = Ebean.find(OtherBeanGeoLatte.class).findList(); + List list = DB.find(OtherBeanGeoLatte.class).findList(); for (OtherBeanGeoLatte OtherBeanGeoLatte : list) { System.out.println(OtherBeanGeoLatte.getPoint()); } - List list1 = Ebean.find(OtherBeanGeoLatte.class) + List list1 = DB.find(OtherBeanGeoLatte.class) .where() .raw("st_within(st_pointfromwkb(st_point(?, ?), 4674), poly)", 1.9, 1.9) .findList(); @@ -52,6 +52,6 @@ public class TestOtherInsertQuery { p.setMultiPoint(multiPoint); p.setMultiLineString(multiLineString); - Ebean.save(p); + DB.save(p); } } diff --git a/ebean-postgis/src/test/java/org/example/domain/TestQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestQuery.java index 8fffb0047..b135d1709 100644 --- a/ebean-postgis/src/test/java/org/example/domain/TestQuery.java +++ b/ebean-postgis/src/test/java/org/example/domain/TestQuery.java @@ -10,13 +10,13 @@ import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; import org.geolatte.geom.PositionSequenceBuilders; import org.geolatte.geom.crs.CoordinateReferenceSystems; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.geolatte.geom.codec.Wkt.toWkt; -import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestQuery { @@ -88,20 +88,17 @@ public class TestQuery { ) ); - @BeforeTest + @BeforeEach public void setupObjects() { OtherBeanGeoLatte geoLatte = new OtherBeanGeoLatte(); geoLatte.setWgs84Point(wgs84Point); DB.save(geoLatte); } - @AfterTest + @AfterEach public void cleanup() { - DB - .find(MyBean.class) - .delete(); - DB.find(OtherBeanGeoLatte.class) - .delete(); + DB.find(MyBean.class).delete(); + DB.find(OtherBeanGeoLatte.class).delete(); } @Test From eae8bbac824da36143d9971a771f0fc9b5c9c5a4 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 18:05:11 +1200 Subject: [PATCH 055/102] Junit5 bump - ebean-querybean --- ebean-querybean/pom.xml | 4 +-- .../java/io/ebean/typequery/PBooleanTest.java | 2 +- .../org/querytest/FindNative_withSchema.java | 2 +- .../test/java/org/querytest/QContactTest.java | 2 +- .../org/querytest/QCustomerAndOrTest.java | 2 +- .../org/querytest/QCustomerByteArrayTest.java | 4 +-- .../QCustomerSimpleLikeQueryTest.java | 2 +- .../java/org/querytest/QCustomerTest.java | 30 ++++++++----------- .../test/java/org/querytest/QOrderTest.java | 10 +++---- .../test/java/org/querytest/TargetTest.java | 4 +-- 10 files changed, 28 insertions(+), 34 deletions(-) diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 32ab014a6..6c51f665b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -76,9 +76,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java index 283603c5f..365e5dc86 100644 --- a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java +++ b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java @@ -4,7 +4,7 @@ import io.ebeaninternal.server.expression.DefaultExpressionList; import io.ebeaninternal.server.expression.SimpleExpression; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java index 59146648d..db75b7541 100644 --- a/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java +++ b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java @@ -5,7 +5,7 @@ import org.example.domain.Customer; import org.example.domain.Order; import org.example.domain.OrderDetail; import org.example.domain.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/querytest/QContactTest.java b/ebean-querybean/src/test/java/org/querytest/QContactTest.java index ef0d5a01b..296aa5be6 100644 --- a/ebean-querybean/src/test/java/org/querytest/QContactTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QContactTest.java @@ -1,7 +1,7 @@ package org.querytest; import org.example.domain.query.QContact; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java index 231f4ae8d..b930c1509 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java @@ -1,7 +1,7 @@ package org.querytest; import org.example.domain.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java index c252530e6..2e796b606 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java @@ -4,10 +4,10 @@ import io.ebean.DB; import io.ebean.Database; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class QCustomerByteArrayTest { @Test diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java index 182e2b737..6641e138b 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java @@ -2,7 +2,7 @@ package org.querytest; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 223f62b0a..09e768966 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -19,11 +19,8 @@ import org.example.domain.otherpackage.ValidEmail; import org.example.domain.query.QAnimal; import org.example.domain.query.QContact; import org.example.domain.query.QCustomer; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.sql.DataSource; import java.sql.Connection; @@ -46,12 +43,10 @@ import static org.example.domain.query.QAddress.Alias.country; import static org.example.domain.query.QAddress.Alias.line1; import static org.example.domain.query.QContact.Alias.lastName; import static org.example.domain.query.QCustomer.Alias.billingAddress; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class QCustomerTest { - @Rule - public final TestName testName = new TestName(); - @Test public void findWithTransaction() { @@ -213,8 +208,7 @@ public class QCustomerTest { .findOne(); } - - @Ignore + @Disabled @Test public void arrayContains() { @@ -775,7 +769,7 @@ public class QCustomerTest { public void testFindSet() { Set customerSet = new QCustomer().findSet(); - Assert.assertNotNull(customerSet); + assertNotNull(customerSet); } @Test @@ -831,11 +825,11 @@ public class QCustomerTest { @Test public void testFetchByScalarValue() { Customer cust = new Customer(); - cust.setName(testName.getMethodName()); + cust.setName("testFetchByScalarValue"); cust.setPhoneNumber(new PhoneNumber("+18005555555")); cust.save(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByScalarValue") .phoneNumber.eq(new PhoneNumber("+18005555555")) .findOne()).isNotNull(); } @@ -844,23 +838,23 @@ public class QCustomerTest { @Test public void testFetchByComparableScalarValue() { Customer cust = new Customer(); - cust.setName(testName.getMethodName()); + cust.setName("testFetchByComparableScalarValue"); cust.setEmail(new ValidEmail("foo2@example.org")); cust.save(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.eq(new ValidEmail("foo2@example.org")) .findOne()).isNotNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.gt(new ValidEmail("foo2@example.org")) .findOne()).isNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.gt(new ValidEmail("foo1@example.org")) .findOne()).isNotNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.greaterOrEqualTo(new ValidEmail("foo2@example.org")) .findOne()).isNotNull(); } diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java index db899549c..09ef00aa2 100644 --- a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java @@ -8,9 +8,9 @@ import org.example.domain.Order; import org.example.domain.otherpackage.PhoneNumber; import org.example.domain.query.QCustomer; import org.example.domain.query.QOrder; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.List; @@ -55,12 +55,12 @@ public class QOrderTest { private static Order order; private static Customer customer; - @BeforeClass + @BeforeAll public static void before() { setupData(); } - @AfterClass + @AfterAll public static void after() { DB.delete(order); DB.delete(customer); diff --git a/ebean-querybean/src/test/java/org/querytest/TargetTest.java b/ebean-querybean/src/test/java/org/querytest/TargetTest.java index 8e83e5c05..9e3335b85 100644 --- a/ebean-querybean/src/test/java/org/querytest/TargetTest.java +++ b/ebean-querybean/src/test/java/org/querytest/TargetTest.java @@ -2,13 +2,13 @@ package org.querytest; import org.example.domain.query.QAreaImpl; import org.example.domain.query.QCityImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TargetTest { @Test public void test_oneToMany() { - + new QAreaImpl() .cities.fetch() .findList(); From 42645f72366b36c58f44d458ed8f2b26587bcd34 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 20:51:58 +1200 Subject: [PATCH 056/102] Junit5 bump - ebean-redis --- ebean-redis/pom.xml | 4 ++-- ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java | 2 +- ebean-redis/src/test/java/org/integration/ClusterTest.java | 2 +- .../src/test/java/org/integration/IntegrationTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ec3dd66a3..34831f325 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -55,9 +55,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java b/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java index 0b149bb87..35b757446 100644 --- a/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java +++ b/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java @@ -1,6 +1,6 @@ package io.ebean.redis; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index b895170f6..48d8c226d 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -7,7 +7,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import org.domain.query.QPerson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.sql.DataSource; diff --git a/ebean-redis/src/test/java/org/integration/IntegrationTest.java b/ebean-redis/src/test/java/org/integration/IntegrationTest.java index 5fb66aad6..343978d6f 100644 --- a/ebean-redis/src/test/java/org/integration/IntegrationTest.java +++ b/ebean-redis/src/test/java/org/integration/IntegrationTest.java @@ -3,7 +3,7 @@ package org.integration; import io.ebean.DB; import org.domain.Person; import org.domain.query.QPerson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.util.ArrayList; From 6227b081cf0d6ceb7d9dcb8a11b5fce4b3e2d3ff Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 20:55:09 +1200 Subject: [PATCH 057/102] Junit5 bump - ebean-test --- ebean-test/pom.xml | 4 ++-- ebean-test/src/test/java/io/ebean/test/DbJsonTest.java | 2 +- .../java/io/ebean/test/JsonAssertContainsTest.java | 2 +- ebean-test/src/test/java/io/ebean/test/JsonTest.java | 2 +- .../src/test/java/io/ebean/test/UserContextTest.java | 4 ++-- .../java/io/ebean/test/config/platform/ConfigTest.java | 6 +++--- .../test/config/provider/ProviderAutoConfigTest.java | 4 ++-- .../test/java/org/test/ForTestsBeforeAfterTest.java | 10 +++++----- ebean-test/src/test/java/org/test/ForTestsTest.java | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6d1f4224a..03bee753d 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -124,9 +124,9 @@ - junit + io.avaje junit - 4.13.1 + 1.0 test diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index 365c019cd..6950cdd59 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -2,7 +2,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.test.BSimpleWithGen; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java index 7f78c3782..1a2b9da5e 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java @@ -2,7 +2,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.stream.Stream; diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java index baf7a1563..ec98c86be 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java @@ -1,7 +1,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.test.PlainBean; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java index 750a256e0..7ab6826c9 100644 --- a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java +++ b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java @@ -1,8 +1,8 @@ package io.ebean.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class UserContextTest { diff --git a/ebean-test/src/test/java/io/ebean/test/config/platform/ConfigTest.java b/ebean-test/src/test/java/io/ebean/test/config/platform/ConfigTest.java index d4b23d844..b9cbae900 100644 --- a/ebean-test/src/test/java/io/ebean/test/config/platform/ConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/test/config/platform/ConfigTest.java @@ -2,8 +2,8 @@ package io.ebean.test.config.platform; import io.ebean.config.DatabaseConfig; import io.ebean.datasource.DataSourceConfig; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -145,7 +145,7 @@ public class ConfigTest { assertThat(config.ignoreDockerShutdown("./src/test/resources/file-does-not-exist")).isFalse(); } - @Ignore + @Disabled @Test public void run_local_only_ignoreDockerShutdown() { diff --git a/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java b/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java index 3468e9698..0a5ae9d42 100644 --- a/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java @@ -1,9 +1,9 @@ package io.ebean.test.config.provider; import io.ebean.config.ServerConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ProviderAutoConfigTest { diff --git a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java index 7392b117d..c59e77211 100644 --- a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java +++ b/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java @@ -3,9 +3,9 @@ package org.test; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -14,12 +14,12 @@ public class ForTestsBeforeAfterTest { private ForTests.RollbackAll rollbackAll; - @Before + @BeforeEach public void before() { rollbackAll = ForTests.createRollbackAll(); } - @After + @AfterEach public void after() { rollbackAll.close(); assertThat(getCount()).isEqualTo(0); diff --git a/ebean-test/src/test/java/org/test/ForTestsTest.java b/ebean-test/src/test/java/org/test/ForTestsTest.java index bdf766ce9..6d2ec5a9a 100644 --- a/ebean-test/src/test/java/org/test/ForTestsTest.java +++ b/ebean-test/src/test/java/org/test/ForTestsTest.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; From af8cf9c6c75500476bf0e12cad780f8954e269a3 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 20:57:48 +1200 Subject: [PATCH 058/102] Junit5 bump - querybean-generator --- kotlin-querybean-generator/pom.xml | 4 ++-- querybean-generator/pom.xml | 6 +++--- .../test/java/io/ebean/querybean/generator/SplitTest.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c08f1eebc..1747c3975 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -20,9 +20,9 @@ - org.avaje.composite + io.avaje junit - 5.0 + 1.0 test diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 720713c49..6a9960694 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -14,9 +14,9 @@ - org.avaje.composite - composite-testing - 3.1 + io.avaje + junit + 1.0 test diff --git a/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java b/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java index 3ea80d6e3..5adea7a02 100644 --- a/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java +++ b/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java @@ -1,13 +1,13 @@ package io.ebean.querybean.generator; +import org.junit.jupiter.api.Test; + import static java.util.Arrays.asList; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.HashSet; -import org.testng.annotations.Test; - public class SplitTest { @Test From 50bb7086ac81c95141dcc510318380e55715ff09 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 21:01:50 +1200 Subject: [PATCH 059/102] Junit5 bump - tidy ebean-test --- .../test/java/io/ebean/querybean/generator/SplitTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java b/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java index 5adea7a02..96b89c582 100644 --- a/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java +++ b/querybean-generator/src/test/java/io/ebean/querybean/generator/SplitTest.java @@ -11,14 +11,14 @@ import java.util.HashSet; public class SplitTest { @Test - public void shortName() throws Exception { + public void shortName() { assertEquals(Split.shortName("com.foo.domain.Customer"), "Customer"); assertEquals(Split.shortName("Customer"), "Customer"); } @Test - public void split_normal() throws Exception { + public void split_normal() { String[] split = Split.split("com.foo.domain.Customer"); @@ -27,7 +27,7 @@ public class SplitTest { } @Test - public void split_noPackage() throws Exception { + public void split_noPackage() { String[] split = Split.split("Customer"); @@ -36,7 +36,7 @@ public class SplitTest { } @Test - public void split_generics() throws Exception { + public void split_generics() { assertEquals("Foo>", Split.genericsSplit("com.Foo>").getKey()); assertEquals(new HashSet<>(asList("com.Foo", "com.Bar", "org.XFoo", "org.XBar")), Split.genericsSplit("com.Foo>").getValue()); } From 796edae614b627f082ad7df09b573a4c9b0b8fa2 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 21:37:14 +1200 Subject: [PATCH 060/102] Junit5 bump - tidy ebean-test --- .../io/ebean/test/config/provider/ProviderAutoConfigTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java b/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java index 0a5ae9d42..1ff9d0816 100644 --- a/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java @@ -1,13 +1,13 @@ package io.ebean.test.config.provider; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class ProviderAutoConfigTest { - private ProviderAutoConfig config = new ProviderAutoConfig(new ServerConfig()); + private final ProviderAutoConfig config = new ProviderAutoConfig(new DatabaseConfig()); @Test public void msg() { From 70a967a3a79bddcdcd4b385b57e66b3bee114052 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 13:23:27 +1200 Subject: [PATCH 061/102] Junit5 bump - ebean-core --- ebean-core/pom.xml | 13 +-- .../src/test/java/io/ebean/BaseTestCase.java | 21 +++-- .../src/test/java/io/ebean/ColumnTest.java | 2 +- .../java/io/ebean/ConditionalTestRunner.java | 48 ----------- .../src/test/java/io/ebean/DbPrimaryTest.java | 11 +-- .../src/test/java/io/ebean/DtoQuery2Test.java | 2 +- .../java/io/ebean/DtoQueryFromOrmTest.java | 10 +-- .../src/test/java/io/ebean/DtoQueryTest.java | 2 +- .../EbeanServerFactory_MultiTenancy_Test.java | 2 +- ...nServerFactory_ServerConfigStart_Test.java | 2 +- .../ebean/EbeanServer_deleteAllByIdTest.java | 4 +- .../io/ebean/EbeanServer_deleteByIdTest.java | 2 +- .../java/io/ebean/EbeanServer_deleteTest.java | 2 +- .../java/io/ebean/EbeanServer_eqlTest.java | 9 +-- .../java/io/ebean/EbeanServer_refresh.java | 4 +- .../io/ebean/EbeanServer_saveAllTest.java | 2 +- .../java/io/ebean/ExtendedServerTest.java | 7 +- .../test/java/io/ebean/FetchConfigTest.java | 2 +- .../test/java/io/ebean/FetchGroupTest.java | 2 +- .../test/java/io/ebean/PlatformCondition.java | 43 ++++++++++ .../src/test/java/io/ebean/PropertyTest.java | 6 +- .../test/java/io/ebean/SqlRowBooleanTest.java | 2 +- .../test/java/io/ebean/StringHelperTest.java | 10 +-- .../java/io/ebean/TestDirtyProperties.java | 58 +++++++------- .../java/io/ebean/TestFilterWithEnum.java | 8 +- .../io/ebean/TestUnsetLoadedProperties.java | 2 +- .../java/io/ebean/TextExpressionListTest.java | 2 +- .../java/io/ebean/TransactionalTestCase.java | 14 ++-- .../src/test/java/io/ebean/TxScopeTest.java | 6 +- .../test/java/io/ebean/UpdateQueryTest.java | 18 +++-- .../ebean/bean/EntityBeanInterceptTest.java | 6 +- .../java/io/ebean/cache/CacheKeyTest.java | 2 +- .../ebean/cache/ServerCacheManagerTest.java | 6 +- .../ebean/cache/ServerCacheOptionsTest.java | 2 +- .../java/io/ebean/common/BeanListTest.java | 2 +- .../java/io/ebean/common/BeanMapTest.java | 36 ++++----- .../java/io/ebean/common/BeanSetTest.java | 2 +- .../io/ebean/config/ContainerConfigTest.java | 4 +- .../io/ebean/config/DatabaseConfigTest.java | 10 +-- .../ebean/config/DbConstraintNamingTest.java | 2 +- .../ebean/config/DbMigrationConfigTest.java | 4 +- .../io/ebean/config/DocStoreConfigTest.java | 8 +- .../config/MatchingNamingConventionTest.java | 6 +- .../config/PlatformNoGeneratedKeysTest.java | 6 +- .../ebean/config/PropertiesWrapperTest.java | 10 +-- .../config/ServerConfigSqlServerTest.java | 13 ++- .../UnderscoreNamingConventionTest.java | 2 +- .../dbplatform/BasicSqlLimitOffsetTest.java | 2 +- .../BasicSqlStandardLimiterTest.java | 2 +- .../dbplatform/DatabasePlatformTest.java | 4 +- .../config/dbplatform/DbIdentityTest.java | 6 +- .../dbplatform/DbPlatformTypeLookupTest.java | 4 +- .../dbplatform/DbPlatformTypeMappingTest.java | 2 +- .../dbplatform/DbPlatformTypeParserTest.java | 4 +- .../config/dbplatform/DbTypeMapTest.java | 2 +- .../dbplatform/HanaHistorySupportTest.java | 6 +- .../config/dbplatform/HanaPlatformTest.java | 2 +- .../dbplatform/MySqlHistorySupportTest.java | 4 +- .../config/dbplatform/MySqlPlatformTest.java | 2 +- .../config/dbplatform/OraclePlatformTest.java | 2 +- .../PostgresHistorySupportTest.java | 4 +- .../dbplatform/PostgresPlatformTest.java | 2 +- .../SequenceBatchIdGeneratorTest.java | 2 +- .../dbplatform/SqlserverPlatformTest.java | 2 +- .../sqlserver/SqlServer2016PlatformTest.java | 4 +- .../sqlserver/SqlServerStepSequenceTest.java | 6 +- .../ebean/event/BeanFindControllerTest.java | 10 +-- .../event/BeanPersistControllerTest.java | 2 +- .../java/io/ebean/event/BeanPostLoadTest.java | 2 +- .../readaudit/ReadAuditQueryPlanTest.java | 6 +- .../test/java/io/ebean/json/EJsonTests.java | 4 +- .../java/io/ebean/plugin/BeanTypeTest.java | 30 +++---- .../io/ebean/plugin/ExpressionPathTest.java | 2 +- .../java/io/ebean/plugin/PropertyTest.java | 2 +- .../java/io/ebean/plugin/SpiServerTest.java | 12 +-- .../io/ebean/text/PathPropertiesTests.java | 8 +- .../ebean/text/json/JsonBeanReaderTest.java | 2 +- .../io/ebean/text/json/JsonContextTest.java | 14 ++-- .../text/json/JsonWriteOptionsTests.java | 6 +- .../io/ebean/util/CamelCaseHelperTest.java | 4 +- .../io/ebeaninternal/api/BindParamsTest.java | 4 +- .../ebeaninternal/api/HelpScopeTransTest.java | 15 ++-- .../ebeaninternal/api/PlatformMatchTest.java | 4 +- .../extraddl/model/ExtraDdlXmlReaderTest.java | 8 +- .../json/ModifyAwareMapTest.java | 32 ++++---- .../server/cache/CacheBeanDataTest.java | 6 +- .../cache/CachedBeanDataFromBeanTest.java | 4 +- .../cache/CachedBeanDataSerializeTest.java | 6 +- .../server/cache/DefaultCacheHolderTest.java | 2 +- ...faultCacheHolder_getCacheOptions_Test.java | 4 +- .../cache/DefaultServerCacheConfigTest.java | 4 +- .../cache/DefaultServerCacheManagerTest.java | 4 +- .../server/cache/DefaultServerCacheTest.java | 4 +- .../DefaultServerCache_RunEvictionTest.java | 6 +- .../changelog/ChangeJsonBuilderTest.java | 2 +- .../DefaultChangeLogListenerTest.java | 2 +- .../DefaultChangeLogRegisterTest.java | 4 +- .../BinaryTransactionEventReadWriteTest.java | 2 +- .../server/core/BasicTypeConverterTest.java | 6 +- .../server/core/BindPaddingTest.java | 4 +- ...faultServer_createOrmQueryRequestTest.java | 2 +- .../core/DefaultServer_getReferenceTest.java | 2 +- .../server/core/DtoQueryRequestTest.java | 4 +- .../server/core/InitDataSourceTest.java | 4 +- .../server/core/TestDiffHelpSimple.java | 61 +++++++------- .../server/core/TestDiffHelpWithEmbedded.java | 55 ++++++------- .../core/bootup/DistillPackagesTest.java | 2 +- .../core/bootup/ManifestReaderTest.java | 2 +- .../server/deploy/BeanCascadeInfoTest.java | 6 +- .../server/deploy/BeanDescriptorTest.java | 4 +- .../BeanDescriptor_documentMappingTest.java | 2 +- .../deploy/BeanDescriptor_registerTest.java | 4 +- ...eanDescriptor_whenCreatedPropertyTest.java | 6 +- .../server/deploy/BeanIudMetricsTest.java | 2 +- .../deploy/BeanPropertyAssocManyTest.java | 8 +- .../deploy/DeployPropertyParserMapTests.java | 7 +- .../deploy/DeployPropertyParserTest.java | 2 +- .../server/deploy/DetermineAggPathTest.java | 2 +- .../deploy/FormulaPropertyPathTest.java | 2 +- .../server/deploy/IndexDefinitionTest.java | 4 +- .../server/deploy/TableJoinColumnTest.java | 2 +- .../server/deploy/TableJoinTest.java | 2 +- .../TestBeanDescriptorHasIdProperty.java | 4 +- .../deploy/TestCollectionLoadedStatus.java | 17 ++-- .../deploy/TestDiffHelpInsertSimple.java | 2 +- .../TestDiffHelpInsertWithEmbedded.java | 2 +- .../deploy/TestNotEnhancedMappedSuper.java | 29 ++++--- ...estReferenceWithConstructorProperties.java | 10 +-- .../GeneratedCounterLongTest.java | 15 ++-- .../GeneratedInsertJavaTimeTest.java | 4 +- .../InsertTimestampFactoryTest.java | 4 +- .../UpdateTimestampFactoryTest.java | 4 +- .../deploy/parse/AnnotationClassTest.java | 2 +- .../server/dto/DtoMetaBuilderTest.java | 2 +- .../DefaultBackgroundExecutorTest.java | 9 +-- .../TestShutdownWithBackgroundTasks.java | 6 +- .../expression/AllEqualsExpressionTest.java | 2 +- .../expression/BetweenExpressionTest.java | 2 +- .../BetweenPropertyExpressionTest.java | 2 +- .../CaseInsensitiveEqualExpressionTest.java | 2 +- .../DefaultExampleExpressionTest.java | 2 +- .../DefaultExpressionFactoryTest.java | 2 +- .../expression/DefaultExpressionListTest.java | 2 +- .../expression/ExistsQueryExpressionTest.java | 2 +- .../server/expression/IdExpressionTest.java | 2 +- .../server/expression/IdInExpressionTest.java | 2 +- .../server/expression/InExpressionTest.java | 2 +- .../expression/InPairsExpressionTest.java | 6 +- .../expression/InQueryExpressionTest.java | 2 +- .../expression/InRangeExpressionTest.java | 2 +- .../IsEmptyExpressionQueryTest.java | 2 +- .../expression/JsonPathExpressionTest.java | 2 +- .../expression/JunctionExpressionTest.java | 2 +- .../server/expression/LikeExpressionTest.java | 2 +- .../expression/LogicExpressionTest.java | 2 +- .../server/expression/NoopExpressionTest.java | 2 +- .../server/expression/NotExpressionTest.java | 2 +- .../server/expression/NullExpressionTest.java | 2 +- .../expression/PrepareDocNestedTest.java | 6 +- .../expression/RawExpressionBuilderTest.java | 2 +- .../server/expression/RawExpressionTest.java | 2 +- .../server/expression/SameTest.java | 2 +- .../expression/SimpleExpressionTest.java | 2 +- .../platform/H2DbExpressionTest.java | 2 +- .../platform/HanaDbExpressionTest.java | 4 +- .../platform/MySqlDbExpressionTest.java | 4 +- .../platform/OracleDbExpressionTest.java | 2 +- .../expression/platform/PostgresCastTest.java | 2 +- .../platform/PostgresDbExpressionTest.java | 2 +- .../server/grammer/EqlParserTest.java | 31 ++++---- .../server/grammer/ParseFetchConfigTest.java | 4 +- .../server/idgen/TestUuidGenerator.java | 2 +- .../server/lib/ShutdownManagerTest.java | 17 ++-- .../server/loadcontext/DLoadContextTest.java | 2 +- .../server/persist/BatchDepthOrderTest.java | 4 +- .../server/persist/FlagsTest.java | 2 +- .../server/persist/TrimLogSqlTest.java | 2 +- .../profile/BasicProfileLocationTest.java | 2 +- .../server/profile/DTimedMetricMapTest.java | 2 +- .../server/profile/DTimedMetricTest.java | 2 +- .../server/profile/SortMetricTest.java | 4 +- .../server/profile/UtilLocationTest.java | 2 +- .../server/query/DbOrderByTrimTest.java | 4 +- .../server/query/DefaultSqlRowTest.java | 2 +- .../query/LimitOffsetPagedListTest.java | 4 +- .../server/query/OrderVersionDescTest.java | 4 +- .../server/query/RawSqlQueryPlanKeyTest.java | 2 +- .../server/query/SplitNameTest.java | 6 +- .../server/query/SqlTreeAliasTest.java | 4 +- .../server/query/SqlTreeBuilderTest.java | 4 +- .../TestFutureRowCountErrorHandling.java | 27 ++++--- .../server/querydefn/BindValuesKeyTest.java | 2 +- .../server/querydefn/DefaultOrmQueryTest.java | 2 +- .../querydefn/OrmQueryDetailParserTest.java | 28 +++---- .../server/querydefn/OrmQueryDetailTest.java | 4 +- .../server/querydefn/OrmQueryPlanKeyTest.java | 2 +- .../OrmQueryPropertiesParserTest.java | 2 +- .../querydefn/OrmQueryPropertiesTest.java | 2 +- .../querydefn/OrmUpdatePropertiesTest.java | 4 +- .../server/rawsql/ColumnMappingTest.java | 2 +- .../server/rawsql/DRawSqlServiceTest.java | 4 +- .../server/rawsql/RawSqlKeyTest.java | 2 +- .../server/rawsql/TestRawSqlBuilder.java | 6 +- .../rawsql/TestRawSqlBuilderDistinct.java | 18 +++-- .../rawsql/TestRawSqlColumnParsing.java | 4 +- .../server/rawsql/TestRawSqlParsing.java | 6 +- .../server/rawsql/TestRawSqlService.java | 2 +- .../server/text/json/DJsonScalarTest.java | 2 +- .../text/json/TestJsonWriteVisitor.java | 2 +- .../json/TestTextJsonBeanReadVisitor.java | 4 +- .../server/text/json/WriteJsonDirtyTest.java | 4 +- .../server/text/json/WriteJsonTest.java | 2 +- .../DefaultPersistenceContextTest.java | 6 +- .../DefaultProfileHandlerTest.java | 2 +- .../DefaultTransactionThreadLocalTest.java | 8 +- .../transaction/JdbcTransactionTest.java | 2 +- .../RemoteTransactionEventTest.java | 2 +- .../server/transaction/TableModStateTest.java | 6 +- .../transaction/TransactionManagerTest.java | 2 +- .../BasePlatformArrayTypeFactoryTest.java | 2 +- .../server/type/ConvertInetAddressTest.java | 4 +- .../server/type/ConvertInetAddressesTest.java | 4 +- .../server/type/DecimalUtilsTest.java | 4 +- .../server/type/DefaultTypeFactoryTest.java | 4 +- .../server/type/DefaultTypeManagerTest.java | 6 +- .../type/IsoJsonDateTimeParserTest.java | 2 +- .../ebeaninternal/server/type/JsonTester.java | 2 +- .../server/type/JsonTrimTest.java | 2 +- .../server/type/ModifyAwareFlagTest.java | 2 +- .../server/type/ModifyAwareListTest.java | 4 +- .../server/type/ModifyAwareMapTest.java | 2 +- .../server/type/ModifyAwareSetTest.java | 2 +- .../type/ScalarTypeArrayListH2Test.java | 2 +- .../server/type/ScalarTypeArrayListTest.java | 2 +- .../server/type/ScalarTypeArraySetH2Test.java | 2 +- .../server/type/ScalarTypeArraySetTest.java | 2 +- .../server/type/ScalarTypeBooleanTest.java | 8 +- .../server/type/ScalarTypeCalendarTest.java | 2 +- .../server/type/ScalarTypeDateTest.java | 4 +- .../server/type/ScalarTypeDurationTest.java | 17 ++-- .../type/ScalarTypeDurationWithNanosTest.java | 18 ++--- .../server/type/ScalarTypeInstantTest.java | 8 +- .../server/type/ScalarTypeIntegerTest.java | 2 +- .../type/ScalarTypeJodaLocalDateTest.java | 2 +- .../type/ScalarTypeJodaLocalDateTimeTest.java | 4 +- .../type/ScalarTypeJodaLocalTimeTest.java | 4 +- .../server/type/ScalarTypeJodaPeriodTest.java | 2 +- .../server/type/ScalarTypeJsonListTest.java | 2 +- .../server/type/ScalarTypeLocalDateTest.java | 6 +- .../type/ScalarTypeLocalDateTimeTest.java | 4 +- .../server/type/ScalarTypeLocalTimeTest.java | 18 ++--- .../ScalarTypeLocalTimeWithNanosTest.java | 20 ++--- .../server/type/ScalarTypeLongTest.java | 2 +- .../server/type/ScalarTypeMonthDayTest.java | 22 ++---- .../type/ScalarTypeOffsetDateTimeTest.java | 8 +- .../server/type/ScalarTypeOffsetTimeTest.java | 4 +- .../server/type/ScalarTypePathTest.java | 4 +- .../server/type/ScalarTypePeriodTest.java | 2 +- .../type/ScalarTypePostgresHstoreTest.java | 27 +++---- .../server/type/ScalarTypeTimestampTest.java | 2 +- .../server/type/ScalarTypeUUIDBaseTest.java | 2 +- .../server/type/ScalarTypeUtilDateTest.java | 2 +- .../type/ScalarTypeWrapperAdapterTest.java | 2 +- .../server/type/ScalarTypeWrapperOidTest.java | 2 +- .../type/ScalarTypeYearMonthDateTest.java | 4 +- .../server/type/ScalarTypeYearTest.java | 19 ++--- .../server/type/ScalarTypeZoneIdTest.java | 4 +- .../server/type/ScalarTypeZoneOffsetTest.java | 4 +- .../type/ScalarTypeZonedDateTimeTest.java | 4 +- .../server/type/TestBinaryUUID.java | 6 +- .../server/type/TestEnumToBeanType.java | 12 +-- .../server/type/TestLocaleParse.java | 40 +++++----- .../TestScalarTypeUUIDBinaryConversion.java | 15 ++-- .../server/type/TestTypeManager.java | 22 +++--- .../server/type/TypeReflectHelperTest.java | 2 +- .../server/type/UtilDateParserTest.java | 2 +- .../server/util/ArrayStackTest.java | 44 ++++------- .../server/util/BindParamsParserTest.java | 4 +- .../server/util/ChecksumTest.java | 2 +- .../server/util/DSelectColumnsParserTest.java | 2 +- .../io/ebeaninternal/server/util/Md5Test.java | 6 +- .../support/DocStoreBeanBaseAdapterTest.java | 2 +- .../api/support/DocStoreDeleteEventTest.java | 2 +- .../api/support/DocStoreIndexEventTest.java | 2 +- .../partition/MultiTenantPartitionTest.java | 6 +- .../TestAggregateFormula.java | 4 +- .../TestAggregateInheritFormula.java | 2 +- .../java/org/tests/basic/MainDbBoolean.java | 18 +++-- .../org/tests/basic/TestAnnotationBase.java | 8 +- .../tests/basic/TestAssocOneEqExpression.java | 9 ++- .../java/org/tests/basic/TestBatchLazy.java | 2 +- .../org/tests/basic/TestBatchLazyMany.java | 2 +- .../tests/basic/TestBeanReferenceRefresh.java | 23 +++--- .../org/tests/basic/TestCreateEntityBean.java | 6 +- .../tests/basic/TestDeleteByIdCollection.java | 22 +++--- .../basic/TestDeleteCascadingOneToMany.java | 2 +- .../basic/TestDeleteImportedPartial.java | 10 +-- .../org/tests/basic/TestDeleteOneToOne.java | 12 +-- .../basic/TestDeleteOneToOneMultiple.java | 10 +-- .../basic/TestDeletePartialNoVersion.java | 9 ++- .../org/tests/basic/TestDynamicUpdate.java | 13 +-- ...stEnhancementCollectionInitialisation.java | 10 +-- .../org/tests/basic/TestErrorBindLog.java | 9 ++- .../org/tests/basic/TestExplicitInsert.java | 16 ++-- .../java/org/tests/basic/TestFetchId.java | 6 +- .../java/org/tests/basic/TestIUDVanilla.java | 18 ++--- .../java/org/tests/basic/TestInEmpty.java | 4 +- .../java/org/tests/basic/TestInheritRef.java | 12 +-- .../java/org/tests/basic/TestJodaType.java | 6 +- .../org/tests/basic/TestJoinInheritance.java | 2 +- .../basic/TestLazyLoadEmptyOneToMany.java | 7 +- .../org/tests/basic/TestLazyLoadInCache.java | 6 +- .../java/org/tests/basic/TestLimitQuery.java | 31 ++++---- .../org/tests/basic/TestLoadBeanCache.java | 7 +- .../tests/basic/TestLogTransLogOnError.java | 16 ++-- .../org/tests/basic/TestM2MCascadeOne.java | 2 +- .../java/org/tests/basic/TestM2MVanilla.java | 22 +++--- .../org/tests/basic/TestManyLazyLoad.java | 10 +-- .../org/tests/basic/TestManyOneInterface.java | 2 +- .../java/org/tests/basic/TestMappedSuper.java | 7 +- .../org/tests/basic/TestMetaAnnotation.java | 6 +- .../tests/basic/TestMultipleOneToOneIUD.java | 24 +++--- .../tests/basic/TestNonUpdateProperty.java | 2 +- .../tests/basic/TestOrderByAnnotation.java | 10 +-- .../basic/TestOrderTotalAmountFormula.java | 2 +- .../basic/TestOrderTotalAmountReportBean.java | 14 +--- .../tests/basic/TestOrderTotalAmountSql.java | 9 ++- .../tests/basic/TestPersistenceContext.java | 21 ++--- .../org/tests/basic/TestQueryForUpdate.java | 4 +- .../basic/TestQueryForUpdatePostgresLock.java | 2 +- .../tests/basic/TestQueryUsingConnection.java | 4 +- .../tests/basic/TestQueryUsingDatabase.java | 10 +-- .../tests/basic/TestQueryWhereBetween.java | 11 +-- .../tests/basic/TestQueryWhereInRange.java | 2 +- .../org/tests/basic/TestQueryWithCache.java | 4 +- .../tests/basic/TestReadOnlyPropagation.java | 42 +++++----- .../tests/basic/TestSaveDeleteOneToOne.java | 10 +-- .../basic/TestSaveDeleteOneToOneMultiple.java | 11 ++- .../basic/TestSharedInstancePropagation.java | 4 +- .../java/org/tests/basic/TestTransient.java | 18 ++--- .../org/tests/basic/TestUpdateManyToOne.java | 2 +- .../java/org/tests/basic/TestUuidInsert.java | 2 +- .../basic/TestUuidInsertMasterDetail.java | 2 +- .../org/tests/basic/TestWhereAnnotation.java | 6 +- .../basic/delete/TestDeleteByIdList.java | 10 ++- .../basic/delete/TestDeleteCascadeById.java | 12 +-- .../delete/TestDeleteCascadeByQuery.java | 34 ++++---- .../org/tests/basic/encrypt/TestEncrypt.java | 4 +- .../basic/encrypt/TestEncryptBinary.java | 7 +- .../basic/encrypt/TestEncryptClientSide.java | 2 +- .../basic/event/TestPreInsertValidation.java | 11 +-- .../tests/basic/event/TestQueryAdapter.java | 2 +- .../tests/basic/join/TestSecondaryJoin.java | 2 +- .../basic/lob/TestBasicClobFetchEager.java | 12 +-- .../tests/basic/lob/TestBasicClobNoVer.java | 2 +- .../org/tests/basic/lob/TestByteOnly.java | 2 +- .../one2one/TestOne2OneBookingInvoice.java | 8 +- .../basic/one2one/TestOneToOneWheelTire.java | 2 +- .../basic/type/TestEnumValueAnnotation.java | 10 +-- .../basic/type/TestExtraScalarTypes.java | 12 +-- .../tests/basic/type/TestInetAddressType.java | 6 +- .../basic/type/TestQueryBooleanProperty.java | 2 +- .../org/tests/basic/type/TestSqlRowUUID.java | 6 +- .../tests/basic/type/TestTransientMap.java | 2 +- .../batchinsert/TestBatchInsertFlush.java | 4 +- .../batchinsert/TestBatchInsertOneToOne.java | 2 +- .../batchinsert/TestBatchInsertSimple.java | 6 +- ...tBatchInsertWithInitialisedCollection.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 2 +- .../TestBatchSaveWithGetBeanId.java | 4 +- .../org/tests/batchload/TestBasicLazy.java | 47 +++++------ .../tests/batchload/TestBasicNavOnEmpty.java | 7 +- .../batchload/TestBatchLazyWithCacheHits.java | 6 +- .../batchload/TestBatchLazyWithDeleted.java | 15 ++-- .../org/tests/batchload/TestBeanState.java | 15 ++-- .../batchload/TestEmptyManyLazyLoad.java | 2 +- .../org/tests/batchload/TestLazyJoin.java | 7 +- .../org/tests/batchload/TestLazyJoin2.java | 19 ++--- .../TestLazyLoadEmptyCollection.java | 2 +- .../TestLazyLoadNonExistantBean.java | 9 ++- .../TestLazyLoadNonExistentBean.java | 9 ++- .../batchload/TestQueryDisableLazyLoad.java | 6 +- .../org/tests/batchload/TestQueryJoin.java | 27 ++++--- .../batchload/TestQueryJoinToAssocOne.java | 2 +- .../batchload/TestSecondQueryNoRows.java | 6 +- .../tests/batchload/TestSecondaryQueries.java | 8 +- .../java/org/tests/cache/TestBeanCache.java | 4 +- .../cache/TestBeanCacheContactLazyLoad.java | 2 +- .../cache/TestBeanCacheWithDeleteQuery.java | 8 +- .../tests/cache/TestBeanFetchJoinCache.java | 2 +- .../java/org/tests/cache/TestCacheBasic.java | 61 +++++++------- .../tests/cache/TestCacheCollectionIds.java | 22 +++--- .../org/tests/cache/TestCacheCustomer.java | 7 +- .../java/org/tests/cache/TestCacheDelete.java | 4 +- .../org/tests/cache/TestCacheEmbeddedId.java | 4 +- .../TestCacheInterceptSaveWhenLazyLoaded.java | 6 +- .../org/tests/cache/TestCacheManyToOne.java | 4 +- .../org/tests/cache/TestCacheNaturalId.java | 8 +- .../tests/cache/TestExternalNotification.java | 8 +- .../cache/TestL2CacheWithSharedBean.java | 9 +-- .../cache/TestL2DirtyFlagOnLazyLoad.java | 8 +- .../java/org/tests/cache/TestM2MCache.java | 2 +- .../java/org/tests/cache/TestQueryCache.java | 29 +++---- .../tests/cache/TestQueryCacheCountry.java | 17 ++-- .../org/tests/cache/TestQueryCacheInsert.java | 8 +- .../tests/cache/TestQueryCacheReadOnly.java | 8 +- .../cache/TestQueryCacheTableDependency.java | 2 +- .../TestBeanCacheEmbeddedIdPrimitives.java | 4 +- .../cache/personinfo/PersonCacheTests.java | 4 +- .../cache/personinfo/TestStringIdOnly.java | 2 +- .../org/tests/callable/TestMysqlCallable.java | 8 +- .../TestCascadeOrphanStatelessUpdate.java | 4 +- .../tests/cascade/TestDeleteO2MOrphans.java | 2 +- .../tests/cascade/TestJsonMarshallingOTM.java | 2 +- .../tests/cascade/TestMasterDetailDelete.java | 2 +- .../tests/cascade/TestMultiCascadeBatch.java | 10 +-- .../tests/cascade/TestOnlyKillOrphans.java | 2 +- .../org/tests/cascade/TestOrderedList.java | 2 +- .../org/tests/cascade/TestPrivateOwned.java | 6 +- .../TestPrivateOwnedAddRemoveOrphan.java | 7 +- .../cascade/TestPrivateOwnedCascadeOrder.java | 2 +- ...TestPrivateOwnedIgnoreTransientOrphan.java | 10 ++- .../org/tests/changelog/TestChangeLog.java | 34 +++----- .../org/tests/changelog/TestChangeLogInt.java | 2 +- .../tests/compositekeys/TestCKeyDelete.java | 6 +- .../compositekeys/TestCKeyIdInExpression.java | 11 +-- .../tests/compositekeys/TestCKeyLazyLoad.java | 6 +- ...aoCompositeKeyWithAnnotationOverrides.java | 2 +- .../org/tests/compositekeys/TestCore.java | 22 ++---- ...ascadeDeleteChildrenWithCompositeKeys.java | 8 +- .../java/org/tests/config/TestTableName.java | 35 ++++---- .../contructor/TestProtectedConstructor.java | 13 +-- .../org/tests/ddd/iud/TestDExhEntityEl.java | 5 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 4 +- .../org/tests/ddd/iud/TestDPersonIUD.java | 6 +- .../org/tests/ddl/TestForeignKeyModes.java | 2 +- .../org/tests/defaultvalues/TestDefaults.java | 2 +- .../delete/TestDeleteByIdUsingModel.java | 6 +- .../TestDeleteByIdWithPersistenceContext.java | 10 +-- .../org/tests/delete/TestDeleteByQuery.java | 2 +- .../delete/TestDeleteCascadeWithListener.java | 2 +- .../TestDeleteWithoutOptimisticLocking.java | 2 +- .../tests/docstore/CustomerReportTest.java | 2 +- .../java/org/tests/draftable/DocLinkTest.java | 12 +-- .../tests/draftable/LinkQueryPublishTest.java | 2 +- .../org/tests/draftable/OrganisationTest.java | 6 +- .../test/java/org/tests/el/TestELBasic.java | 45 +++++------ .../java/org/tests/el/TestPathExpression.java | 4 +- .../org/tests/el/TestUnderscoreParam.java | 2 +- .../org/tests/embedded/TestEmbeddedEmpty.java | 2 +- .../TestConstructorManyAddAll.java | 2 +- .../TestConstructorPutfieldReplacement.java | 10 +-- .../enhancement/TestEnhancementEquals.java | 19 ++--- .../bitwise/TestBitwiseExpressions.java | 2 +- .../org/tests/family/TestInheritance.java | 10 +-- .../generated/TestGeneratedProperties.java | 4 +- .../org/tests/generated/TestGeneratedWho.java | 8 +- .../org/tests/genkey/TestGeneratedKeys.java | 12 +-- .../java/org/tests/genkey/TestSeqBatch.java | 13 ++- .../org/tests/history/TestHistoryInsert.java | 2 +- .../java/org/tests/idkeys/TestCustomId.java | 6 +- .../org/tests/idkeys/TestGeneratedKeys.java | 8 +- .../java/org/tests/idkeys/TestLazyLoad.java | 4 +- .../org/tests/idkeys/TestSimpleIdInsert.java | 12 +-- .../org/tests/inherit/InheritDiscIntTest.java | 4 +- .../TestDuplicateKeyException.java | 7 +- .../tests/inheritance/TestInheritInsert.java | 8 +- .../TestInheritanceBatchLazyLoad.java | 2 +- ...estInheritanceDiscriminatorQueryCache.java | 2 +- .../inheritance/TestInheritanceJoins.java | 15 ++-- .../inheritance/TestInheritanceOnMany.java | 6 +- .../TestInheritanceOrderColumn.java | 2 +- .../inheritance/TestInheritanceQuery.java | 2 +- .../inheritance/TestInheritanceRawSql.java | 11 +-- .../inheritance/TestInheritanceRefBean.java | 6 +- .../org/tests/inheritance/TestIntInherit.java | 11 +-- .../inheritance/TestNpeOnDiscriminator.java | 2 +- .../org/tests/inheritance/TestSkippable.java | 15 ++-- .../inheritance/TestTreeOrganisations.java | 4 +- .../abstrakt/TestInheritanceNum.java | 2 +- .../bothsides/TestInheritanceBothSides.java | 2 +- .../cache/TestInheritCacheRefLoad.java | 13 +-- .../cache/TestInheritanceCache.java | 2 +- .../cache/TestInheritanceRefCache.java | 2 +- .../TestInheritanceDeleteCascade.java | 4 +- .../company/domain/TestInheritAbstract.java | 19 +++-- .../tests/insert/TestInsertCheckUnique.java | 6 +- .../tests/insert/TestInsertCollection.java | 29 ++++--- .../TestInsertDataIntegrityException.java | 11 ++- .../tests/insert/TestInsertDuplicateKey.java | 31 ++++---- .../tests/insert/TestInsertOnStringKey.java | 2 +- .../tests/insert/TestInsertWithIdAndUuid.java | 2 +- .../org/tests/insert/TestOnlyIdEntity.java | 2 +- .../insert/TestSaveWithDaylightSavings.java | 2 +- .../java/org/tests/iud/TestCarWheelIud.java | 2 +- .../java/org/tests/iud/TestInfoOneToOne.java | 6 +- .../org/tests/iud/TestInsertQueryUpdate.java | 7 +- .../org/tests/iud/TestInsertUpdateTrans.java | 18 +++-- .../org/tests/iud/TestPersistCascade.java | 2 +- .../org/tests/json/TestDbJson_Jackson.java | 2 +- .../org/tests/json/TestDbJson_Jackson2.java | 2 +- .../org/tests/json/TestDbJson_Jackson3.java | 2 +- .../java/org/tests/json/TestDbJson_List.java | 10 +-- .../java/org/tests/json/TestJsonMapBasic.java | 4 +- .../java/org/tests/json/TestJsonMapBlob.java | 4 +- .../java/org/tests/json/TestJsonMapClob.java | 4 +- .../java/org/tests/json/TestJsonMapJsonB.java | 4 +- .../org/tests/json/TestJsonMapVarchar.java | 4 +- .../org/tests/json/TestJsonNodeBasic.java | 10 +-- .../java/org/tests/json/TestJsonNodeBlob.java | 4 +- .../org/tests/json/TestJsonNodeJsonb.java | 4 +- .../org/tests/json/TestJsonNodeVarchar.java | 4 +- .../org/tests/json/TestJsonNullValues.java | 2 +- .../java/org/tests/json/TestOldValue.java | 24 +++--- .../tests/json/TestUnmappedProperties.java | 2 +- .../include/TestJsonExcludeEmptyList.java | 4 +- .../json/include/TestJsonExcludeEmptyMap.java | 4 +- .../json/include/TestJsonExcludeEmptySet.java | 4 +- .../json/include/TestJsonExcludeNull.java | 4 +- .../TestJsonExcludeTransientEmptyList.java | 4 +- .../TestJacksonIgnore.java | 4 +- .../transientproperties/TestModelAJson.java | 2 +- .../TestTransientListProperty.java | 4 +- .../TestTransientObjectProperty.java | 4 +- .../lazyforeignkeys/TestLazyForeignKeys.java | 14 ++-- .../BeanCollectionLazyLoadingTest.java | 2 +- .../org/tests/level/test/ManyToManyTest.java | 6 +- .../lifecycle/TestLifecycleAnnotatedBean.java | 2 +- .../lifecycle/TestLifecycleExceptions.java | 2 +- .../tests/lifecycle/TestLifecycleWithLog.java | 2 +- .../m2m/TestM2MDeleteCascadeFromParent.java | 4 +- .../org/tests/m2m/TestM2MDeleteNoCascade.java | 6 +- .../TestM2MDeleteObjectWithCascadeToM2m.java | 17 ++-- .../tests/m2m/TestM2MDeleteWithCascade.java | 12 +-- .../tests/m2m/TestM2MDistinct_sqlServer.java | 2 +- .../java/org/tests/m2m/TestM2MModifyTest.java | 2 +- .../org/tests/m2m/TestM2MMultipleLists.java | 4 +- .../tests/m2m/TestM2MSelfRelationship.java | 2 +- .../org/tests/m2m/TestM2mDeleteObject.java | 16 ++-- .../softdelete/TestM2MSoftDeleteExists.java | 4 +- .../java/org/tests/merge/TestMergeBasic.java | 2 +- .../org/tests/merge/TestMergeCustomer.java | 2 +- .../java/org/tests/merge/TestMergeM2M.java | 2 +- .../org/tests/mockito/TestMockitoMock.java | 2 +- .../aggregation/TestAggregationMany.java | 2 +- .../aggregation/TestAggregationTopLevel.java | 6 +- .../tests/model/array/TestDbArray_asSet.java | 4 +- .../tests/model/array/TestDbArray_basic.java | 6 +- .../cache/TestCacheViaComplexNaturalKey.java | 2 +- .../cache/TestCacheViaComplexNaturalKey3.java | 2 +- .../basic/cache/TestCacheWithSoftDelete.java | 2 +- .../basic/cache/TestNatKeyCacheWhenNull.java | 2 +- .../cache/TestNatKeyCacheWithForeignKey.java | 2 +- .../model/basic/cache/TestNatKeyUid.java | 4 +- .../model/basic/first/TestFirstSecond.java | 2 +- .../basic/mapsuper/TestMapSuperEquals.java | 14 ++-- .../org/tests/model/basic/xtra/DummyDao.java | 6 +- .../OptimisticLockExceptionThrowingDao.java | 17 ++-- .../xtra/TestDeleteUnloadedChildren.java | 2 +- .../TestInsertBatchThenFlushThenUpdate.java | 6 +- .../basic/xtra/TestInsertBatchThenUpdate.java | 2 +- ...TestInsertBatchWithDifferentRootTypes.java | 4 +- .../bridge/TestExplicitM2MBridgeTable.java | 2 +- .../tests/model/bridge/TestIdClassScalar.java | 2 +- .../TestInheritSoftDeleteJoin.java | 2 +- .../TestMTOInheritNoDiscriminator.java | 2 +- .../TestTruckCarWheelInhertiance.java | 2 +- .../composite/TestCompositeKeyUserClient.java | 2 +- .../model/ddd/TestScalarTypeConverter.java | 2 +- .../elementcollection/EcmPersonTest.java | 2 +- .../elementcollection/EcsPersonTest.java | 2 +- .../TestElementCollectionBasic.java | 2 +- .../TestElementCollectionBasicCache.java | 2 +- .../TestElementCollectionBasicMap.java | 2 +- .../TestElementCollectionBasicMapAsLob.java | 2 +- .../TestElementCollectionBasicMapCache.java | 2 +- .../TestElementCollectionBasicSet.java | 2 +- .../TestElementCollectionCascade.java | 2 +- .../TestElementCollectionCascadeMultiple.java | 2 +- .../TestElementCollectionEmbeddedList.java | 2 +- ...estElementCollectionEmbeddedListCache.java | 2 +- .../TestElementCollectionEmbeddedMap.java | 2 +- ...TestElementCollectionEmbeddedMapCache.java | 2 +- .../TestElementCollectionEnumSet.java | 2 +- .../TestElementCollectionResused.java | 2 +- .../embedded/TestEmbeddedAttrOverride.java | 2 +- .../TestEmbeddedEqualsWhenCreated.java | 4 +- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../TestEmbeddedNullableOverride.java | 4 +- .../model/history/TestHistoryEmbeddedId.java | 4 +- .../model/history/TestHistoryExclude.java | 2 +- .../model/history/TestHistoryInclude.java | 2 +- .../model/history/TestHistoryOneToMany.java | 2 +- .../TestHistorySoftDeleteOneToOne.java | 2 +- .../test/TestInheritExposeDtype.java | 2 +- .../TestMediaInheritanceJoinToMany.java | 7 +- .../tests/model/interfaces/TestSelfMany.java | 2 +- .../model/interfaces/TestTargetEntity.java | 2 +- .../ivo/test/TestAttributeConverter.java | 2 +- .../model/joda/TestJodaInsertUpdate.java | 8 +- .../model/json/TestJacksonPlainBean.java | 2 +- .../TestWithCacheAndLazyLoad.java | 2 +- .../model/lazywithid/TestColumnIdName.java | 2 +- .../tests/model/m2m/TestM2MDoubleInsert.java | 2 +- .../org/tests/model/m2m/TestM2MWithWhere.java | 2 +- .../tests/model/m2o/TestManyToOneAsOne.java | 2 +- .../model/map/BeanMapOrphanRemovalTest.java | 2 +- .../java/org/tests/model/nofk/Test2NoFk.java | 10 +-- .../java/org/tests/model/nofk/TestNoFk.java | 16 ++-- .../org/tests/model/nofk/TestTruncate.java | 2 +- .../tests/model/noid/TestInsertNoIdBean.java | 16 ++-- .../onetoone/TestOneToOneCascadeSave.java | 12 ++- .../TestOneToOneImportedPkNative.java | 2 +- .../onetoone/TestOneToOneJoinColumn.java | 2 +- .../onetoone/TestOneToOneManyDelete.java | 2 +- .../TestOneToOneOptionalRelationship.java | 44 +++++------ .../onetoone/TestOneToOneOrphanRemove.java | 2 +- .../onetoone/TestOneToOneOrphanStringId.java | 2 +- .../onetoone/TestOneToOnePrimaryKeyJoin.java | 2 +- .../TestOneToOnePrimaryKeyJoinBidi.java | 2 +- .../TestOneToOnePrimaryKeyJoinOptional.java | 2 +- .../onetoone/TestOneToOneSoftDeleteChild.java | 2 +- .../album/DeleteById_SoftDelete_Tests.java | 6 +- .../album/TestOneToOneHardDelete.java | 2 +- .../TestOneToOnePrimaryKeyJoinMapping.java | 2 +- .../TestOrphanRemovalOverwrite.java | 13 ++- .../orphanremoval/TestOrphanRemoveO2M.java | 2 +- .../TestOrphanRemoveO2MFlat.java | 2 +- .../model/prnt/TestPrinterStateIssue.java | 2 +- .../java/org/tests/model/pview/TestPview.java | 2 +- .../selfref/TestResourceFileSelfRef.java | 2 +- .../model/selfref/TestSelfRefExample.java | 4 +- .../model/selfref/TestTextJsonSelfRef.java | 7 +- .../org/tests/model/site/TestTreeModel.java | 2 +- .../tests/model/survey/TestOrderByFetch.java | 4 +- .../tevent/TestAssocOneNullTraverse.java | 2 +- .../uuidsibling/SoftDeleteCascadeTest.java | 37 +++------ .../TestVersionHierarchyModification.java | 10 +-- .../tests/model/view/TestViewBaseEntity.java | 2 +- .../org/tests/model/zero/TestWithZero.java | 6 +- .../tests/o2m/TestOneToManyNoMappedBy.java | 6 +- .../org/tests/o2m/TestOneToManyOnlyBean.java | 8 +- .../org/tests/o2m/TestOneToManyWhere.java | 2 +- .../org/tests/o2m/TestOneToManyWildcard.java | 2 +- .../o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../TestOneToManyJoinTableInheritance.java | 2 +- .../TestOneToManyJoinTableNoTableName.java | 2 +- .../tests/o2m/lazy/TestLazyManyViaPath.java | 2 +- .../o2o/TestOneToOneSaveWithoutChanges.java | 2 +- .../java/org/tests/o2o/TestReferenceSave.java | 2 +- .../java/org/tests/order/TestOrderColumn.java | 2 +- ...stPersistenceContextOnUpdateDuringTxn.java | 2 +- .../TestPersistenceContextQueryScope.java | 6 +- ...estPersistenceContextScopeUsingOrders.java | 6 +- .../TestPersistenceContextServerConfig.java | 4 +- .../tests/profile/ProfileLocationTest.java | 2 +- .../TestAddOrderByWithFirstRowsMaxRows.java | 2 +- .../query/TestAutofetchTuneWithJoin.java | 2 +- .../query/TestConnectionCloseOnSqlerr.java | 9 ++- .../org/tests/query/TestDefaultFetchLazy.java | 21 ++--- .../query/TestExprNestedDisjunction.java | 2 +- .../org/tests/query/TestFindOneOrEmpty.java | 2 +- .../java/org/tests/query/TestIContains.java | 2 +- .../TestImplicitJoinOnParentRelationship.java | 2 +- .../org/tests/query/TestInvalidFetchPath.java | 29 +++---- .../tests/query/TestJoinOptOneCascade.java | 2 +- .../tests/query/TestLimitAlterFetchMany.java | 2 +- .../java/org/tests/query/TestLimitQuery.java | 7 +- .../org/tests/query/TestManyWhereJoin.java | 2 +- .../org/tests/query/TestManyWhereJoinM2M.java | 12 +-- .../org/tests/query/TestMyAdHocSqlSelect.java | 4 +- .../query/TestOneToManyCorrectGrouping.java | 4 +- .../java/org/tests/query/TestOuterJoin.java | 7 +- .../java/org/tests/query/TestQueryAlias.java | 4 +- .../org/tests/query/TestQueryBaseTable.java | 2 +- .../java/org/tests/query/TestQueryExists.java | 2 +- .../query/TestQueryFetchJoinWithOrder.java | 12 +-- .../query/TestQueryFetchManyTwoDeep.java | 14 ++-- .../tests/query/TestQueryFetchSkipPath.java | 2 +- .../query/TestQueryFilterCaseInsensitive.java | 6 +- .../org/tests/query/TestQueryFilterMany.java | 4 +- .../tests/query/TestQueryFilterManyOnM2M.java | 2 +- .../query/TestQueryFilterManyOnSecondary.java | 10 ++- .../query/TestQueryFilterManySimple.java | 2 +- .../org/tests/query/TestQueryFindEach.java | 27 +++---- .../tests/query/TestQueryFindEachWhile.java | 27 +++---- .../tests/query/TestQueryFindFutureList.java | 4 +- .../org/tests/query/TestQueryFindIterate.java | 42 ++++------ .../tests/query/TestQueryFindMapTypedKey.java | 4 +- .../org/tests/query/TestQueryFindNative.java | 2 +- .../tests/query/TestQueryFindPagedList.java | 17 ++-- .../tests/query/TestQueryFindReadOnly.java | 19 ++--- .../org/tests/query/TestQueryFindStream.java | 2 +- .../org/tests/query/TestQueryInAssocOne.java | 2 +- .../query/TestQueryInIdTypeConversion.java | 2 +- .../java/org/tests/query/TestQueryIsNull.java | 2 +- .../tests/query/TestQueryJoinBatchSize.java | 2 +- .../tests/query/TestQueryJoinMulipleMany.java | 7 +- .../tests/query/TestQueryMultiManyOrder.java | 16 ++-- .../tests/query/TestQueryNullAssocOne.java | 22 +++--- .../org/tests/query/TestQueryOrderById.java | 2 +- .../query/TestQueryPathJoinAndOrder.java | 7 +- .../query/TestQueryPlanCacheRowCount.java | 22 +++--- .../tests/query/TestRefToLazyLoadMany.java | 7 +- .../java/org/tests/query/TestRowCount.java | 9 +-- .../java/org/tests/query/TestSubQuery.java | 2 +- .../tests/query/TestThreeLevelQueryJoin.java | 2 +- .../java/org/tests/query/TestWhereIn.java | 2 +- .../org/tests/query/TestWhereRawClause.java | 2 +- .../aggregation/TestAggregationCount.java | 6 +- .../query/autotune/TestAutoTuneProfiling.java | 6 +- .../org/tests/query/cache/TestDistinct.java | 2 +- .../query/cancel/SqlQueryCancelTest.java | 6 +- .../TestFilteringByEmbeddedInJoinedTable.java | 79 +++++++++---------- .../embedded/TestMultipleEmbeddedLoading.java | 6 +- .../query/finder/TestCustomerFinder.java | 4 +- .../joins/TestDisjunctWhereOuterJoin.java | 2 +- .../joins/TestDisjunctWhereOuterOnMany.java | 9 +-- .../query/joins/TestQueryJoinManyNonRoot.java | 20 ++--- .../query/joins/TestQueryJoinOnFormula.java | 13 ++- .../joins/TestQueryJoinQueryNonRoot.java | 14 ++-- .../TestQueryManyToOneWhereClauseJoin.java | 15 ++-- .../query/lazy/TestQueryDefaultBatchSize.java | 2 +- .../tests/query/orderby/TestOrderByClear.java | 8 +- .../query/orderby/TestOrderByOnComplex.java | 7 +- .../orderby/TestOrderByWithDistinct.java | 13 ++- .../orderby/TestOrderByWithDistinctTake2.java | 8 +- .../orderby/TestOrderByWithFunction.java | 9 ++- .../query/orderby/TestOrderByWithMany.java | 31 ++++---- .../query/other/TestFetchPreference.java | 2 +- .../other/TestFindIdsWithInheritance.java | 8 +- .../query/other/TestFindIterateHeapDump.java | 6 +- ...stFindPartialWithConstructorSetFields.java | 6 +- .../other/TestFindWhereUsingEnumerated.java | 2 +- .../query/other/TestFormulaWithFindCount.java | 10 ++- .../tests/query/other/TestLikeEscaping.java | 2 +- .../query/other/TestManyLazyLoadingQuery.java | 2 +- .../other/TestManyToManyLazyLoading.java | 2 +- .../tests/query/other/TestOneToManyAsMap.java | 6 +- .../other/TestQueryConversationRowCount.java | 6 +- .../tests/query/other/TestQueryDistinct.java | 6 +- .../other/TestQueryRawExpressionMany.java | 2 +- .../other/TestQueryRowCountWithMany.java | 4 +- .../query/other/TestQuerySingleAttribute.java | 14 ++-- .../org/tests/query/other/TestSelfParent.java | 8 +- .../query/other/TestSubQueryBinding.java | 2 +- .../query/other/TestWhereAnnotation.java | 9 ++- .../query/other/TestWhereLikeWithSlash.java | 4 +- .../softdelete/TestSoftDeletePagingList.java | 2 +- .../tests/query/sqlquery/SqlQueryTests.java | 4 +- .../sqlquery/TestNativeILikeExpression.java | 2 +- .../TestQuotedIdentifierQuery.java | 2 +- .../tests/rawsql/TestInsertSqlLogging.java | 4 +- .../tests/rawsql/TestOrderReportTotal.java | 4 +- .../org/tests/rawsql/TestRawSqlAsKeyword.java | 14 ++-- .../rawsql/TestRawSqlCustomerAggregate.java | 7 +- .../tests/rawsql/TestRawSqlMasterDetail.java | 4 +- .../tests/rawsql/TestRawSqlNamedParams.java | 7 +- .../org/tests/rawsql/TestRawSqlOrmQuery.java | 17 ++-- .../rawsql/TestRawSqlOrmQueryDistinct.java | 14 ++-- .../tests/rawsql/TestRawSqlOrmWrapper.java | 7 +- .../tests/rawsql/TestRawSqlOrmWrapper2.java | 8 +- .../tests/rawsql/TestRawSqlOrmWrapper3.java | 2 +- .../rawsql/TestRawSqlPositionedParams.java | 2 +- .../tests/rawsql/TestRawSqlUnparsedQuery.java | 2 +- .../tests/rawsql/TestRawSqlWithResultSet.java | 2 +- .../tests/rawsql/inherit/ParentQueryTest.java | 6 +- .../rawsql/inherit/ParentRawSqlTest.java | 13 ++- .../rawsql/nativesql/TestNativeSqlBasic.java | 2 +- .../nativesql/TestNativeWithEmbedded.java | 2 +- .../org/tests/readaudit/TestReadAudit.java | 10 +-- .../tests/refresh/TestRefreshWithMany.java | 4 +- .../tests/repository/TestBeanRepository.java | 2 +- .../saveassociation/TestSaveAssociation.java | 8 +- .../tests/saveassociation/TestSaveSamePK.java | 4 +- .../TestInheritQuery.java | 71 +++++++++-------- .../tests/softdelete/TestSoftDeleteBasic.java | 2 +- .../tests/softdelete/TestSoftDeleteBook.java | 2 +- .../softdelete/TestSoftDeleteManyToMany.java | 2 +- .../TestSoftDeleteOptionalRelationship.java | 4 +- .../softdelete/TestSoftDeleteOtoCascade.java | 2 +- .../TestSoftDeleteStatelessUpdate.java | 2 +- .../tests/softdelete/TestSoftDeleteTop.java | 2 +- .../org/tests/sp/TestManyToManySaveTwice.java | 6 +- .../org/tests/test/TestInheritWithMany.java | 9 ++- .../org/tests/text/csv/TestCsvReader.java | 2 +- .../text/csv/TestCsvReaderWithCallback.java | 2 +- .../tests/text/csv/TestTimeStringParser.java | 13 +-- .../json/TestJsonBeanDescriptorParse.java | 19 +++-- .../text/json/TestJsonBeanWithTimeZone.java | 16 ++-- .../TestJsonInheritanceDiscriminator.java | 4 +- .../java/org/tests/text/json/TestJsonMap.java | 4 +- .../org/tests/text/json/TestJsonSimple.java | 26 +++--- .../json/TestJsonSomeEnumWithToString.java | 14 ++-- .../json/TestTextJsonBeanReadVisitor.java | 7 +- .../text/json/TestTextJsonCompoundType.java | 2 +- .../text/json/TestTextJsonInheritance.java | 33 ++++---- .../text/json/TestTextJsonInsertUpdate.java | 2 +- .../text/json/TestTextJsonInvokeLazy.java | 7 +- .../json/TestTextJsonReadManyLazyLoad.java | 24 +++--- .../text/json/TestTextJsonReferenceBean.java | 16 ++-- .../tests/text/json/TestTextJsonSimple.java | 13 ++- .../text/json/TestTextJsonSuperSimple.java | 7 +- .../text/json/TestTextJsonUpdateCascade.java | 19 ++--- .../org/tests/timezone/TimezoneTests.java | 6 +- .../java/org/tests/timezone/TzBeanTests.java | 8 +- .../transaction/TestBatchModelFlush.java | 2 +- .../transaction/TestBatchPersistCascade.java | 4 +- .../tests/transaction/TestBeanStateReset.java | 4 +- .../TestBeginTransactionWithExisting.java | 29 ++++--- .../transaction/TestCommitAndContinue.java | 6 +- .../TestCreateTransactionWithIsolation.java | 2 +- .../TestDeleteFromPersistenceContext.java | 15 ++-- .../transaction/TestExecuteComplete.java | 4 +- .../transaction/TestInsertManyAndRef.java | 2 +- .../org/tests/transaction/TestNested.java | 2 +- .../transaction/TestNestedBeginRequired.java | 2 +- .../TestNestedBeginRequiredWithFailure.java | 2 +- .../TestNestedBeginRequiresNew.java | 2 +- ...TestNestedBeginRequiresNewWithFailure.java | 2 +- .../transaction/TestNestedMandatory.java | 2 +- .../transaction/TestNestedSubTransaction.java | 6 +- .../transaction/TestNestedTransaction.java | 6 +- .../transaction/TestPersistContextClear.java | 28 +++---- .../org/tests/transaction/TestSavepoint.java | 2 +- .../tests/transaction/TestSqlServerBatch.java | 2 +- .../TestStatelessUpdateClearPC.java | 6 +- .../transaction/TestTransactionCallback.java | 13 +-- .../TestTransactionRollbackOnly.java | 6 +- .../transaction/TestTransactionSkipCache.java | 2 +- .../TestTransactionTryResources.java | 2 +- .../transaction/TestTransactionalNever.java | 8 +- .../TestTransactionalNotSupports.java | 8 +- .../TestTransactionalReadOnly.java | 2 +- .../TestTransactionalRequired.java | 8 +- .../TestTransactionalRequiresNew.java | 10 +-- .../TestTransactionalSupports.java | 6 +- .../TestTransactionalWhenThrow.java | 2 +- ...TransactionNotTerminatedAfterRollback.java | 9 ++- .../TestTransparentPersist.java | 2 +- .../org/tests/types/TestEncryptedString.java | 2 +- .../java/org/tests/types/TestFileType.java | 10 +-- .../org/tests/types/TestFileTypeFetching.java | 4 +- .../test/java/org/tests/types/TestHstore.java | 4 +- .../java/org/tests/types/TestNewTypes.java | 8 +- .../java/org/tests/types/TestPeriodType.java | 6 +- .../unidirectional/TestUniDirectional.java | 22 +++--- .../org/tests/unitinternal/TestBasics.java | 14 ++-- .../org/tests/unitinternal/TestEncodeB64.java | 4 +- .../unitinternal/TestEqualsOnEnhanced.java | 19 ++--- .../unitinternal/TestNamingConvention.java | 5 +- .../unitinternal/TestNullCollectionSet.java | 19 ++--- .../tests/unitinternal/TestOrderByParse.java | 12 +-- .../unitinternal/TestSimpleEncryptor.java | 9 +-- .../TestTxTypeOnTransactional.java | 11 +-- .../TestVanillaCollectionSet.java | 18 +++-- .../update/TestEmbeddedRefreshUpdate.java | 2 +- .../tests/update/TestJsonStatelessUpdate.java | 15 ++-- .../org/tests/update/TestMarkAsDirty.java | 12 +-- .../tests/update/TestPostgresTruncate.java | 5 +- .../org/tests/update/TestSqlUpdateBatch.java | 4 +- .../TestSqlUpdateBindMultipleLists.java | 4 +- .../tests/update/TestSqlUpdateExceptions.java | 76 +++++++++--------- .../org/tests/update/TestSqlUpdateInTxn.java | 18 ++--- .../org/tests/update/TestSqlUpdateUpsert.java | 2 +- .../org/tests/update/TestStatelessUpdate.java | 20 ++--- .../update/TestUpdateAllLoadedProperties.java | 4 +- .../tests/update/TestUpdateCircularSave.java | 10 +-- .../org/tests/update/TestUpdatePartial.java | 4 +- .../tests/update/TestUpdatePartialNoVer.java | 2 +- 870 files changed, 3030 insertions(+), 3158 deletions(-) delete mode 100644 ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java create mode 100644 ebean-core/src/test/java/io/ebean/PlatformCondition.java diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index fd7e161b4..719a66ca0 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -63,7 +63,7 @@ io.ebean ebean-ddl-generator - 12.11.0 + 12.11.3 test @@ -257,16 +257,9 @@ - org.mockito - mockito-core - 3.0.0 - test - - - - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index 3e144debc..eb100fc15 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -17,10 +17,10 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory; import io.ebeaninternal.server.transaction.TransactionScopeManager; import org.assertj.core.api.AbstractCharSequenceAssert; -import org.junit.After; -import org.junit.Rule; -import org.junit.rules.TestName; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Country; @@ -30,23 +30,20 @@ import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; -@RunWith(ConditionalTestRunner.class) +@ExtendWith(PlatformCondition.class) public abstract class BaseTestCase { protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class); - @Rule public TestName name = new TestName(); - - @After - public void checkForLeak() { + @AfterEach + public void checkForLeak(TestInfo testInfo) { TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope(); SpiTransaction trans = scope.getInScope(); if (trans != null) { - String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans; + String msg = getClass().getSimpleName() + "." + testInfo.getDisplayName() + " did not clear threadScope:" + trans; scope.clearExternal(); // clear for next test - fail(msg); + Assertions.fail(msg); } } diff --git a/ebean-core/src/test/java/io/ebean/ColumnTest.java b/ebean-core/src/test/java/io/ebean/ColumnTest.java index 9c8c1c50d..041e64efa 100644 --- a/ebean-core/src/test/java/io/ebean/ColumnTest.java +++ b/ebean-core/src/test/java/io/ebean/ColumnTest.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebeaninternal.server.rawsql.SpiRawSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java deleted file mode 100644 index d0dea0067..000000000 --- a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.ebean; - -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; -import io.ebean.annotation.Platform; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; - -/** - * This testrunner checks for an {@link IgnorePlatform} annotation and ignores the test. - * - * @author Roland Praml, FOCONIS AG - */ -public class ConditionalTestRunner extends BlockJUnit4ClassRunner { - public ConditionalTestRunner(Class klass) throws InitializationError { - super(klass); - } - @Override - public void runChild(FrameworkMethod method, RunNotifier notifier) { - ForPlatform forPlatform = method.getAnnotation(ForPlatform.class); - if (forPlatform != null) { - if (!platformMath(forPlatform.value())) { - notifier.fireTestIgnored(describeChild(method)); - return; - } - } - - IgnorePlatform ignore = method.getAnnotation(IgnorePlatform.class); - - if (ignore == null || !platformMath(ignore.value())) { - super.runChild(method, notifier); - } else { - notifier.fireTestIgnored(describeChild(method)); - } - - } - private boolean platformMath(Platform[] platforms) { - Platform basePlatform = DB.getDefault().platform().base(); - for (Platform platform : platforms) { - if (platform.equals(basePlatform)) { - return true; - } - } - return false; - } -} diff --git a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java index 139f80930..0e716b159 100644 --- a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java +++ b/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java @@ -2,17 +2,16 @@ package io.ebean; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DbPrimaryTest extends BaseTestCase { - @Test public void testIsSkipPrimaryServer() { DbPrimary.setSkip(true); @@ -24,14 +23,12 @@ public class DbPrimaryTest extends BaseTestCase { @Test @ForPlatform(Platform.H2) public void testGetPrimaryServerName() { - String primaryServerName = DbPrimary.getDefaultServerName(); assertEquals("h2", primaryServerName); } @Test public void testLoadProperties() { - Properties properties = DbPrimary.getProperties(); assertTrue(!properties.isEmpty()); } diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java index 4d37aaf57..dd657f296 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java @@ -3,7 +3,7 @@ package io.ebean; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java index db9e85aa9..c0caf65bd 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java @@ -6,9 +6,9 @@ import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import org.ebeantest.LoggedSqlCollector; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.ResetBasicData; @@ -19,12 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class DtoQueryFromOrmTest extends BaseTestCase { - @BeforeClass + @BeforeAll public static void resetStats() { DB.getDefault().metaInfo().resetAllMetrics(); } - @AfterClass + @AfterAll public static void reportStats() { ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics(); for (MetaQueryMetric metric : metrics.queryMetrics()) { diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java index f9e5406e1..4daa80eeb 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java @@ -6,7 +6,7 @@ import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java index cbf119fb2..6f3ced974 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java @@ -8,7 +8,7 @@ import io.ebean.config.TenantMode; import io.ebean.config.TenantSchemaProvider; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import javax.sql.DataSource; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java index 4c594630e..4e54932fa 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebean.config.DatabaseConfig; import io.ebean.event.ServerConfigStartup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index 6ab6db3e7..7365f430c 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java @@ -1,14 +1,14 @@ package io.ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; 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.jupiter.api.Assertions.assertNotNull; public class EbeanServer_deleteAllByIdTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index 43c4d750e..4478219ad 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -2,7 +2,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java index 92232e6f0..747754faa 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -2,7 +2,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java index 0e3366311..eafa16bf4 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -9,6 +9,7 @@ import javax.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class EbeanServer_eqlTest extends BaseTestCase { @@ -187,16 +188,14 @@ public class EbeanServer_eqlTest extends BaseTestCase { assertSql(query).contains("where t0.name like "); } - @Test(expected = PersistenceException.class) + @Test public void unboundNamedParams_expect_PersistenceException() { - Query query = server().createQuery(Customer.class, "where name = :name"); - query.findOne(); + assertThrows(PersistenceException.class, () ->query.findOne()); } @Test public void namedQuery() { - ResetBasicData.reset(); Query name = server().createNamedQuery(Customer.class, "name"); diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java index 638f110f6..393cb86dc 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java @@ -1,6 +1,6 @@ package io.ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class EbeanServer_refresh { diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java index 0187adcf1..54415ca4c 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java index 5f756e9ad..fee0fafa2 100644 --- a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java @@ -1,7 +1,8 @@ package io.ebean; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -14,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ExtendedServerTest extends BaseTestCase { - @After + @AfterEach public void cleanup() { Ebean.getDefaultServer() .extended() diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java index f85808f6c..5c644b231 100644 --- a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java +++ b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java b/ebean-core/src/test/java/io/ebean/FetchGroupTest.java index 9e3a88602..83ef87e2c 100644 --- a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java +++ b/ebean-core/src/test/java/io/ebean/FetchGroupTest.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebean.service.SpiFetchGroupQuery; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebean/PlatformCondition.java b/ebean-core/src/test/java/io/ebean/PlatformCondition.java new file mode 100644 index 000000000..9122bf826 --- /dev/null +++ b/ebean-core/src/test/java/io/ebean/PlatformCondition.java @@ -0,0 +1,43 @@ +package io.ebean; + +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.IgnorePlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.lang.reflect.AnnotatedElement; +import java.util.Optional; + +public class PlatformCondition implements ExecutionCondition { + + private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled("ForPlatform is not present"); + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + Optional element = context.getElement(); + if (element.isPresent()) { + final AnnotatedElement annotatedElement = element.get(); + final ForPlatform annotation = annotatedElement.getAnnotation(ForPlatform.class); + if (annotation != null && !platformMath(annotation.value())) { + return ConditionEvaluationResult.disabled("@ForPlatform"); + } + IgnorePlatform ignore = annotatedElement.getAnnotation(IgnorePlatform.class); + if (ignore != null && platformMath(ignore.value())) { + return ConditionEvaluationResult.disabled("@ForPlatform"); + } + } + return ENABLED; + } + + private boolean platformMath(Platform[] platforms) { + Platform basePlatform = DB.getDefault().platform().base(); + for (Platform platform : platforms) { + if (platform.equals(basePlatform)) { + return true; + } + } + return false; + } +} diff --git a/ebean-core/src/test/java/io/ebean/PropertyTest.java b/ebean-core/src/test/java/io/ebean/PropertyTest.java index 77d22c439..a4462f9de 100644 --- a/ebean-core/src/test/java/io/ebean/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/PropertyTest.java @@ -1,10 +1,10 @@ package io.ebean; import io.ebean.OrderBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class PropertyTest { diff --git a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java index 1da2189eb..0c0b51522 100644 --- a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java +++ b/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/StringHelperTest.java b/ebean-core/src/test/java/io/ebean/StringHelperTest.java index b4a5fabae..eba711bb4 100644 --- a/ebean-core/src/test/java/io/ebean/StringHelperTest.java +++ b/ebean-core/src/test/java/io/ebean/StringHelperTest.java @@ -1,15 +1,15 @@ package io.ebean; import io.ebean.util.StringHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; 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.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class StringHelperTest { diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java index fabd51f38..2e01111cc 100644 --- a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java @@ -5,12 +5,14 @@ import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.server.core.DefaultBeanState; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + public class TestDirtyProperties extends BaseTestCase { @Test @@ -34,34 +36,32 @@ public class TestDirtyProperties extends BaseTestCase { DefaultBeanState beanState = new DefaultBeanState(eb); Set changedProps = beanState.getChangedProps(); - Assert.assertEquals(1, changedProps.size()); - Assert.assertTrue(changedProps.contains("name")); + assertEquals(1, changedProps.size()); + assertThat(changedProps).contains("name"); Map dirtyValues = beanState.getDirtyValues(); - Assert.assertEquals(1, dirtyValues.size()); - Assert.assertTrue(dirtyValues.keySet().contains("name")); + assertEquals(1, dirtyValues.size()); + assertThat(dirtyValues.keySet()).contains("name"); ValuePair valuePair = dirtyValues.get("name"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("changedFoo", valuePair.getNewValue()); - Assert.assertEquals("foo", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("changedFoo", valuePair.getNewValue()); + 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")); + assertEquals(2, changedProps2.size()); + assertThat(changedProps2).contains("name", "embeddable.description"); Map dirtyValues2 = beanState.getDirtyValues(); - Assert.assertEquals(2, dirtyValues2.size()); - Assert.assertTrue(dirtyValues2.keySet().contains("name")); - Assert.assertTrue(dirtyValues2.keySet().contains("embeddable.description")); + assertEquals(2, dirtyValues2.size()); + assertThat(dirtyValues2.keySet()).contains("name", "embeddable.description"); ValuePair valuePair2 = dirtyValues2.get("embeddable.description"); - Assert.assertEquals("embChanged", valuePair2.getNewValue()); - Assert.assertEquals("bar", valuePair2.getOldValue()); + assertEquals("embChanged", valuePair2.getNewValue()); + assertEquals("bar", valuePair2.getOldValue()); } @@ -83,31 +83,29 @@ public class TestDirtyProperties extends BaseTestCase { emain.setName("changedFoo"); - Assert.assertSame(embeddable, emain.getEmbeddable()); + assertSame(embeddable, emain.getEmbeddable()); Eembeddable embeddable2 = setEmbeddedBean(emain, "changeEmbeddedInstance"); - Assert.assertSame(embeddable2, emain.getEmbeddable()); - Assert.assertNotSame(embeddable, emain.getEmbeddable()); + assertSame(embeddable2, emain.getEmbeddable()); + assertNotSame(embeddable, emain.getEmbeddable()); DefaultBeanState beanState = new DefaultBeanState(eb); Set changedProps2 = beanState.getChangedProps(); - Assert.assertEquals(2, changedProps2.size()); - Assert.assertTrue(changedProps2.contains("name")); + assertEquals(2, changedProps2.size()); + assertThat(changedProps2).contains("name"); - Assert.assertTrue("The whole bean instance has changed", changedProps2.contains("embeddable")); + assertThat(changedProps2).contains("embeddable"); Map dirtyValues2 = beanState.getDirtyValues(); - Assert.assertEquals(2, dirtyValues2.size()); - Assert.assertTrue(dirtyValues2.keySet().contains("name")); - Assert.assertTrue(dirtyValues2.keySet().contains("embeddable")); + assertEquals(2, dirtyValues2.size()); + assertThat(dirtyValues2.keySet()).contains("name", "embeddable"); ValuePair valuePair2 = dirtyValues2.get("embeddable"); - Assert.assertSame(embeddable2, valuePair2.getNewValue()); - Assert.assertSame(embeddable, valuePair2.getOldValue()); - + assertSame(embeddable2, valuePair2.getNewValue()); + assertSame(embeddable, valuePair2.getOldValue()); } @@ -128,7 +126,7 @@ public class TestDirtyProperties extends BaseTestCase { // hooks the embeddable bean back to the owner int embeddablePropertyIndex = ebi.findProperty("embeddable"); - Assert.assertTrue(embeddablePropertyIndex > -1); + assertThat(embeddablePropertyIndex).isGreaterThan(-1); ((EntityBean) embeddable)._ebean_getIntercept().setEmbeddedOwner(owner, embeddablePropertyIndex); return embeddable; } diff --git a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java index c3805107f..9627a7b2a 100644 --- a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java +++ b/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java @@ -1,12 +1,13 @@ package io.ebean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestFilterWithEnum extends BaseTestCase { @Test @@ -19,8 +20,7 @@ public class TestFilterWithEnum extends BaseTestCase { Filter filter = Ebean.filter(Order.class); List newOrders = filter.eq("status", Order.Status.NEW).filter(allOrders); - Assert.assertNotNull(newOrders); - + assertNotNull(newOrders); } } diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index eb19d02d7..57d959304 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -4,7 +4,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.converstation.User; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java index 04d7d108c..bc21bffed 100644 --- a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.search.Match; import io.ebean.search.MultiMatch; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TextExpressionListTest { diff --git a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java index 3fcbb34bc..4975100fa 100644 --- a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java +++ b/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java @@ -1,7 +1,7 @@ package io.ebean; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.tests.model.basic.ResetBasicData; /** @@ -16,15 +16,15 @@ import org.tests.model.basic.ResetBasicData; */ public abstract class TransactionalTestCase extends BaseTestCase { - @Before + @BeforeEach public void startTransaction() { ResetBasicData.reset(); - Ebean.beginTransaction(); + DB.beginTransaction(); } - @After + @AfterEach public void endTransaction() { - Ebean.rollbackTransaction(); - Ebean.endTransaction(); + DB.rollbackTransaction(); + DB.endTransaction(); } } diff --git a/ebean-core/src/test/java/io/ebean/TxScopeTest.java b/ebean-core/src/test/java/io/ebean/TxScopeTest.java index 55524e4f0..6d6cb5ce9 100644 --- a/ebean-core/src/test/java/io/ebean/TxScopeTest.java +++ b/ebean-core/src/test/java/io/ebean/TxScopeTest.java @@ -1,10 +1,10 @@ package io.ebean; import io.ebean.annotation.PersistBatch; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TxScopeTest { diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java index bcbdd103b..355bbca84 100644 --- a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java @@ -6,7 +6,7 @@ import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicWithUniqueCon; @@ -16,6 +16,7 @@ import java.sql.Timestamp; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class UpdateQueryTest extends BaseTestCase { @@ -411,17 +412,18 @@ public class UpdateQueryTest extends BaseTestCase { assertThat(rows).isEqualTo(0); } - @Test(expected = DuplicateKeyException.class) + @Test public void exceptionTranslation() { - newEbasicWithUnique("o1","other1_a"); Integer id = newEbasicWithUnique("o2", "other1_b"); - Ebean.update(EBasicWithUniqueCon.class) - .set("other", "other1_a") - .set("otherOne", "other1_a") - .where().idEq(id) - .update(); + assertThrows(DuplicateKeyException.class, () -> { + Ebean.update(EBasicWithUniqueCon.class) + .set("other", "other1_a") + .set("otherOne", "other1_a") + .where().idEq(id) + .update(); + }); } private Integer newEbasicWithUnique(String name, String other) { diff --git a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java index 31891de2f..a04180ae1 100644 --- a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java @@ -6,7 +6,7 @@ import org.tests.compositekeys.db.AuditInfo; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.HashSet; @@ -14,8 +14,8 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class EntityBeanInterceptTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java index 98225a6e6..4e0b987f9 100644 --- a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java @@ -1,6 +1,6 @@ package io.ebean.cache; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java index 977b38b42..9145f46ab 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java @@ -1,11 +1,11 @@ package io.ebean.cache; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ServerCacheManagerTest { diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java index 47f569c74..4601a321d 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java @@ -1,6 +1,6 @@ package io.ebean.cache; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java b/ebean-core/src/test/java/io/ebean/common/BeanListTest.java index 03c08efad..fc041549e 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java +++ b/ebean-core/src/test/java/io/ebean/common/BeanListTest.java @@ -1,7 +1,7 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java index 3101fc0f2..fc9a481cd 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java +++ b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java @@ -1,13 +1,14 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import java.util.*; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class BeanMapTest { @@ -189,33 +190,32 @@ public class BeanMapTest { assertThat(map.getModifyAdditions()).isEmpty(); } - @Test(expected = UnsupportedOperationException.class) + @Test public void keySet_add_whenModifyListening() { BeanMap map = newModifyListeningMap(); - map.keySet().add("3"); + assertThrows(UnsupportedOperationException.class, () -> map.keySet().add("3")); } - @Test(expected = UnsupportedOperationException.class) + @Test public void keySet_add() { BeanMap map = new BeanMap<>(); - map.keySet().add("3"); + assertThrows(UnsupportedOperationException.class, () ->map.keySet().add("3")); } - @Test(expected = UnsupportedOperationException.class) + @Test public void keySet_addAll_whenModifyListening() { BeanMap map = newModifyListeningMap(); - map.keySet().addAll(asList("3", "4")); + assertThrows(UnsupportedOperationException.class, () -> map.keySet().addAll(asList("3", "4"))); } - @Test(expected = UnsupportedOperationException.class) + @Test public void keySet_addAll() { BeanMap map = new BeanMap<>(); - map.keySet().addAll(asList("3", "4")); + assertThrows(UnsupportedOperationException.class, () -> map.keySet().addAll(asList("3", "4"))); } @Test public void keySet_remove() { - BeanMap map = new BeanMap<>(); map.put("1", object1); map.put("2", object2); @@ -233,7 +233,6 @@ public class BeanMapTest { @Test public void keySet_clear() { - BeanMap map = new BeanMap<>(); map.put("1", object1); map.put("2", object2); @@ -315,23 +314,24 @@ public class BeanMapTest { assertThat(map.getModifyRemovals()).containsOnly(object1, object4); } - @Test(expected = UnsupportedOperationException.class) + @Test public void values_add() { BeanMap map = new BeanMap<>(); - map.values().add(object3); + assertThrows(UnsupportedOperationException.class, () -> map.values().add(object3)); } - @Test(expected = UnsupportedOperationException.class) + @Test public void values_addAll() { BeanMap map = new BeanMap<>(); - map.values().addAll(asList(object3, object5)); + assertThrows(UnsupportedOperationException.class, () -> map.values().addAll(asList(object3, object5))); } - @Test(expected = UnsupportedOperationException.class) + @Test public void entrySet_add() { - newModifyListeningMap() + assertThrows(UnsupportedOperationException.class, () -> + newModifyListeningMap() .entrySet() - .add(new AbstractMap.SimpleEntry<>("3", object3)); + .add(new AbstractMap.SimpleEntry<>("3", object3))); } @Test diff --git a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java index 40253faef..7bc12bb07 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java +++ b/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java @@ -1,7 +1,7 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java index 23c4d0b6c..183360a07 100644 --- a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java +++ b/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java @@ -1,10 +1,10 @@ package io.ebean.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ContainerConfigTest { diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java index 368bc9a8f..e8c2dd208 100644 --- a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java @@ -5,15 +5,15 @@ import io.ebean.annotation.MutationDetection; import io.ebean.annotation.PersistBatch; import io.ebean.config.dbplatform.IdType; import io.ebean.datasource.DataSourceConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; 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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DatabaseConfigTest { diff --git a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java index ca5dbb13f..9153b2f74 100644 --- a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java +++ b/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java @@ -1,6 +1,6 @@ package io.ebean.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java index 80f3e7c64..bf0214ae1 100644 --- a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java @@ -1,11 +1,11 @@ package io.ebean.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; import io.ebean.migration.MigrationConfig; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DbMigrationConfigTest { diff --git a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java index 8919fab4a..6a99267b9 100644 --- a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java @@ -1,13 +1,13 @@ package io.ebean.config; import io.ebean.annotation.DocStoreMode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DocStoreConfigTest { diff --git a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java index 2db6b95ba..d832f1370 100644 --- a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java +++ b/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java @@ -2,12 +2,12 @@ package io.ebean.config; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class MatchingNamingConventionTest { diff --git a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java index c363be10f..9d600fc56 100644 --- a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java +++ b/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java @@ -7,8 +7,8 @@ import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbIdentity; import io.ebean.config.dbplatform.IdType; import io.ebean.config.dbplatform.h2.H2Platform; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.draftable.BasicDraftableBean; @@ -18,7 +18,7 @@ public class PlatformNoGeneratedKeysTest { static Database server = testH2Server(); - @AfterClass + @AfterAll public static void shutdown() { server.shutdown(); } diff --git a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java index 2954f1f9d..98a64ad0b 100644 --- a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java @@ -2,12 +2,12 @@ package io.ebean.config; import io.avaje.config.Config; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class PropertiesWrapperTest { @@ -66,14 +66,14 @@ 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("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); pw = new PropertiesWrapper(evalCopy, null); 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("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); } } diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java index 4a4dd820d..0d8644d5d 100644 --- a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java +++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java @@ -5,20 +5,19 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; -import javax.persistence.PersistenceException; import java.util.Properties; import static org.assertj.core.api.Assertions.assertThat; public class ServerConfigSqlServerTest { - @Ignore + @Disabled @ForPlatform({Platform.SQLSERVER}) - @Test(expected = PersistenceException.class) + @Test //expected = PersistenceException.class public void need_explicitPlatform() { Properties props = props("some_sqlserver"); @@ -55,7 +54,7 @@ public class ServerConfigSqlServerTest { } - @Ignore + @Disabled @ForPlatform({Platform.SQLSERVER}) @Test public void explicit_17() { @@ -86,7 +85,7 @@ public class ServerConfigSqlServerTest { sqlServer.shutdown(); } - @Ignore + @Disabled @ForPlatform({Platform.SQLSERVER}) @Test public void explicit_16() { diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java index a1574ebed..b117d47ae 100644 --- a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java +++ b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java @@ -1,6 +1,6 @@ package io.ebean.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java index d4fb59cd9..f10469d52 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java index 25f479643..3e8da3acc 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 1e7603a7e..b6cb188f4 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java @@ -10,10 +10,10 @@ import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DatabasePlatformTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java index ad97776b4..52b23173a 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java @@ -1,9 +1,9 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class DbIdentityTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index 5d71bc7e0..f53b5baf0 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java @@ -1,10 +1,10 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DbPlatformTypeLookupTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java index 0f1307446..27fbaf159 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java index cf964d033..44f85c2ac 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java @@ -1,8 +1,8 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DbPlatformTypeParserTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java index 7ea2e5e20..e85f6ea15 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java @@ -1,7 +1,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java index 9af554f9e..cec87e885 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java @@ -1,10 +1,10 @@ package io.ebean.config.dbplatform; import io.ebean.config.dbplatform.hana.HanaHistorySupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HanaHistorySupportTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java index 1c7600861..94ff431c7 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java @@ -2,7 +2,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.hana.HanaPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java index e6413305e..9993f5450 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java @@ -2,9 +2,9 @@ package io.ebean.config.dbplatform; import io.ebean.config.dbplatform.mysql.MySqlHistorySupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MySqlHistorySupportTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java index 676566e85..450749f96 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java @@ -2,7 +2,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.mysql.MySqlPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java index 15e9dda00..cf6b513ee 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java @@ -3,7 +3,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.oracle.Oracle11Platform; import io.ebean.config.dbplatform.oracle.OraclePlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java index 2c851cbdc..6dcb81431 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java @@ -1,9 +1,9 @@ package io.ebean.config.dbplatform; import io.ebean.config.dbplatform.postgres.PostgresHistorySupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PostgresHistorySupportTest { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index 6ed8c3e88..b7b6d524f 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java @@ -3,7 +3,7 @@ package io.ebean.config.dbplatform; import io.ebean.Query; import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java index 7969c8778..295096e75 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.ResultSet; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java index 306032f50..887b19a3d 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java @@ -2,7 +2,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java index 092adcebe..9740f6858 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java @@ -1,8 +1,8 @@ package io.ebean.config.dbplatform.sqlserver; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vilmos Nagy diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index e6c622437..1ca441253 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -4,8 +4,8 @@ import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,7 +17,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(SqlServerStepSequenceTest.class); - @Ignore + @Disabled @ForPlatform(Platform.SQLSERVER) @Test public void seq() { diff --git a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java index 6b2468478..167d39d54 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -6,17 +6,17 @@ import io.ebean.DatabaseFactory; import io.ebean.bean.BeanCollection; import io.ebean.common.BeanList; import io.ebean.config.DatabaseConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.example.ModUuidGenerator; import org.tests.model.basic.EBasic; import org.tests.model.basic.ECustomId; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BeanFindControllerTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java index 3cbb0b3ba..e42088df2 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java @@ -5,7 +5,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.Transaction; import io.ebean.config.DatabaseConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java index 7775ccc47..3fdfdb51f 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -7,7 +7,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java index bcb3fac30..d29d4a432 100644 --- a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java +++ b/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java @@ -1,10 +1,10 @@ package io.ebean.event.readaudit; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class ReadAuditQueryPlanTest { diff --git a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java b/ebean-core/src/test/java/io/ebean/json/EJsonTests.java index 770aa8378..720e280a6 100644 --- a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java +++ b/ebean-core/src/test/java/io/ebean/json/EJsonTests.java @@ -5,7 +5,7 @@ import io.ebeaninternal.json.ModifyAwareMap; import io.ebean.ModifyAwareType; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class EJsonTests { diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index d6edb3f0c..fd54a95a7 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -7,7 +7,7 @@ import io.ebean.Query; import io.ebean.text.PathProperties; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.Stockforecast; import org.tests.model.basic.Car; import org.tests.model.basic.Customer; @@ -18,9 +18,7 @@ import org.tests.model.basic.Product; import org.tests.model.basic.Vehicle; 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.jupiter.api.Assertions.*; public class BeanTypeTest { @@ -57,15 +55,13 @@ public class BeanTypeTest { assertThat(productType.getBeanType()).isEqualTo(Product.class); } - @Test(expected = RuntimeException.class) + @Test public void getTypeAtPath_when_simpleType() { - - beanType(Order.class).getBeanTypeAtPath("status"); + assertThrows(RuntimeException.class, () -> beanType(Order.class).getBeanTypeAtPath("status")); } @Test public void createBean() { - assertThat(beanType(Order.class).createBean()).isNotNull(); } @@ -177,19 +173,19 @@ public class BeanTypeTest { assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id", "name"); } - @Test(expected = IllegalStateException.class) - public void docStoreIndex() throws Exception { - beanType(Order.class).docStore().index(1, new Order(), null); + @Test + public void docStoreIndex() { + assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().index(1, new Order(), null)); } - @Test(expected = IllegalStateException.class) - public void docStoreDeleteById() throws Exception { - beanType(Order.class).docStore().deleteById(1, null); + @Test + public void docStoreDeleteById() { + assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().deleteById(1, null)); } - @Test(expected = IllegalStateException.class) - public void docStoreUpdateEmbedded() throws Exception { - beanType(Order.class).docStore().updateEmbedded(1, "customer", "someJson", null); + @Test + public void docStoreUpdateEmbedded() { + assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().updateEmbedded(1, "customer", "someJson", null)); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index e48ffbe25..4c259285e 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java @@ -2,7 +2,7 @@ package io.ebean.plugin; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index cc546b742..13fc2d92c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -4,7 +4,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index f94cf6059..ff84a576c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -4,17 +4,17 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.VwCustomer; import java.util.List; 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.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SpiServerTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java index 13acc6376..a36e23aa8 100644 --- a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -3,7 +3,7 @@ package io.ebean.text; import io.ebean.DB; import io.ebean.FetchPath; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Customer; @@ -12,9 +12,9 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PathPropertiesTests { diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index df6530e16..4e83f909e 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.bean.PersistenceContext; import org.tests.model.basic.Customer; import com.fasterxml.jackson.core.JsonParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringReader; diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java index 8d099565b..bb1b4056d 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java +++ b/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java @@ -3,7 +3,7 @@ package io.ebean.text.json; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.DB; import io.ebean.text.PathProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -15,11 +15,7 @@ import java.util.List; import java.util.Map; 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.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class JsonContextTest { @@ -201,9 +197,9 @@ public class JsonContextTest { generator.close(); String jsonString = writer.toString(); - assertTrue(jsonString, jsonString.startsWith("[")); - assertTrue(jsonString, jsonString.endsWith("]")); - assertTrue(jsonString, jsonString.contains("{\"id\":1,\"name\":\"Jim\"}")); + assertThat(jsonString).startsWith("["); + assertThat(jsonString).endsWith("]"); + assertThat(jsonString).contains("{\"id\":1,\"name\":\"Jim\"}"); } @Test diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java index 1714d0ddb..4076d82a9 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java +++ b/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java @@ -1,12 +1,12 @@ package io.ebean.text.json; import io.ebean.FetchPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JsonWriteOptionsTests { diff --git a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java index 3341071e9..134bbb356 100644 --- a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java +++ b/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java @@ -1,8 +1,8 @@ package io.ebean.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CamelCaseHelperTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java index 0705324c1..eef160dd7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.api; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BindParamsTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java index 6e7862580..51a46d3bf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java @@ -1,14 +1,15 @@ package io.ebeaninternal.api; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.TxScope; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.UUOne; +import static org.junit.jupiter.api.Assertions.assertNull; + public class HelpScopeTransTest { @Test @@ -19,16 +20,16 @@ public class HelpScopeTransTest { HelpScopeTrans.enter(TxScope.required()); HelpScopeTrans.enter(TxScope.required()); - Ebean.find(Customer.class).findList(); + DB.find(Customer.class).findList(); HelpScopeTrans.enter(TxScope.required()); - Ebean.find(Contact.class).findList(); + DB.find(Contact.class).findList(); HelpScopeTrans.exit(null, 1); UUOne one = new UUOne(); one.setName("junk"); - Ebean.save(one); + DB.save(one); HelpScopeTrans.exit(null, 1); HelpScopeTrans.exit(null, 1); @@ -40,7 +41,7 @@ public class HelpScopeTransTest { try { HelpScopeTrans.enter(TxScope.required()); - Assert.assertNull(Ebean.getDefaultServer().currentTransaction()); + assertNull(DB.getDefault().currentTransaction()); HelpScopeTrans.exit(null, 1); } finally { HelpScopeTrans.setEnabled(true); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java index b33125b49..5c3e8dc35 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.api; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class PlatformMatchTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java index cf4b284fe..b77df5424 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.extraddl.model; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ExtraDdlXmlReaderTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java index a9bfbb929..929b13d49 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java @@ -1,8 +1,7 @@ package io.ebeaninternal.json; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,8 +15,7 @@ import java.util.Map; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; public class ModifyAwareMapTest { @@ -50,7 +48,7 @@ public class ModifyAwareMapTest { assertFalse(map.isMarkedDirty()); map.put("A", "change"); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -60,7 +58,7 @@ public class ModifyAwareMapTest { assertFalse(map.isMarkedDirty()); map.setMarkedDirty(true); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -74,21 +72,21 @@ public class ModifyAwareMapTest { public void testIsEmpty() { assertFalse(createMap().isEmpty()); - Assert.assertTrue(createEmptyMap().isEmpty()); + assertTrue(createEmptyMap().isEmpty()); } @Test public void testContainsKey() { ModifyAwareMap map = createMap(); - Assert.assertTrue(map.containsKey("A")); + assertTrue(map.containsKey("A")); assertFalse(map.containsKey("Z")); } @Test public void testContainsValue() { ModifyAwareMap map = createMap(); - Assert.assertTrue(map.containsValue("one")); + assertTrue(map.containsValue("one")); assertFalse(map.containsValue("junk")); } @@ -98,7 +96,7 @@ public class ModifyAwareMapTest { ModifyAwareMap map = createMap(); assertEquals("two", map.get("B")); - Assert.assertNull(map.get("Z")); + assertNull(map.get("Z")); assertFalse(map.isMarkedDirty()); } @@ -109,7 +107,7 @@ public class ModifyAwareMapTest { assertFalse(map.isMarkedDirty()); map.put("A", "mod"); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -119,7 +117,7 @@ public class ModifyAwareMapTest { assertFalse(map.isMarkedDirty()); map.remove("A"); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -130,7 +128,7 @@ public class ModifyAwareMapTest { Map other = new HashMap<>(); map.putAll(other); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -142,7 +140,7 @@ public class ModifyAwareMapTest { Map other = new HashMap<>(); other.put("A", "one"); map.putAll(other); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -152,7 +150,7 @@ public class ModifyAwareMapTest { assertFalse(map.isMarkedDirty()); map.clear(); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -163,7 +161,7 @@ public class ModifyAwareMapTest { Set keys = map.keySet(); assertEquals(map.size(), keys.size()); - Assert.assertTrue(keys.contains("A")); + assertTrue(keys.contains("A")); assertFalse(map.isMarkedDirty()); } @@ -175,7 +173,7 @@ public class ModifyAwareMapTest { Collection values = map.values(); assertEquals(map.size(), values.size()); - Assert.assertTrue(values.contains("one")); + assertTrue(values.contains("one")); assertFalse(map.isMarkedDirty()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index d7ab3ea5e..739e427fb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -13,12 +13,12 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Customer.Status; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class CacheBeanDataTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index 323fcc2e0..8e59de674 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -5,7 +5,7 @@ import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Car; import org.tests.model.basic.Contact; @@ -15,7 +15,7 @@ import java.sql.Date; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CachedBeanDataFromBeanTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 8f94c27af..4e0353dc5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TBytesOnly; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -20,8 +20,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CachedBeanDataSerializeTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java index d88f42719..6b8580824 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java @@ -5,7 +5,7 @@ import io.ebean.cache.ServerCacheOptions; import io.ebean.cache.ServerCacheType; import io.ebean.config.ServerConfig; import io.ebeaninternal.server.transaction.TableModState; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java index 6cbc82c8f..056e6f79e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java @@ -6,9 +6,9 @@ import io.ebean.config.ServerConfig; import org.tests.model.basic.Article; import org.tests.model.basic.Order; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultCacheHolder_getCacheOptions_Test { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java index ecd5ed5c7..9180dd7c1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java @@ -2,9 +2,9 @@ package io.ebeaninternal.server.cache; import io.ebean.cache.ServerCacheConfig; import io.ebean.cache.ServerCacheOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultServerCacheConfigTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java index 06b12c047..d1639508c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java @@ -4,12 +4,12 @@ import io.ebean.config.ContainerConfig; import io.ebean.config.CurrentTenantProvider; import io.ebean.config.ServerConfig; import io.ebeaninternal.server.cluster.ClusterManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultServerCacheManagerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java index 9bf023c6e..87cd7f074 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.cache; import io.ebean.cache.ServerCacheConfig; import io.ebean.cache.ServerCacheOptions; import io.ebean.cache.ServerCacheType; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultServerCacheTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index 184783627..c6596e6d8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java @@ -4,8 +4,8 @@ import io.ebean.cache.ServerCacheConfig; import io.ebean.cache.ServerCacheOptions; import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheType; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -33,7 +33,7 @@ public class DefaultServerCache_RunEvictionTest { this.cache = createCache(); } - @Ignore("test takes long time") + @Disabled("test takes long time") @Test public void runEvict() throws InterruptedException { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 0e608f3e1..aaceb6433 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebean.text.json.JsonContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringWriter; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 0209d5438..60cdf037b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.event.changelog.ChangeSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultChangeLogListenerTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index 3ebcebea4..f05d738f6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -7,10 +7,10 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultChangeLogRegisterTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 9776ed6a5..a8df99baa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.transaction.BeanPersistIds; import io.ebeaninternal.server.transaction.RemoteTableMod; import io.ebeaninternal.server.transaction.RemoteTransactionEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.io.IOException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java index f4a77caf1..0cb2018aa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BasicTypeConverterTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java index 483963fcc..8fefb770a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BindPaddingTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 160bb6fbb..606e9533b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -7,7 +7,7 @@ import io.ebean.FetchConfig; import io.ebean.Query; import io.ebeaninternal.server.querydefn.DefaultOrmQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index 78cea8327..f578639e6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java index 4b85f18f1..c78eafa93 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DtoQueryRequestTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java index 5065d17e5..a6027c182 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java @@ -2,9 +2,9 @@ package io.ebeaninternal.server.core; import io.ebean.config.ServerConfig; import io.ebean.datasource.DataSourceConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class InitDataSourceTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index 7d14d858c..cd135fe60 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -6,17 +6,18 @@ import io.ebean.EbeanServer; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.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; +import static org.junit.jupiter.api.Assertions.*; + public class TestDiffHelpSimple extends BaseTestCase { long firstTime = System.currentTimeMillis() - 10000; @@ -58,14 +59,14 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(5, diff.size()); + assertEquals(5, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("cretime")); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("shipDate")); - Assert.assertTrue(keySet.contains("orderDate")); - Assert.assertTrue(keySet.contains("customer.id")); + assertTrue(keySet.contains("cretime")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("orderDate")); + assertTrue(keySet.contains("customer.id")); } @Test @@ -84,16 +85,16 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(5, diff.size()); + assertEquals(5, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("cretime")); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("shipDate")); - Assert.assertTrue(keySet.contains("orderDate")); - Assert.assertTrue(keySet.contains("customer.id")); - Assert.assertEquals(2133, diff.get("customer.id").getOldValue()); - Assert.assertEquals(1234, diff.get("customer.id").getNewValue()); + assertTrue(keySet.contains("cretime")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("orderDate")); + assertTrue(keySet.contains("customer.id")); + assertEquals(2133, diff.get("customer.id").getOldValue()); + assertEquals(1234, diff.get("customer.id").getNewValue()); } @Test @@ -105,7 +106,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } @Test @@ -120,17 +121,17 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(3, diff.size()); + assertEquals(3, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("customer.id")); - Assert.assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("customer.id")); + assertTrue(keySet.contains("shipDate")); ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); - Assert.assertNull(shipDatePair.getOldValue()); + assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); + assertNull(shipDatePair.getOldValue()); } @@ -145,14 +146,14 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("shipDate")); ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); - Assert.assertNull(shipDatePair.getNewValue()); + assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); + assertNull(shipDatePair.getNewValue()); } @Test @@ -166,6 +167,6 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 9162609d9..19bd30108 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -6,13 +6,14 @@ import io.ebean.EbeanServer; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; -import org.junit.Assert; -import org.junit.Test; import java.util.Map; +import static org.junit.jupiter.api.Assertions.*; + public class TestDiffHelpWithEmbedded extends BaseTestCase { EbeanServer server; @@ -34,12 +35,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.getEmbeddable().setDescription("baz"); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } /** @@ -57,12 +58,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } @Test @@ -73,12 +74,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.getEmbeddable().setDescription("baz"); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } @Test @@ -89,12 +90,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { EMain emain2 = createEMain(); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getNewValue()); - Assert.assertEquals("bar", valuePair.getOldValue()); + assertNotNull(valuePair); + assertNull(valuePair.getNewValue()); + assertEquals("bar", valuePair.getOldValue()); } @Test @@ -105,12 +106,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getOldValue()); - Assert.assertEquals("bar", valuePair.getNewValue()); + assertNotNull(valuePair); + assertNull(valuePair.getOldValue()); + assertEquals("bar", valuePair.getNewValue()); } @Test @@ -121,12 +122,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getOldValue()); - Assert.assertEquals("bar", valuePair.getNewValue()); + assertNotNull(valuePair); + assertNull(valuePair.getOldValue()); + assertEquals("bar", valuePair.getNewValue()); } @Test @@ -138,7 +139,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } private EMain createEMain() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java index 615d0433f..3484ac968 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core.bootup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java index 4f1063c7d..0bb79f2ae 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core.bootup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 3a0527381..190588605 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.CascadeType; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BeanCascadeInfoTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index d79d79427..94028e4fa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployIdentityMode; import io.ebeanservice.docstore.api.DocStoreBeanAdapter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.*; import org.tests.model.bridge.BSite; import org.tests.model.bridge.BUser; @@ -16,7 +16,7 @@ import org.tests.model.bridge.BUser; import java.util.Collection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index b2ddea188..7f85b26c0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -5,7 +5,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 31721e893..fb9d7f92d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -7,9 +7,9 @@ import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BeanDescriptor_registerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 4ea84d989..1ee4cf8f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -5,10 +5,10 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java index 9f26e978c..92f2269f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; import io.ebeaninternal.server.core.PersistRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index ff35bf77e..b6b70d8dc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.common.BeanList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -13,9 +13,9 @@ 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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BeanPropertyAssocManyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index 5f4080163..0a4f45f90 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -1,11 +1,12 @@ package io.ebeaninternal.server.deploy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DeployPropertyParserMapTests { @Test @@ -19,7 +20,7 @@ public class DeployPropertyParserMapTests { 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); + assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index cfb35f740..4ca2a3681 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.BWithQIdent; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java index 5330d3ab6..c1e4d32ff 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index 681e82bf1..af2192d69 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebeaninternal.server.query.STreeProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index cf206edaf..2faa11bc6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class IndexDefinitionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java index 770aba39f..9a4143f6b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java index e29f58dd8..cba2035d0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 815ba9888..e614df5cf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -10,14 +10,14 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.UserInterestLive; import org.tests.model.embedded.UserInterestLiveKey; import java.sql.Timestamp; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestBeanDescriptorHasIdProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 611c20fef..5027e2332 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -6,13 +6,14 @@ import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestCollectionLoadedStatus extends BaseTestCase { @Test @@ -26,16 +27,16 @@ public class TestCollectionLoadedStatus extends BaseTestCase { EntityBeanIntercept ebi = eb._ebean_getIntercept(); BeanProperty contactsProperty = custDesc.getBeanProperty("contacts"); - Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); Object contactsViaInternal = contactsProperty.getValue(eb); - Assert.assertNull(contactsViaInternal); - Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertNull(contactsViaInternal); + assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); List contacts = customer.getContacts(); - Assert.assertNotNull(contacts); - Assert.assertTrue(contacts instanceof BeanCollection); - Assert.assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertNotNull(contacts); + assertTrue(contacts instanceof BeanCollection); + assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 58cdd45ee..45e71f7ca 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index f2a03c63d..85747f7e5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index 014ddb4b6..b2d302848 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -2,12 +2,13 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; +import org.junit.jupiter.api.Test; import org.tests.model.mappedsuper.ASimpleBean; import org.tests.model.mappedsuper.NotEnhancedMappedSuper; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestNotEnhancedMappedSuper extends BaseTestCase { @@ -17,24 +18,22 @@ public class TestNotEnhancedMappedSuper extends BaseTestCase { ASimpleBean bean = new ASimpleBean(); bean.setName("junk"); - Ebean.save(bean); - Assert.assertNotNull(bean.getId()); + DB.save(bean); + assertNotNull(bean.getId()); bean.setName("junk mod"); - Ebean.save(bean); + DB.save(bean); - ASimpleBean fetched = Ebean.find(ASimpleBean.class, bean.getId()); - Assert.assertEquals("junk mod", fetched.getName()); - Assert.assertEquals(bean.getName(), fetched.getName()); + ASimpleBean fetched = DB.find(ASimpleBean.class, bean.getId()); + assertEquals("junk mod", fetched.getName()); + assertEquals(bean.getName(), fetched.getName()); - Ebean.delete(bean); - ASimpleBean fetched2 = Ebean.find(ASimpleBean.class, bean.getId()); - Assert.assertNull(fetched2); + DB.delete(bean); + ASimpleBean fetched2 = DB.find(ASimpleBean.class, bean.getId()); + assertNull(fetched2); NotEnhancedMappedSuper mappedSuper = new NotEnhancedMappedSuper(); - boolean enhanced = (mappedSuper instanceof EntityBean); - Assert.assertTrue(enhanced); - + assertTrue((mappedSuper instanceof EntityBean)); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 6c1626ce5..94e83c958 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -3,16 +3,16 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; 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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestReferenceWithConstructorProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java index c1d76e037..101212ca9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java @@ -3,10 +3,13 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; +import java.util.EmptyStackException; + import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class GeneratedCounterLongTest extends BaseTestCase { @@ -15,16 +18,14 @@ public class GeneratedCounterLongTest extends BaseTestCase { private BeanProperty version = getBeanDescriptor(Customer.class).getBeanProperty("version"); - @Test(expected = IllegalStateException.class) - public void when_null_expect_IllegalStateException() throws Exception { - + @Test + public void when_null_expect_IllegalStateException() { Customer customer = new Customer(); - counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis()); + assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis())); } @Test - public void when_set_expect_incremented() throws Exception { - + public void when_set_expect_incremented() { Customer customer = new Customer(); customer.setVersion(7L); Object value = counter.getUpdateValue(version, (EntityBean) customer, System.currentTimeMillis()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java index 3d469c783..cd5903485 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.deploy.generatedproperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class GeneratedInsertJavaTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java index e91507a96..0ce2061f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class InsertTimestampFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java index 800423fc8..aa150304e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class UpdateTimestampFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java index 5b543e764..bd9139a6a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.type.DefaultTypeManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java index 2cf97ca85..3d476132c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.dto; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java index 264edac57..08bc88640 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java @@ -1,8 +1,7 @@ package io.ebeaninternal.server.executor; -import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.MDC; import java.util.concurrent.Future; @@ -59,7 +58,7 @@ public class DefaultBackgroundExecutorTest { } @Test - @Ignore("test takes long time") + @Disabled("test takes long time") public void shutdown_when_running_expect_waitAndNiceShutdown() { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 20, "test"); @@ -72,7 +71,7 @@ public class DefaultBackgroundExecutorTest { } @Test - @Ignore("test takes long time") + @Disabled("test takes long time") public void shutdown_when_rougeRunnable_expect_InterruptedException() { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java index 563e50f3e..9a45dad71 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java @@ -4,14 +4,14 @@ import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; public class TestShutdownWithBackgroundTasks extends BaseTestCase { @Test - @Ignore + @Disabled public void test() { Database server = DB.getDefault(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index d26a46b01..43fd9126b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java index 10b529aac..f9ebea4c9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java index 4685f1290..be487ca00 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java index 75f033ced..4691cc199 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java index a593bfe01..452db7dbf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java index 227f11b3f..47be406be 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java index 89e2dcd39..1fa245832 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.ExpressionList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index ee2f37c44..b869096a1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java index 247ac62c2..084410752 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java index 45fa3858a..ded5e7772 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java index 11ff0eae6..17039e605 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java index eee6f1556..b5f1254e5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.expression; import io.ebean.Pairs; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class InPairsExpressionTest extends BaseExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java index 1b6345846..1ab4853b5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java index b3d607728..921581333 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index dba74742e..81689c7f1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java index 1a4f82dd5..83438d870 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java index fe2e1224e..b28d44c05 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expr; import io.ebean.Expression; import io.ebean.Junction; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JunctionExpressionTest extends BaseExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java index 51f0eeaae..3012daf4d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.LikeType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java index 601c607c6..2ddbd367e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expr; import io.ebean.Expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index bb745b47c..bede240f6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.onetoone.album.Cover; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java index a65b81c97..fc82a7dc9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.ebean.Expr.eq; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java index 02c47948f..302ea3f9e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index b33019cce..364e23ca3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class PrepareDocNestedTest extends BaseTestCase { @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java index 8f3c4bf43..81e5c312b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index eb12ff460..27a696a34 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import io.ebeaninternal.api.BindValuesKey; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java index f5cd05852..76e3d27a3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java index 1ce846e45..d9ce5d9fd 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java index 9cd0f687c..e002e84ed 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java index c367ba601..0daf5ea9f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.expression.platform; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.expression.DefaultExpressionRequest; import io.ebeaninternal.server.expression.Op; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HanaDbExpressionTest { private HanaDbExpression expression = new HanaDbExpression(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java index d53657bec..032075298 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.expression.platform; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.expression.DefaultExpressionRequest; import io.ebeaninternal.server.expression.Op; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MySqlDbExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java index 6608927c2..d05f61594 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java index 526ca3353..80c0ccff0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java index e9e4ae2d4..1a4c4c85b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index e6281364b..092578572 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -9,7 +9,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiQuery; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; @@ -21,13 +21,14 @@ import java.util.HashSet; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class EqlParserTest extends BaseTestCase { - @Test(expected = IllegalArgumentException.class) + @Test public void illegal_syntax() { - parse("find Article where name = :p0"); + assertThrows(IllegalArgumentException.class, () -> parse("find Article where name = :p0")); } @Test @@ -389,27 +390,23 @@ public class EqlParserTest extends BaseTestCase { assertSql(query).doesNotContain("where"); } - @Test(expected = IllegalArgumentException.class) + @Test//(expected = IllegalArgumentException.class) public void query_inOrEmpty_withVals() { - - Query query = parse("where name inOrEmpty (:names)"); - query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim")); - query.findList(); - - platformAssertIn(query.getGeneratedSql(), "where t0.name"); + assertThrows(IllegalArgumentException.class, () -> parse("where name inOrEmpty (:names)")); +// query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim")); +// query.findList(); +// platformAssertIn(query.getGeneratedSql(), "where t0.name"); } /** * This test fails in that we can't use inOrEmpty with named parameters. */ - @Test(expected = IllegalArgumentException.class) + @Test//(expected = IllegalArgumentException.class) public void query_inOrEmpty_withNamedParams_expect_IllegalArgument() { - - Query query = parse("where name inOrEmpty (:names)"); - query.setParameter("names", new ArrayList<>()); - query.findList(); - - assertSql(query).doesNotContain("where"); + assertThrows(IllegalArgumentException.class, () -> parse("where name inOrEmpty (:names)")); +// query.setParameter("names", new ArrayList<>()); +// assertThrows(IllegalArgumentException.class, query::findList); +// assertSql(query).doesNotContain("where"); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java index c4976f56d..6d86c65d1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.grammer; import io.ebean.FetchConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class ParseFetchConfigTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java index 3623fdd73..50f8e81b9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java @@ -5,7 +5,7 @@ package io.ebeaninternal.server.idgen; import io.ebean.config.dbplatform.PlatformIdGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java index c48756ed7..f07ffe3a6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java @@ -2,18 +2,17 @@ package io.ebeaninternal.server.lib; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.event.ShutdownManager; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. Most typical when we want the application code to control shutdown. */ - @Ignore + @Disabled @Test public void test_disableShutdownHook_shutdownManually() { // disable hook to make sure app code controls when shutdown is executed @@ -28,7 +27,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_shutdownHook() { DB.getDefault(); // shutdown fired via shutdown hook, default behaviour @@ -37,7 +36,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_disableShutdownHook() { DB.getDefault(); @@ -47,7 +46,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_shutdownManually() { DB.getDefault(); @@ -59,7 +58,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_deregisterShutdownHook() { DB.getDefault(); @@ -69,7 +68,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_noShutdownHook() { System.setProperty("ebean.registerShutdownHook", "false"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index 991198b3e..d9e207338 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java index d9640e7da..47cd5c2a3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BatchDepthOrderTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java index 0753a3841..5c1f8c879 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java index a90fc99c7..b9bf22ae9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index 9d99b17ce..3762cd51b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.profile; import io.ebean.metric.MetricFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java index cb6d4d662..2fc54e117 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java index 6dbbb45d3..46285255e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.profile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java index 29658566c..570913db7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.SortMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SortMetricTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java index 0b26078ff..12f1edcd9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.profile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java index d515f6a71..1f918c97d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DbOrderByTrimTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java index 3ceb37305..3d33ca922 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java index d7de421c7..3286c7e4b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java @@ -3,10 +3,10 @@ package io.ebeaninternal.server.query; import io.ebean.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LimitOffsetPagedListTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java index 35f3cf546..e278eb6d7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.query; import io.ebean.Version; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class OrderVersionDescTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java index 906492fe5..dd32c9317 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java index d26322792..7351ab2f4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.query; import io.ebean.util.SplitName; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class SplitNameTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java index d2dda1092..c12786757 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.SpiQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlTreeAliasTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java index 241c218da..6a03ea57f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlTreeBuilderTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index 1e9bf307d..7ea376eee 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.FutureIds; import io.ebean.FutureList; import io.ebean.FutureRowCount; @@ -10,11 +10,12 @@ import io.ebean.Query; import io.ebean.Transaction; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; +import static org.junit.jupiter.api.Assertions.*; + public class TestFutureRowCountErrorHandling extends BaseTestCase { @Test @@ -22,7 +23,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -35,11 +36,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { futureRowCount.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } @@ -49,7 +50,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -62,11 +63,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } @@ -77,7 +78,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -90,11 +91,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java index 1a7d3b39f..c2712478a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.querydefn; import io.ebeaninternal.api.BindValuesKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index b2b4902ad..5c35154e6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -7,7 +7,7 @@ import io.ebean.Ebean; import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.OrmQueryRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index f7f829118..d6354f9a0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -1,11 +1,10 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class OrmQueryDetailParserTest extends BaseTestCase { @@ -14,19 +13,18 @@ public class OrmQueryDetailParserTest extends BaseTestCase { return new OrmQueryDetailParser(query).parse(); } - @Test(expected = NullPointerException.class) - public void parse_when_nullString() throws Exception { - parse(null); + @Test + public void parse_when_nullString() { + assertThrows(NullPointerException.class, () -> parse(null)); } @Test - public void parse_when_emptyString() throws Exception { + public void parse_when_emptyString() { assertTrue(parse("").isEmpty()); } @Test - public void testParseBasic() throws Exception { - + public void testParseBasic() { OrmQueryDetail detail = parse("select (id,name)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -35,8 +33,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseEmptySelect() throws Exception { - + public void testParseEmptySelect() { OrmQueryDetail detail = parse("select fetch customer (email)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -49,8 +46,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseSelectFetch() throws Exception { - + public void testParseSelectFetch() { OrmQueryDetail detail = parse("select (id,name) fetch customer (email)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -63,8 +59,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseSelectFetchMore() throws Exception { - + public void testParseSelectFetchMore() { OrmQueryDetail detail = parse("select (id,name) fetch customer (email) fetch details.product (sku,description)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -81,8 +76,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseWithPlusQuery() throws Exception { - + public void testParseWithPlusQuery() { OrmQueryDetail detail = parse("select (id,name) fetch customer (+query,id,name,email)"); OrmQueryProperties root = detail.getChunk(null, false); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 5c3ef69b6..03f14cae3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -3,10 +3,10 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class OrmQueryDetailTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index 305f9122b..e132f8320 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.TableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.expression.BaseExpressionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java index a7c103b83..f15576f63 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java index 8df439a58..15dce130e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java index db534d131..da7e95299 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.querydefn; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class OrmUpdatePropertiesTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java index 86ec1cadd..ce793d8a7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.rawsql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java index 58391ece3..bc7ddc8a2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.rawsql; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DRawSqlServiceTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java index 54efa28c5..b46714a99 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 274e98a7f..5c1652684 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -12,7 +12,7 @@ import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicClob; import org.tests.model.basic.PersistentFileContent; @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestRawSqlBuilder extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java index 146b6d5e0..7ea56e68f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java @@ -3,20 +3,22 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Test; -public class TestRawSqlBuilderDistinct extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +public class TestRawSqlBuilderDistinct { + + @Test public void testDistinct() { RawSql r = RawSqlBuilder.parse("select distinct id, name from t_cust").create(); Sql sql = ((SpiRawSql)r).getSql(); - Assert.assertEquals("id, name", sql.getPreFrom()); - Assert.assertEquals("from t_cust", sql.getPreWhere()); - Assert.assertEquals("", sql.getPreHaving()); - Assert.assertNull(sql.getOrderBy()); - + assertEquals("id, name", sql.getPreFrom()); + assertEquals("from t_cust", sql.getPreWhere()); + assertEquals("", sql.getPreHaving()); + assertNull(sql.getOrderBy()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java index b9b5175db..6cf39f216 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java @@ -2,11 +2,11 @@ package io.ebeaninternal.server.rawsql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRawSqlColumnParsing { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 8618431b1..0985f2ff8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -8,7 +8,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.rawsql.A2Customer; @@ -17,7 +17,7 @@ import org.tests.rawsql.ACustomer; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestRawSqlParsing extends BaseTestCase { @@ -37,7 +37,7 @@ public class TestRawSqlParsing extends BaseTestCase { Sql rs = ((SpiRawSql)rawSql).getSql(); String s = rs.toString(); - assertTrue(s, s.contains("[order_id, sum")); + assertTrue(s.contains("[order_id, sum")); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java index 699e33ac7..5e2f415c5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.BaseTestCase; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java index 1a5ef7fe1..b3dc68dea 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java @@ -6,7 +6,7 @@ import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.type.DefaultTypeManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index bc065946a..b451bff9b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -11,7 +11,7 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index b557f6b45..e9fde86c1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -9,13 +9,13 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringReader; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTextJsonBeanReadVisitor extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 6d7e6e597..a83cbfedc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -8,14 +8,14 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.sql.Date; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WriteJsonDirtyTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java index e7950dfbc..ec9514c72 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.FetchPath; import io.ebean.Query; import io.ebean.text.PathProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index 87dbf4fa3..4184980d0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -10,8 +10,8 @@ import org.tests.model.basic.Product; import org.tests.model.basic.Vehicle; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultPersistenceContextTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java index 0a6ee1e3a..758ee8964 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultProfileHandlerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java index 0f3da4105..5a77cde6f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -9,15 +9,15 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; 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.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class DefaultTransactionThreadLocalTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index ae7405354..ac3eeacf9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -5,7 +5,7 @@ import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java index bea6709f2..db62950e7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.transaction; import io.ebeaninternal.server.cache.RemoteCacheEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashSet; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java index f2ab59bd9..26acfc183 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TableModStateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java index da624fdbb..b5f6c0559 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.ScopedTransaction; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransactionManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java index aca97f3ca..3e09e8b22 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java @@ -5,7 +5,7 @@ import org.postgresql.util.PGobject; import java.sql.SQLException; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; class BasePlatformArrayTypeFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java index 83c7ad3e5..73f869f1a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetAddress; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ConvertInetAddressTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java index 0c78eb178..a2177d243 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetAddress; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ConvertInetAddressesTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java index d90cfb26e..7a7d19dd3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DecimalUtilsTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java index e023c9d7d..0a0a6c0b2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultTypeFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 950a805fd..797c66e7d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -4,7 +4,7 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.core.bootup.BootupClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.array.IntEnum; import org.tests.model.array.VarcharEnum; import org.tests.model.basic.Car; @@ -14,8 +14,8 @@ import java.time.DayOfWeek; import java.time.Month; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultTypeManagerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java index 79e3f1ef4..75e600ee6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java index b50efaad2..8db4b633e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.text.json.WriteJson; import java.io.IOException; import java.io.StringWriter; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Base class to help json testing. diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java index 622ceb3f7..c08ceeab7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java index 3674a261c..57b4943cc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareFlag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index a7ebbecda..cac5747d5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareList; import io.ebeaninternal.json.ModifyAwareSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,7 +16,7 @@ import java.util.List; import java.util.ListIterator; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ModifyAwareListTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 3c0a9bdf9..8a97f37ce 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index abb8a4e2e..1c1b17d90 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java index b23a2126d..ad1f1d44c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java index 13496e407..03a77f6ad 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; import io.ebean.text.json.EJson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.IOException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java index ece3a122b..d8c2ea53d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParser; import io.ebean.DB; import io.ebean.core.type.ScalarType; import io.ebean.text.json.EJson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java index 1fa9732d7..b5e162d0e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index 5c4c83ea5..46569ed74 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -4,14 +4,14 @@ package io.ebeaninternal.server.type; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import org.tests.model.basic.TOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeBooleanTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java index 922beadeb..4edc4c059 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; import java.util.Calendar; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java index e69a4ce2c..caa293a6b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java index c9173d58f..1a57f6080 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeDurationTest { @@ -75,22 +75,19 @@ public class ScalarTypeDurationTest { } @Test - public void testParse() throws Exception { - + public void testParse() { Duration duration = type.parse("PT20M34S"); assertEquals(Duration.ofSeconds(1234), duration); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index f3fd9ff62..60e4ffe29 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,7 +10,7 @@ import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeDurationWithNanosTest { @@ -74,28 +74,24 @@ public class ScalarTypeDurationWithNanosTest { } @Test - public void testParse() throws Exception { - + public void testParse() { Duration duration = Duration.ofSeconds(323, 1500000); Duration val1 = type.parse("PT5M23.0015S"); assertEquals(duration, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test public void testJsonRead() throws Exception { - Duration duration = Duration.ofSeconds(323, 1500000); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index 07ecd0867..b2205f0fa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,9 +11,9 @@ import java.sql.Timestamp; import java.time.Instant; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeInstantTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java index 2f4e53cb0..ba292a20a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java index 250356338..0d3719f8a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; import org.joda.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java index 3c8205602..933176623 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java @@ -3,11 +3,11 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeJodaLocalDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 64d3d93aa..6fe49a87a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -5,12 +5,12 @@ import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeJodaLocalTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java index 3a58e9fbf..aafbe3a92 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import org.joda.time.Period; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java index 43ed867ba..27d8a7698 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.dbplatform.ExtraDbTypes; import io.ebean.core.type.DocPropertyType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index b76c5cad3..076bad958 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -1,15 +1,15 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; import java.time.LocalDate; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeLocalDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java index 65423e012..623402fb7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java @@ -3,14 +3,14 @@ package io.ebeaninternal.server.type; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringWriter; import java.sql.Timestamp; import java.time.LocalDateTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index c2e73356f..e98cdef0f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,7 +10,7 @@ import java.io.ObjectOutputStream; import java.sql.Time; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalTimeTest { @@ -71,28 +71,24 @@ public class ScalarTypeLocalTimeTest { } @Test - public void testParse() throws Exception { - + public void testParse() { LocalTime localTime = LocalTime.of(9, 23, 45); LocalTime val1 = type.parse("09:23:45"); assertEquals(localTime, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1234); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1234)); } @Test public void testJsonRead() throws Exception { - LocalTime localTime = LocalTime.of(9, 23, 45); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index a415a0dd7..6e2e24057 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalTimeWithNanosTest { @@ -62,36 +62,30 @@ public class ScalarTypeLocalTimeWithNanosTest { @Test public void testFormatValue() throws Exception { - LocalTime localTime = LocalTime.of(9, 23, 45); String formatted = type.formatValue(localTime); assertEquals("09:23:45", formatted); } @Test - public void testParse() throws Exception { - + public void testParse() { LocalTime localTime = LocalTime.of(9, 23, 45); LocalTime val1 = type.parse("09:23:45"); assertEquals(localTime, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1234); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1234)); } @Test public void testJsonRead() throws Exception { - - LocalTime localTime = LocalTime.of(9, 23, 45); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java index d8186457d..dbf3c3815 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java index 83f28acd3..efe128b91 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java @@ -1,13 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.time.LocalDate; import java.time.MonthDay; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeMonthDayTest { @@ -40,8 +39,7 @@ public class ScalarTypeMonthDayTest { } @Test - public void testFormatParse() throws Exception { - + public void testFormatParse() { MonthDay value = MonthDay.of(4, 29); String val1 = type.formatValue(value); MonthDay monthDay = type.parse(val1); @@ -50,27 +48,21 @@ public class ScalarTypeMonthDayTest { assertEquals(value, monthDay); } - @Test - public void testIsDateTimeCapable() throws Exception { + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = RuntimeException.class) - public void testConvertFromMillis() throws Exception { - type.convertFromMillis(1203); + @Test + public void testConvertFromMillis() { + assertThrows(RuntimeException.class, () -> type.convertFromMillis(1203)); } @Test public void testJson() throws Exception { - MonthDay value = MonthDay.of(4, 29); JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(value); } - @Test - public void testReadWriteData() throws Exception { - - } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index b0b2b1eb0..540491c4f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; @@ -9,9 +9,9 @@ import java.time.ZoneOffset; import java.util.TimeZone; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeOffsetDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java index a4dbe0bcc..a5aabbe7e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.OffsetTime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeOffsetTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java index 549004463..1f4616061 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypePathTest { private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java index 858c2d10d..29d6e6767 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Period; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java index 7ca187dc2..382cd1db0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import io.ebeaninternal.json.ModifyAwareMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypePostgresHstoreTest { @@ -22,17 +22,17 @@ public class ScalarTypePostgresHstoreTest { JsonFactory jsonFactory = new JsonFactory(); @Test - public void testIsMutable() throws Exception { + public void testIsMutable() { assertTrue(hstore.isMutable()); } @Test - public void testIsDateTimeCapable() throws Exception { + public void testIsDateTimeCapable() { assertFalse(hstore.isDateTimeCapable()); } @Test - public void testIsDirty() throws Exception { + public void testIsDirty() { Map emptyMap = new HashMap<>(); assertTrue(hstore.isDirty(emptyMap)); @@ -44,25 +44,25 @@ public class ScalarTypePostgresHstoreTest { @Test @SuppressWarnings("unchecked") - public void testParse() throws Exception { + public void testParse() { Map map = (Map) hstore.parse("{\"name\":\"rob\"}"); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); } - @Test(expected = RuntimeException.class) + @Test @SuppressWarnings("unchecked") - public void testParseDateTime() throws Exception { - Map map = (Map) hstore.convertFromMillis(1234L); - assertEquals(1, map.size()); - assertEquals("rob", map.get("name")); + public void testParseDateTime() { + assertThrows(RuntimeException.class, () -> { + Map map = (Map) hstore.convertFromMillis(1234L); + assertEquals(1, map.size()); + assertEquals("rob", map.get("name")); + }); } @Test public void testJsonWrite() throws Exception { - Map map = new LinkedHashMap<>(); - assertEquals("{\"key\":{}}", generateJson(map)); map.put("name", "rob"); @@ -74,7 +74,6 @@ public class ScalarTypePostgresHstoreTest { @Test public void testJsonRead() throws Exception { - Map map = parseHstore("{\"name\":\"rob\"}"); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java index b2fb2599e..9c9412025 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java index 397588994..29cdef05d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java index b39e8d347..b8e1149e9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java index 1f79db003..bd085d73a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.AttributeConverter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java index cb602e7f2..d84371df9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.OidTypeConverter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java index ec0979bd6..d2af88cae 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; @@ -11,7 +11,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeYearMonthDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java index be37fb162..c37282744 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Year; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeYearTest { @@ -64,33 +64,28 @@ public class ScalarTypeYearTest { @Test public void testFormatValue() throws Exception { - String formatted = type.formatValue(Year.of(2013)); assertEquals("2013", formatted); } @Test - public void testParse() throws Exception { - + public void testParse() { Year year = type.parse("2013"); assertEquals(Year.of(2013), year); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test public void testJson() throws Exception { - JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(Year.of(2013)); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java index a48ed0427..4dfbfd886 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZoneId; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeZoneIdTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java index 65b544f5f..be581d818 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZoneId; import java.time.ZoneOffset; import java.time.ZonedDateTime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeZoneOffsetTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index 168041723..f7942b397 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; @@ -11,7 +11,7 @@ import java.time.ZonedDateTime; import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeZonedDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java index 69dc36751..b96c190f7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java @@ -3,14 +3,14 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import java.util.List; import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBinaryUUID extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java index 366adcc58..10596b7f2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java @@ -2,10 +2,11 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.server.type.ScalarTypeEnumStandard.OrdinalEnum; import io.ebeaninternal.server.type.ScalarTypeEnumStandard.StringEnum; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEnumToBeanType { @@ -25,14 +26,13 @@ public class TestEnumToBeanType { Object approved = stringEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); + assertEquals(approved, Order.Status.APPROVED); approved = ordinalEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); + assertEquals(approved, Order.Status.APPROVED); Object active = withMapping.toBeanType(Customer.Status.ACTIVE); - Assert.assertTrue(active == Customer.Status.ACTIVE); - + assertEquals(active, Customer.Status.ACTIVE); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java index 6e81002da..2c7192841 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; -import io.ebeaninternal.server.type.ScalarTypeLocale; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestLocaleParse { @Test @@ -14,36 +14,34 @@ public class TestLocaleParse { // Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC" Locale l = parse("en"); - Assert.assertEquals("en", l.getLanguage()); + assertEquals("en", l.getLanguage()); l = parse("de_DE"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("DE", l.getCountry()); + assertEquals("de", l.getLanguage()); + assertEquals("DE", l.getCountry()); l = parse("en_US_WIN"); - Assert.assertEquals("en", l.getLanguage()); - Assert.assertEquals("US", l.getCountry()); - Assert.assertEquals("WIN", l.getVariant()); + assertEquals("en", l.getLanguage()); + assertEquals("US", l.getCountry()); + assertEquals("WIN", l.getVariant()); l = parse("_GB"); - Assert.assertEquals("", l.getLanguage()); - Assert.assertEquals("GB", l.getCountry()); - Assert.assertEquals("", l.getVariant()); + assertEquals("", l.getLanguage()); + assertEquals("GB", l.getCountry()); + assertEquals("", l.getVariant()); l = parse("fr__MAC"); - Assert.assertEquals("fr", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("MAC", l.getVariant()); + assertEquals("fr", l.getLanguage()); + assertEquals("", l.getCountry()); + assertEquals("MAC", l.getVariant()); l = parse("de__POSIX"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("POSIX", l.getVariant()); + assertEquals("de", l.getLanguage()); + assertEquals("", l.getCountry()); + assertEquals("POSIX", l.getVariant()); } private Locale parse(String value) { - - ScalarTypeLocale st = new ScalarTypeLocale(); - return (Locale) st.parse(value); + return new ScalarTypeLocale().parse(value); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java index d5e5bd109..818502d94 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java @@ -1,34 +1,33 @@ package io.ebeaninternal.server.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestScalarTypeUUIDBinaryConversion { @Test public void testConversion() { - UUID id = UUID.randomUUID(); byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, false); - Assert.assertEquals(16, bytes.length); + assertEquals(16, bytes.length); UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, false); - Assert.assertEquals(id, id2); + assertEquals(id, id2); } @Test public void testConversionOptimized() { - UUID id = UUID.randomUUID(); byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, true); - Assert.assertEquals(16, bytes.length); + assertEquals(16, bytes.length); UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, true); - Assert.assertEquals(id, id2); + assertEquals(id, id2); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index da942345d..d74a4fc2b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -8,11 +8,7 @@ import io.ebean.server.type.MyDayOfWeek; import io.ebean.server.type.MyEnum; import io.ebean.server.type.MySex; import io.ebeaninternal.server.core.bootup.BootupClasses; -import io.ebeaninternal.server.type.DefaultTypeManager; -import io.ebeaninternal.server.type.RsetDataReader; -import io.ebeaninternal.server.type.ScalarTypeEnumStandard; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; @@ -21,7 +17,9 @@ import java.sql.SQLException; import java.sql.Types; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestTypeManager extends BaseTestCase { @@ -51,7 +49,7 @@ public class TestTypeManager extends BaseTestCase { try { typeManager.createEnumScalarType(MyEnum.class, EnumType.STRING); - assertTrue("never get here",false); + fail("never get here"); } catch (IllegalStateException e) { assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported"); } @@ -81,7 +79,7 @@ public class TestTypeManager extends BaseTestCase { try { typeManager.createEnumScalarType(MyDayOfWeek.class, EnumType.ORDINAL); - assertTrue("never get here",false); + fail("never get here"); } catch (IllegalStateException e) { assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported"); } @@ -89,14 +87,12 @@ public class TestTypeManager extends BaseTestCase { @Test public void test() { - DefaultTypeManager typeManager = createTypeManager(); ScalarType scalarType = typeManager.getScalarType(Money.class); - assertTrue(scalarType.getJdbcType() == Types.DECIMAL); - assertTrue(!scalarType.isJdbcNative()); - Assert.assertEquals(Money.class, scalarType.getType()); - + assertEquals(Types.DECIMAL, scalarType.getJdbcType()); + assertFalse(scalarType.isJdbcNative()); + assertEquals(Money.class, scalarType.getType()); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index aed4f42ee..20da9cf98 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.ScalarTypeConverter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.ivo.Money; import org.tests.model.ivo.Oid; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java index 50131893b..859519881 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java index 2b9661727..4d54b968e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java @@ -1,17 +1,17 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.EmptyStackException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ArrayStackTest { @Test - public void testPushPop() throws Exception { - + public void testPushPop() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); stack.push("2"); @@ -23,8 +23,7 @@ public class ArrayStackTest { } @Test - public void testPushPop_given_stackInitialSizeExceeded() throws Exception { - + public void testPushPop_given_stackInitialSizeExceeded() { ArrayStack stack = new ArrayStack<>(2); stack.push("1"); stack.push("2"); @@ -35,34 +34,28 @@ public class ArrayStackTest { assertThat(stack.pop()).isEqualTo("1"); } - @Test(expected = EmptyStackException.class) - public void testPop_given_emptyStack_throws() throws Exception { - + @Test + public void testPop_given_emptyStack_throws() { ArrayStack stack = new ArrayStack<>(); - stack.pop(); - } - - @Test(expected = EmptyStackException.class) - public void testPeek_given_empty_throws() throws Exception { - - ArrayStack stack = new ArrayStack<>(); - - assertThat(stack.peek()); + assertThrows(EmptyStackException.class, stack::pop); } @Test - public void testPeek_given_notEmpty() throws Exception { + public void testPeek_given_empty_throws() { + ArrayStack stack = new ArrayStack<>(); + assertThrows(EmptyStackException.class, stack::peek); + } + @Test + public void testPeek_given_notEmpty() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); assertThat(stack.peek()).isEqualTo("1"); } @Test - public void testPeekWithNull() throws Exception { - + public void testPeekWithNull() { ArrayStack stack = new ArrayStack<>(); - assertThat(stack.peekWithNull()).isNull(); stack.push("1"); @@ -70,8 +63,7 @@ public class ArrayStackTest { } @Test - public void testIsEmpty() throws Exception { - + public void testIsEmpty() { ArrayStack stack = new ArrayStack<>(); assertThat(stack.isEmpty()).isTrue(); @@ -80,8 +72,7 @@ public class ArrayStackTest { } @Test - public void testSize() throws Exception { - + public void testSize() { ArrayStack stack = new ArrayStack<>(); assertThat(stack.size()).isEqualTo(0); @@ -92,8 +83,7 @@ public class ArrayStackTest { } @Test - public void testContains() throws Exception { - + public void testContains() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java index 0b874aa8f..cebfe6784 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.util; import io.ebeaninternal.api.BindParams; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BindParamsParserTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java index 9eceabb0a..440712865 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java index cc9234925..5e0ebcbbb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java index 9f0106cae..bc1bf8272 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class Md5Test { diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index bbc8c5752..4d14bd503 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 14eacd3ed..1f435c725 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index eb95708f1..4efc3c97d 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -7,7 +7,7 @@ import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.List; diff --git a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 5076ce1c1..034dd6b1f 100644 --- a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -6,8 +6,8 @@ import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.config.TenantMode; import org.ebeantest.LoggedSqlCollector; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ public class MultiTenantPartitionTest extends BaseTestCase { server.saveAll(tenants()); } - @AfterClass + @AfterAll public static void shutdown() { server.shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 223316cc1..188ab2dac 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -15,7 +15,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestAggregateFormula extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index fd15df520..3735b5940 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -3,7 +3,7 @@ package org.tests.aggregateformula; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java index 9db84d2c1..90c3f4705 100644 --- a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java +++ b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java @@ -7,13 +7,15 @@ import io.ebean.SqlRow; import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.datasource.DataSourceConfig; -import org.junit.Assert; import org.tests.model.basic.TOne; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Used to run some tests manually on a specific Database type. */ @@ -125,18 +127,18 @@ public class MainDbBoolean { .order("id") .findList(); - Assert.assertTrue(list.size() == 2); - Assert.assertTrue(list.get(0).isActive()); - Assert.assertFalse(!list.get(0).isActive()); + assertTrue(list.size() == 2); + assertTrue(list.get(0).isActive()); + assertFalse(!list.get(0).isActive()); String sql = "select id, name, active from t_oneb order by id"; List sqlRows = server.sqlQuery(sql).findList(); - Assert.assertTrue(sqlRows.size() == 2); + 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)); + assertTrue("T".equals(active0)); + assertTrue("F".equals(active1)); Query query = server.find(TOne.class) @@ -144,7 +146,7 @@ public class MainDbBoolean { .order("id"); int rc = query.findCount(); - Assert.assertTrue(rc > 0); + assertTrue(rc > 0); System.out.println("done"); diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java index c5781174d..f8541b894 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.IndexDefinition; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ValidationGroupSomething; import javax.persistence.Entity; @@ -25,9 +25,9 @@ import java.util.Set; import static io.ebean.annotation.Platform.H2; import static io.ebean.annotation.Platform.POSTGRES; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestAnnotationBase extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index 77d987761..fa03ed9a2 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -7,8 +7,9 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestAssocOneEqExpression extends BaseTestCase { @@ -26,7 +27,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t0.kcustomer_id = ?")); + assertTrue(sql.contains("where t0.kcustomer_id = ?")); Address b = new Address(); b.setId(1); @@ -37,7 +38,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { q2.findList(); sql = q2.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t1.billing_address_id = ?")); + assertTrue(sql.contains("where t1.billing_address_id = ?")); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java index 60952e34e..c3569e8e5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java index 8b29b6cb5..f20a5e1a6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestBatchLazyMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index d20ceb952..465bd0450 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; +import static org.junit.jupiter.api.Assertions.*; + public class TestBeanReferenceRefresh extends BaseTestCase { @Test @@ -24,27 +25,27 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Order order = Ebean.getReference(Order.class, 1); - Assert.assertTrue(Ebean.getBeanState(order).isReference()); + assertTrue(Ebean.getBeanState(order).isReference()); // invoke lazy loading Date orderDate = order.getOrderDate(); - Assert.assertNotNull(orderDate); + assertNotNull(orderDate); Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); + assertNotNull(customer); - Assert.assertFalse(Ebean.getBeanState(order).isReference()); - Assert.assertNotNull(order.getStatus()); - Assert.assertNotNull(order.getDetails()); - Assert.assertNull(Ebean.getBeanState(order).getLoadedProps()); + assertFalse(Ebean.getBeanState(order).isReference()); + assertNotNull(order.getStatus()); + assertNotNull(order.getDetails()); + assertNull(Ebean.getBeanState(order).getLoadedProps()); Status status = order.getStatus(); - Assert.assertTrue(status != Order.Status.SHIPPED); + assertTrue(status != Order.Status.SHIPPED); order.setStatus(Order.Status.SHIPPED); Ebean.refresh(order); Status statusRefresh = order.getStatus(); - Assert.assertEquals(status, statusRefresh); + assertEquals(status, statusRefresh); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java index af15e5380..56f3eea3f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -5,11 +5,11 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EDefaultProp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCreateEntityBean extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index d84b8caf4..044ea4871 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -6,12 +6,14 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteByIdCollection extends TransactionalTestCase { @Test @@ -28,8 +30,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Customer c0Back = Ebean.find(Customer.class, c0.getId()); Customer c1Back = Ebean.find(Customer.class, "" + c1.getId()); - Assert.assertNotNull(c0Back); - Assert.assertNotNull(c1Back); + assertNotNull(c0Back); + assertNotNull(c1Back); List ids = new ArrayList<>(); // also test id type conversion @@ -43,8 +45,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { c0Back = Ebean.find(Customer.class, c0.getId()); c1Back = Ebean.find(Customer.class, "" + c1.getId()); - Assert.assertNull(c0Back); - Assert.assertNull(c1Back); + assertNull(c0Back); + assertNull(c1Back); } @Test @@ -58,8 +60,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Order o0Back = Ebean.find(Order.class, order0.getId()); Order o1Back = Ebean.find(Order.class, order1.getId()); - Assert.assertNotNull(o0Back); - Assert.assertNotNull(o1Back); + assertNotNull(o0Back); + assertNotNull(o1Back); List ids = new ArrayList<>(); @@ -73,8 +75,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { o0Back = Ebean.find(Order.class, order0.getId()); o1Back = Ebean.find(Order.class, order1.getId()); - Assert.assertNull(o0Back); - Assert.assertNull(o1Back); + assertNull(o0Back); + assertNull(o1Back); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index 770719f33..eabcbb380 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Section; import org.tests.model.basic.SubSection; diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index 5ce7c6904..74b88e648 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteImportedPartial extends BaseTestCase { @@ -27,8 +28,7 @@ public class TestDeleteImportedPartial extends BaseTestCase { PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 6f3151099..77e3d4d7f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteOneToOne extends BaseTestCase { @@ -25,9 +26,8 @@ public class TestDeleteOneToOne extends BaseTestCase { PersistentFile file1 = Ebean.find(PersistentFile.class, id); PersistentFileContent content1 = Ebean.find(PersistentFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } // public void testDeleteMany() { @@ -44,7 +44,7 @@ public class TestDeleteOneToOne extends BaseTestCase { // // Customer deletedCustomer = Ebean.find(Customer.class, c.getId()); // - // Assert.assertNull(deletedCustomer); + // assertNull(deletedCustomer); // // } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index fc4e38b01..2ce2b3c5d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteOneToOneMultiple extends BaseTestCase { @@ -29,9 +30,8 @@ public class TestDeleteOneToOneMultiple extends BaseTestCase { PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 5a4e3468b..d5c69a2a1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -3,8 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TMapSuperEntity; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestDeletePartialNoVersion extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestDeletePartialNoVersion extends BaseTestCase { .select("id, name") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); e2.setName("banaban2"); Ebean.save(e2); @@ -44,7 +45,7 @@ public class TestDeletePartialNoVersion extends BaseTestCase { .select("id, name, version") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); e2.setName("banaban2two"); Ebean.save(e2); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java index 6f3d21332..c0f31775f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -5,8 +5,9 @@ import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.embedded.EMain; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestDynamicUpdate extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestDynamicUpdate extends BaseTestCase { server.save(b); - Assert.assertNotNull(b.getId()); + assertNotNull(b.getId()); // reload object und update the name EMain b2 = server.find(EMain.class, b.getId()); @@ -31,14 +32,14 @@ public class TestDynamicUpdate extends BaseTestCase { BeanState beanState = server.beanState(b2); boolean dirty = beanState.isDirty(); - Assert.assertTrue(dirty); + assertTrue(dirty); server.save(b2); server.beginTransaction(); try { EMain b3 = server.find(EMain.class, b.getId()); - Assert.assertEquals("ABC", b3.getEmbeddable().getDescription()); + assertEquals("ABC", b3.getEmbeddable().getDescription()); } finally { server.endTransaction(); } @@ -48,6 +49,6 @@ public class TestDynamicUpdate extends BaseTestCase { server.save(b4); EMain b5 = server.find(EMain.class, b.getId()); - Assert.assertEquals("123", b5.getEmbeddable().getDescription()); + assertEquals("123", b5.getEmbeddable().getDescription()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 94895a77b..c1ef80247 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -5,24 +5,22 @@ import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + 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); + assertNotNull(orders); } - } - } diff --git a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java index 481f385ee..0147c0b25 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -2,12 +2,13 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestErrorBindLog extends BaseTestCase { @Test @@ -19,10 +20,10 @@ public class TestErrorBindLog extends BaseTestCase { } catch (PersistenceException e) { String msg = e.getMessage(); if (isHana()) { - Assert.assertTrue(msg.contains("Error with property[1] dt[12]data[JUNK]")); + assertTrue(msg.contains("Error with property[1] dt[12]data[JUNK]")); } else { - Assert.assertTrue(msg.contains("Bind values:")); + assertTrue(msg.contains("Bind values:")); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java index 3dae9111d..baf77c061 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -6,13 +6,12 @@ import io.ebean.EbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.MyEBasicConfigStartup; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TestExplicitInsert extends BaseTestCase { @@ -54,11 +53,8 @@ public class TestExplicitInsert extends BaseTestCase { EbeanServer server = Ebean.getDefaultServer(); server.insert(b); - - Assert.assertNotNull(b.getId()); - - Assert.assertEquals(b.getId(), server.beanId(b)); - + assertNotNull(b.getId()); + assertEquals(b.getId(), server.beanId(b)); EBasic b2 = server.find(EBasic.class, b.getId()); b2.setId(null); @@ -66,8 +62,8 @@ public class TestExplicitInsert extends BaseTestCase { b2.setName("force insert"); server.insert(b2); - Assert.assertNotNull(b2.getId()); - Assert.assertTrue(!b.getId().equals(b2.getId())); + assertNotNull(b2.getId()); + assertTrue(!b.getId().equals(b2.getId())); List list = server.find(EBasic.class).where().in("id", b.getId(), b2.getId()).findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java index c830208d5..cfc14dd36 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java @@ -10,7 +10,7 @@ import io.ebeantest.LoggedSql; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.ExecutionException; @@ -40,7 +40,7 @@ public class TestFetchId extends BaseTestCase { List idList = futureIds.get(); assertThat(idList).isNotEmpty(); } - + @Test public void testFetchIdWithExists() throws InterruptedException, ExecutionException { @@ -62,7 +62,7 @@ public class TestFetchId extends BaseTestCase { List idList = futureIds.get(); assertThat(idList).isNotEmpty(); } - + @Test public void testFetchIdWithOrderFormula() throws InterruptedException, ExecutionException { diff --git a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java index 6a88595ef..bdc902609 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -2,14 +2,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTMaster; import javax.persistence.OptimisticLockException; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.*; + public class TestIUDVanilla extends BaseTestCase { @Test @@ -19,8 +20,8 @@ public class TestIUDVanilla extends BaseTestCase { e0.save(); - Assert.assertNotNull(e0.getId()); - Assert.assertNotNull(e0.getLastUpdate()); + assertNotNull(e0.getId()); + assertNotNull(e0.getLastUpdate()); Timestamp lastUpdate0 = e0.getLastUpdate(); @@ -28,8 +29,8 @@ public class TestIUDVanilla extends BaseTestCase { e0.save(); Timestamp lastUpdate1 = e0.getLastUpdate(); - Assert.assertNotNull(lastUpdate1); - Assert.assertNotSame(lastUpdate0, lastUpdate1); + assertNotNull(lastUpdate1); + assertNotSame(lastUpdate0, lastUpdate1); EBasicVer e2 = DB.getDefault().createEntityBean(EBasicVer.class); @@ -69,14 +70,13 @@ public class TestIUDVanilla extends BaseTestCase { e3.update(); } - @Test(expected = OptimisticLockException.class) + @Test public void modifyVersion_expect_optimisticLock() { - UTMaster e0 = new UTMaster("save me"); e0.save(); // for this case we know 42 should throw OptimisticLockException e0.setVersion(42); - e0.update(); + assertThrows(OptimisticLockException.class, () -> e0.update()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java index 0da8d823a..e7dd22ce3 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInEmpty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java index e345bc8d3..f8515ee6d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestInheritRef extends BaseTestCase { @Test @@ -33,7 +35,7 @@ public class TestInheritRef extends BaseTestCase { .setAutoTune(false) .findList(); - Assert.assertTrue(!list.isEmpty()); + assertTrue(!list.isEmpty()); Truck foundTruck = null; int found = 0; @@ -48,8 +50,8 @@ public class TestInheritRef extends BaseTestCase { } } - Assert.assertEquals(1, found); - Assert.assertTrue(foundTruck.getCapacity() == 20D); + assertEquals(1, found); + assertTrue(foundTruck.getCapacity() == 20D); } finally { Ebean.rollbackTransaction(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index a7f76a3d7..0fff445fd 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -8,10 +8,10 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import org.tests.model.basic.TJodaEntity; import org.joda.time.LocalTime; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestJodaType extends BaseTestCase { @@ -23,7 +23,7 @@ public class TestJodaType extends BaseTestCase { BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); ScalarType scalarType = beanProperty.getScalarType(); - Assert.assertNotNull(scalarType); + assertNotNull(scalarType); } @Test diff --git a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java index 0bfb8af45..9d5282c42 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Car; import org.tests.model.basic.Trip; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.Date; diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index 4135d09aa..dd3d69ff6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -2,14 +2,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadEmptyOneToMany extends BaseTestCase { @Test @@ -32,7 +33,7 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { List contacts = c1.getContacts(); int sz = contacts.size(); - Assert.assertTrue(sz == 0); + assertTrue(sz == 0); // cleanup Ebean.delete(c1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 84512076a..87c1affee 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -12,8 +12,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLazyLoadInCache extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java index 8b6fd2bc7..b499d207b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLimitQuery extends BaseTestCase { @@ -62,8 +63,8 @@ public class TestLimitQuery extends BaseTestCase { boolean hasOffset = sql.contains("offset"); if (isH2()) { - Assert.assertTrue(sql, hasLimit); - Assert.assertFalse(sql, hasOffset); + assertTrue(hasLimit); + assertFalse(hasOffset); } } @@ -84,8 +85,8 @@ public class TestLimitQuery extends BaseTestCase { boolean hasOffset = sql.contains("offset"); if (isH2()) { - Assert.assertFalse(hasLimit); - Assert.assertFalse(hasOffset); + assertFalse(hasLimit); + assertFalse(hasOffset); } } @@ -101,7 +102,7 @@ public class TestLimitQuery extends BaseTestCase { List list = query.findList(); - Assert.assertTrue("sz > 0", !list.isEmpty()); + assertTrue(!list.isEmpty()); String sql = query.getGeneratedSql(); boolean hasDetailsJoin = sql.contains("join o_order_detail"); @@ -109,11 +110,11 @@ public class TestLimitQuery extends BaseTestCase { boolean hasSelectedDetails = sql.contains("od.id,"); boolean hasDistinct = sql.contains("select distinct"); - Assert.assertTrue(hasDetailsJoin); - Assert.assertFalse(hasSelectedDetails); - Assert.assertTrue(hasDistinct); + assertTrue(hasDetailsJoin); + assertFalse(hasSelectedDetails); + assertTrue(hasDistinct); if (isH2()) { - Assert.assertTrue(hasLimit); + assertTrue(hasLimit); } query = Ebean.find(Order.class) @@ -129,11 +130,11 @@ public class TestLimitQuery extends BaseTestCase { hasSelectedDetails = sql.contains("od.id"); hasDistinct = sql.contains("select distinct"); - Assert.assertFalse("no join with maxRows", hasDetailsJoin); - Assert.assertFalse(hasSelectedDetails); - Assert.assertFalse(hasDistinct); + assertFalse(hasDetailsJoin); + assertFalse(hasSelectedDetails); + assertFalse(hasDistinct); if (isH2()) { - Assert.assertTrue(hasLimit); + assertTrue(hasLimit); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java index 1962ddede..cca4587c5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLoadBeanCache extends BaseTestCase { @Test @@ -28,6 +29,6 @@ public class TestLoadBeanCache extends BaseTestCase { // this will hit the cache Country nz = Ebean.find(Country.class, "NZ"); - Assert.assertTrue(loadedNz == nz); + assertTrue(loadedNz == nz); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java index 2c9b4b8cd..08ea3ec65 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -3,8 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.Order; @@ -12,6 +11,9 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLogTransLogOnError extends BaseTestCase { @Test @@ -32,14 +34,14 @@ public class TestLogTransLogOnError extends BaseTestCase { // t.log("--- next query should error"); List list = Ebean.find(Customer.class).where().eq("id", "NotAnInt!!").findList(); - Assert.assertEquals(0, list.size()); + assertEquals(0, list.size()); // Get here with mysql? - // Assert.assertTrue(false); + // assertTrue(false); txn.commit(); } catch (RuntimeException e) { // e.printStackTrace(); - Assert.assertTrue(true); + assertTrue(true); } } @@ -61,12 +63,12 @@ public class TestLogTransLogOnError extends BaseTestCase { Ebean.save(newBean); // never get here - Assert.assertTrue(false); + assertTrue(false); txn.commit(); } catch (RuntimeException e) { // e.printStackTrace(); - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java index 851d8bc6b..4e23d4904 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestM2MCascadeOne extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java index 536ebd9b8..76393ea15 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestM2MVanilla extends BaseTestCase { @Test @@ -50,8 +51,8 @@ public class TestM2MVanilla extends BaseTestCase { MUser checkUser = DB.find(MUser.class, u0.getUserid()); List checkRoles = checkUser.getRoles(); - Assert.assertNotNull(checkRoles); - Assert.assertEquals(2, checkRoles.size()); + assertNotNull(checkRoles); + assertEquals(2, checkRoles.size()); checkRoles.add(r3); @@ -60,8 +61,8 @@ public class TestM2MVanilla extends BaseTestCase { MUser checkUser2 = DB.find(MUser.class, u0.getUserid()); List checkRoles2 = checkUser2.getRoles(); - Assert.assertNotNull(checkRoles2); - Assert.assertEquals("added a role", 3, checkRoles2.size()); + assertNotNull(checkRoles2); + assertEquals(3, checkRoles2.size()); Query rolesQuery0 = DB.find(MUser.class).where().eq("roles", r1).query(); @@ -70,7 +71,7 @@ public class TestM2MVanilla extends BaseTestCase { Query rolesQuery = DB.find(MUser.class).where().in("roles", roleList).query(); List userInRolesList = rolesQuery.findList(); - Assert.assertTrue(!userInRolesList.isEmpty()); + assertTrue(!userInRolesList.isEmpty()); List list = DB.find(MUser.class) .where().in("roles", roleList) @@ -79,7 +80,7 @@ public class TestM2MVanilla extends BaseTestCase { MUser mUser = list.get(0); List roles = mUser.getRoles(); - Assert.assertEquals(1, roles.size()); + assertEquals(1, roles.size()); checkRoles2.remove(0); checkRoles2.remove(0); @@ -87,11 +88,10 @@ public class TestM2MVanilla extends BaseTestCase { checkUser2 = DB.find(MUser.class, u0.getUserid()); checkRoles2 = checkUser2.getRoles(); - Assert.assertNotNull(checkRoles2); - Assert.assertEquals("added a role", 1, checkRoles2.size()); + assertNotNull(checkRoles2); + assertEquals(1, checkRoles2.size()); DB.delete(checkUser2); - } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java index 3d1b932e2..36948823b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestManyLazyLoad extends BaseTestCase { @@ -22,7 +22,7 @@ public class TestManyLazyLoad extends BaseTestCase { awaitL2Cache(); List list = Ebean.find(Order.class).order().asc("id").findList(); - assertTrue(list.size() + " > 0", !list.isEmpty()); + assertFalse(list.isEmpty()); // just use the first one Order order = list.get(0); @@ -38,7 +38,7 @@ public class TestManyLazyLoad extends BaseTestCase { // lazy load the details int sz = details.size(); - assertTrue(sz + " > 0", sz > 0); + assertTrue(sz > 0); OrderDetail orderDetail = details.get(0); Order o = orderDetail.getOrder(); @@ -55,7 +55,7 @@ public class TestManyLazyLoad extends BaseTestCase { // lazy load the details int sz2 = details2.size(); - assertTrue(sz2 + " > 0", sz2 > 0); + assertTrue(sz2 > 0); Order o2 = details2.get(0).getOrder(); assertSame(o2, order2); diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java index c27e6fc02..a291c97fe 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -7,7 +7,7 @@ import org.tests.model.interfaces.Address; import org.tests.model.interfaces.IAddress; import org.tests.model.interfaces.IPerson; import org.tests.model.interfaces.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestManyOneInterface extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java index ae7340816..41e1598b6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java @@ -3,8 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TMapSuperEntity; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMappedSuper extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestMappedSuper extends BaseTestCase { .select("id, name, myint, someObject, bananan") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); TMapSuperEntity eSaveDelete = new TMapSuperEntity(); eSaveDelete.setName("babana"); diff --git a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java index f4638884e..d8f74ee54 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -6,12 +6,12 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.IgnorePlatform; import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Very simple test case to check if Ebean recognizes meta-annotation correctly. diff --git a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index 57a0a8fc2..8d501bfb0 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -3,12 +3,14 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCar; import org.tests.model.basic.OEngine; import org.tests.model.basic.OGearBox; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestMultipleOneToOneIUD extends BaseTestCase { @Test @@ -30,17 +32,17 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { Ebean.save(gearBox); Ebean.save(car); - Assert.assertNotNull(car.getId()); - Assert.assertNotNull(engine.getEngineId()); - Assert.assertNotNull(gearBox.getId()); + assertNotNull(car.getId()); + assertNotNull(engine.getEngineId()); + assertNotNull(gearBox.getId()); txn.commit(); } OCar c2 = Ebean.find(OCar.class, car.getId()); - Assert.assertNotNull(c2); - Assert.assertNotNull(c2.getEngine()); + assertNotNull(c2); + assertNotNull(c2.getEngine()); // gearBox not assigned yet - Assert.assertNull(c2.getGearBox()); + assertNull(c2.getGearBox()); // ok, assign gearBox c2.setGearBox(gearBox); @@ -48,9 +50,9 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { // now all should be there... OCar c3 = Ebean.find(OCar.class, car.getId()); - Assert.assertNotNull(c3); - Assert.assertNotNull(c3.getEngine()); - Assert.assertNotNull(c3.getGearBox()); + assertNotNull(c3); + assertNotNull(c3.getEngine()); + assertNotNull(c3.getGearBox()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java index 08678b83d..567b30482 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MNonUpdPropEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java index 90ee62c0d..9559f6ca8 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -7,11 +7,12 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestOrderByAnnotation extends TransactionalTestCase { @Test @@ -22,8 +23,7 @@ public class TestOrderByAnnotation extends TransactionalTestCase { Customer customer = Ebean.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); - Assert.assertTrue(!orders.isEmpty()); - + assertTrue(!orders.isEmpty()); Query q1 = Ebean.find(Order.class) .fetch("details"); @@ -32,6 +32,6 @@ public class TestOrderByAnnotation extends TransactionalTestCase { String s1 = q1.getGeneratedSql(); - Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); + assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 4a27102d4..1362b7fdf 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 414e2c250..66c58b6c2 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,19 +1,13 @@ package org.tests.basic; -import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import org.junit.Assert; -import org.junit.Test; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderTotalAmountReportBean extends BaseTestCase { @@ -44,7 +38,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); for (OrderAggregate r2 : l2) { - Assert.assertTrue(r2.getTotalItems() < 3); + assertTrue(r2.getTotalItems() < 3); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java index 9d6a26f36..2f647ac38 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java @@ -3,12 +3,13 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestOrderTotalAmountSql extends BaseTestCase { @Test @@ -22,8 +23,8 @@ public class TestOrderTotalAmountSql extends BaseTestCase { for (SqlRow sqlRow : sqlRows) { Integer id = sqlRow.getInteger("order_id"); Double amount = sqlRow.getDouble("total_amount"); - Assert.assertNotNull("sqlRows: " + sqlRows, id); - Assert.assertNotNull("sqlRows: " + sqlRows, amount); + assertNotNull(id); + assertNotNull(amount); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java index 2e786d5bb..07310f349 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -5,8 +5,10 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPersistenceContext extends BaseTestCase { @@ -29,7 +31,7 @@ public class TestPersistenceContext extends BaseTestCase { // not the same instance ...as a different // persistence context - Assert.assertTrue(order != oBefore); + assertTrue(order != oBefore); // finds an existing bean in the persistence context @@ -38,8 +40,8 @@ public class TestPersistenceContext extends BaseTestCase { Order o3 = Ebean.getReference(Order.class, 1); // all the same instance - Assert.assertTrue(order == o2); - Assert.assertTrue(order == o3); + assertTrue(order == o2); + assertTrue(order == o3); } finally { Ebean.endTransaction(); @@ -49,8 +51,8 @@ public class TestPersistenceContext extends BaseTestCase { // persistence context Order oAfter = Ebean.find(Order.class, 1); - Assert.assertTrue(oAfter != oBefore); - Assert.assertTrue(oAfter != order); + assertTrue(oAfter != oBefore); + assertTrue(oAfter != order); // start a persistence context Ebean.beginTransaction(); @@ -68,9 +70,8 @@ public class TestPersistenceContext extends BaseTestCase { Order order2 = Ebean.find(Order.class, orderId); Customer customer2 = order2.getCustomer(); - Assert.assertEquals(customer.getId(), customer2.getId()); - - Assert.assertTrue(customer == customer2); + assertEquals(customer.getId(), customer2.getId()); + assertTrue(customer == customer2); } finally { Ebean.endTransaction(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java index ee224ccd5..37d424b31 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -9,7 +9,7 @@ import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.ResetBasicData; @@ -17,7 +17,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryForUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index eee072594..a014c8b86 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Article; diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java index c7aba0ab8..4e12f1bc5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; @@ -14,7 +14,7 @@ import java.sql.Connection; import java.sql.SQLException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryUsingConnection extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java index 1648ed49c..54fa6b72a 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Database; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; import java.util.List; @@ -17,13 +17,13 @@ public class TestQueryUsingDatabase { public static final ESimple RECORD1 = new ESimple(); public static final ESimple RECORD2 = new ESimple(); - @Before + @BeforeEach public void setupNonDefaultDatabase() { DB.byName(SOME_OTHER_DB_NAME).insert(RECORD1); DB.byName(SOME_OTHER_DB_NAME).insert(RECORD2); } - @After + @AfterEach public void shutdown() { DB.byName(SOME_OTHER_DB_NAME).shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java index aef27680e..3ba345b9d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryWhereBetween extends BaseTestCase { long statCount; @@ -29,10 +30,10 @@ public class TestQueryWhereBetween extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("between t0.cretime and t0.updtime")); + assertTrue(sql.contains("between t0.cretime and t0.updtime")); } - @Ignore + @Disabled @Test public void doStuff() { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java index 27b752231..03579c200 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 914191cc9..8ff0561ae 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -10,10 +10,10 @@ import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryWithCache extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 64d449fda..6e150e80e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -3,8 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -15,7 +14,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestReadOnlyPropagation extends BaseTestCase { @@ -30,61 +30,61 @@ public class TestReadOnlyPropagation extends BaseTestCase { .setId(1) .findOne(); - Assert.assertTrue(DB.beanState(order).isReadOnly()); + assertTrue(DB.beanState(order).isReadOnly()); Customer customer = order.getCustomer(); - Assert.assertTrue(DB.beanState(customer).isReadOnly()); + assertTrue(DB.beanState(customer).isReadOnly()); Address billingAddress = customer.getBillingAddress(); assertNotNull(billingAddress); - Assert.assertTrue(DB.beanState(billingAddress).isReadOnly()); + assertTrue(DB.beanState(billingAddress).isReadOnly()); List details = order.getDetails(); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(!bc.isPopulated()); + assertTrue(bc.isReadOnly()); + assertTrue(!bc.isPopulated()); bc.size(); - Assert.assertTrue(!bc.isEmpty()); - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(bc.isPopulated()); + assertTrue(!bc.isEmpty()); + assertTrue(bc.isReadOnly()); + assertTrue(bc.isPopulated()); try { details.add(new OrderDetail()); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { details.remove(0); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { Iterator it = details.iterator(); it.next(); it.remove(); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { ListIterator it = details.listIterator(); it.next(); it.remove(); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { List subList = details.subList(0, 1); subList.remove(0); - Assert.assertTrue(false); + assertTrue(false); } catch (UnsupportedOperationException e) { - Assert.assertTrue(true); + assertTrue(true); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 85b816b70..e4aa4d488 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveDeleteOneToOne extends BaseTestCase { @@ -29,9 +30,8 @@ public class TestSaveDeleteOneToOne extends BaseTestCase { PersistentFileContent persistentFileContent = persistentFile.getPersistentFileContent(); - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); + assertNotNull(persistentFileContent); + assertNotNull(persistentFileContent.getContent()); Ebean.delete(persistentFile); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 91dd7fea9..96b0b8536 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { @@ -28,10 +29,8 @@ public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { PFileContent persistentFileContent = persistentFile.getFileContent(); - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); - + assertNotNull(persistentFileContent); + assertNotNull(persistentFileContent.getContent()); Ebean.delete(persistentFile); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index 3f85c0486..af865e1ac 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -7,11 +7,11 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestSharedInstancePropagation extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestTransient.java b/ebean-core/src/test/java/org/tests/basic/TestTransient.java index ef0db80bb..8ea4d3f86 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-core/src/test/java/org/tests/basic/TestTransient.java @@ -3,17 +3,17 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.sql.Types; import java.util.Optional; 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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestTransient extends BaseTestCase { @@ -31,7 +31,7 @@ public class TestTransient extends BaseTestCase { assertNotNull(c); BeanState beanState = DB.beanState(c); - assertFalse("not new or dirty as transient", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); c.getLock().tryLock(); try { @@ -43,7 +43,7 @@ public class TestTransient extends BaseTestCase { Boolean selected = c.getSelected(); assertNotNull(selected); - assertFalse("not new or dirty as transient", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); DB.save(c); @@ -51,13 +51,13 @@ public class TestTransient extends BaseTestCase { assertNotNull(selected); c.setName("Modified"); - assertTrue("dirty now", beanState.isNewOrDirty()); + assertTrue(beanState.isNewOrDirty()); selected = c.getSelected(); assertNotNull(selected); DB.save(c); - assertFalse("Not dirty after save", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); selected = c.getSelected(); assertNotNull(selected); diff --git a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java index 1a86cdcde..8e7f4a0c3 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java index b0ae3fcc2..bf28864c6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TUuidEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestUuidInsert extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 49e49fc12..0b224683d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java index 9bc32faf9..01877eca9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -7,12 +7,12 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWhereAnnotation extends TransactionalTestCase { @@ -24,7 +24,7 @@ public class TestWhereAnnotation extends TransactionalTestCase { Customer customer = Ebean.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); - Assert.assertTrue(!orders.isEmpty()); + assertTrue(!orders.isEmpty()); Query q1 = Ebean.find(Customer.class).setUseCache(false).fetch("orders").where() .idEq(1).query(); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 7cc33ffc8..940af23ad 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -7,11 +7,13 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestDeleteByIdList extends BaseTestCase { @Test @@ -24,13 +26,13 @@ public class TestDeleteByIdList extends BaseTestCase { server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer c0 = ResetBasicData.createCustAndOrder("DelIdList-0"); - Assert.assertNotNull(c0); + assertNotNull(c0); Customer c1 = ResetBasicData.createCustAndOrder("DelIdList-1"); List orderIds = Ebean.find(Order.class).where().in("customer", c0, c1).findIds(); - Assert.assertEquals(2, orderIds.size()); + assertEquals(2, orderIds.size()); Ebean.deleteAll(Order.class, orderIds); Ebean.delete(c0); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 97511df79..f0881d9db 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -7,11 +7,13 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestDeleteCascadeById extends BaseTestCase { @Test @@ -24,13 +26,13 @@ public class TestDeleteCascadeById extends BaseTestCase { server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer cust = ResetBasicData.createCustAndOrder("DelCas"); - Assert.assertNotNull(cust); + assertNotNull(cust); List orders = Ebean.find(Order.class).where().eq("customer", cust).findList(); - Assert.assertEquals(1, orders.size()); + assertEquals(1, orders.size()); Order o = orders.get(0); - Assert.assertNotNull(o); + assertNotNull(o); // cleanup Ebean.delete(o); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java index 5da596325..f42b1a8f2 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java @@ -1,42 +1,40 @@ package org.tests.basic.delete; -import static org.assertj.core.api.Assertions.assertThat; - import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.onetoone.OtoUser; import org.tests.model.onetoone.OtoUserOptional; +import static org.assertj.core.api.Assertions.assertThat; + public class TestDeleteCascadeByQuery extends BaseTestCase { - + private OtoUser testUser; private OtoUserOptional userOptional; private Query userOptionalQuery = Ebean.find(OtoUserOptional.class); private Query userQuery = Ebean.find(OtoUser.class); - + /** * Init each test. Delete all existing beans. Then create OtoUser, add OtoUserOptional and save. */ - @Before + @BeforeEach public void init() { Ebean.deleteAll(userQuery.findList()); Ebean.deleteAll(userOptionalQuery.findList()); - + userOptional = new OtoUserOptional(); Ebean.save(userOptional); testUser = new OtoUser(); testUser.setOptional(userOptional); Ebean.save(testUser); } - + /** - * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE + * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE * setting. */ @Test @@ -49,14 +47,14 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { + "did not delete the OneToOne mapped entity as set with CascadeType.ALL") .isEqualTo(0); } - + /** - * Test that validates deleting a bean with OneToOne mapping with a query respects the + * Test that validates deleting a bean with OneToOne mapping with a query respects the * CascadeType.DELETE setting. */ @Test public void testDeleteCascadeByQuery() { - + assertThat(userQuery.delete()).isEqualTo(1); assertThat(userOptionalQuery.findCount()) @@ -64,11 +62,11 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { + "did not delete the OneToOne mapped entity as set with CascadeType.ALL") .isEqualTo(0); } - + /** * Cleanup - Delete all existing beans for the next test. */ - @After + @AfterEach public void cleanup() { Ebean.deleteAll(userQuery.findList()); Ebean.deleteAll(userOptionalQuery.findList()); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index 74eeec665..ca8a47f3b 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncryptRelate; @@ -16,7 +16,7 @@ import java.sql.Date; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEncrypt extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 2a8e4224c..3265bf574 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -3,12 +3,13 @@ package org.tests.basic.encrypt; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptBinary; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestEncryptBinary extends BaseTestCase { @Test @@ -38,7 +39,7 @@ public class TestEncryptBinary extends BaseTestCase { e1.getDescription(); - Assert.assertEquals(t0, t1); + assertEquals(t0, t1); e1.setName("testmod"); e1.setDescription("moddesc"); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java index e5d59a07b..90eef2c71 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java @@ -2,7 +2,7 @@ package org.tests.basic.encrypt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptClient; import java.time.LocalDate; diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index 9b025b0c3..c05c5fcd7 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -4,8 +4,9 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TWithPreInsert; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestPreInsertValidation extends BaseTestCase { @@ -19,8 +20,8 @@ public class TestPreInsertValidation extends BaseTestCase { Ebean.save(e); // the save worked and name set in preInsert - Assert.assertNotNull(e.getId()); - Assert.assertNotNull(e.getName()); + assertNotNull(e.getId()); + assertNotNull(e.getName()); TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId()); @@ -43,7 +44,7 @@ public class TestPreInsertValidation extends BaseTestCase { Ebean.update(bean2); // title set on preUpdate - Assert.assertNotNull(bean2.getTitle()); + assertNotNull(bean2.getTitle()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java index 425610c9f..84f369cf5 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.QueryType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TOne; diff --git a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index b218b6168..c46dd323a 100644 --- a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -6,7 +6,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 831ec4ee5..408234021 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -6,12 +6,12 @@ import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestBasicClobFetchEager extends BaseTestCase { @@ -42,7 +42,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Assert query same as previous ... List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); @@ -64,7 +64,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Test refresh function - Assert.assertEquals("initialClobValue", entity.getDescription()); + assertEquals("initialClobValue", entity.getDescription()); LoggedSqlCollector.start(); @@ -73,9 +73,9 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Assert all properties fetched in refresh loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); - Assert.assertEquals("modified", entity.getDescription()); + assertEquals("modified", entity.getDescription()); } diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index f33a42a42..eed250046 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.EBasicClobNoVer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java index d675cb6b7..f5bb0cd0e 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -3,7 +3,7 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TBytesOnly; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestByteOnly extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 48ad933cf..9232a878c 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -2,11 +2,11 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestOne2OneBookingInvoice extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index 6203d3071..5105cb2b3 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -2,7 +2,7 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneWheelTire extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java index e7b8577cb..0ebacbde6 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java @@ -4,8 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import org.tests.model.basic.EBasicEnumId; @@ -13,8 +12,9 @@ import org.tests.model.basic.EBasicEnumInt; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestEnumValueAnnotation extends BaseTestCase { @@ -65,7 +65,7 @@ public class TestEnumValueAnnotation extends BaseTestCase { try { b = DB.find(EBasicEnumId.class, b.getStatus()); } catch (java.lang.IllegalArgumentException iae) { - Assert.fail("The use of an enum as id should work : " + iae.getLocalizedMessage()); + fail("The use of an enum as id should work : " + iae.getLocalizedMessage()); } assertEquals(EBasicEnumId.Status.NEW, b.getStatus()); diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index 2d68014c7..d65a823fb 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -3,15 +3,15 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.ESomeType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Currency; import java.util.List; import java.util.Locale; import java.util.TimeZone; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestExtraScalarTypes extends BaseTestCase { @@ -31,9 +31,9 @@ public class TestExtraScalarTypes extends BaseTestCase { ESomeType e2 = Ebean.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne(); - Assert.assertNotNull(e2.getCurrency()); - Assert.assertNotNull(e2.getLocale()); - Assert.assertNotNull(e2.getTimeZone()); + assertNotNull(e2.getCurrency()); + assertNotNull(e2.getLocale()); + assertNotNull(e2.getTimeZone()); List list = Ebean.find(ESomeType.class) .setAutoTune(false).where() diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java index 66910df8f..ec226169b 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.types.Cidr; import io.ebean.types.Inet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EWithInetAddr; import java.net.InetAddress; @@ -13,8 +13,8 @@ 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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInetAddressType extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 043150526..0c700c8ef 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -3,7 +3,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java index 77b67724a..d2b3084f3 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TUuidEntity; import java.util.Arrays; @@ -12,8 +12,8 @@ import java.util.List; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSqlRowUUID extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java index cb6f7b8c1..7ee4ca9a9 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java @@ -2,7 +2,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 2f9cdf7f1..aa1482cbf 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -14,7 +14,7 @@ import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebeaninternal.api.SpiTransaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.TSDetail; @@ -24,7 +24,7 @@ import java.sql.Timestamp; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchInsertFlush extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java index 620b926bb..92101e4b4 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java @@ -3,7 +3,7 @@ package org.tests.batchinsert; import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.batchinsert.o2o.MeterAddressData; import org.tests.batchinsert.o2o.MeterContractData; import org.tests.batchinsert.o2o.MeterSpecialNeedsClient; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index e6d75eef2..253ac5f52 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -8,7 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Random; //import static org.assertj.core.api.Assertions.assertThat; -//import static org.junit.Assert.assertNull; +//import static org.junit.jupiter.api.Assertions.assertNull; public class TestBatchInsertSimple extends BaseTestCase { @@ -209,7 +209,7 @@ public class TestBatchInsertSimple extends BaseTestCase { return detail; } - @Test(expected = Test.None.class)// no exception expected + @Test public void npe_addBatch_withoutAnyBindParams() { try (Transaction txn = DB.beginTransaction()) { // don't write code like this please ... diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 5a6fadfca..84fc0837a 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 947b904d4..edba34622 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -9,7 +9,7 @@ import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.persist.BatchControl; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithUniqueCon; import org.tests.model.basic.EOptOneB; import org.tests.model.basic.EOptOneC; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index c92440fa6..6a86d8a2f 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -6,10 +6,10 @@ import io.ebean.EbeanServer; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchSaveWithGetBeanId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java index 9656832a1..15e198d6d 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -11,14 +11,15 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import static org.junit.jupiter.api.Assertions.*; + public class TestBasicLazy extends BaseTestCase { @Test @@ -29,15 +30,15 @@ public class TestBasicLazy extends BaseTestCase { Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); - Assert.assertNotNull(order); + assertNotNull(order); Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getName()); + assertNotNull(customer); + assertNotNull(customer.getName()); Address address = customer.getBillingAddress(); - Assert.assertNotNull(address); - Assert.assertNotNull(address.getCity()); + assertNotNull(address); + assertNotNull(address.getCity()); } public void test_N1N() { @@ -46,26 +47,26 @@ public class TestBasicLazy extends BaseTestCase { // safety check to see if our customer we are going to use for the test has // some contacts Customer c = Ebean.find(Customer.class).setId(1).findOne(); - Assert.assertNotNull(c.getContacts()); - Assert.assertTrue("no contacts on test customer 1", !c.getContacts().isEmpty()); + assertNotNull(c.getContacts()); + assertTrue(!c.getContacts().isEmpty()); // start transaction so we have a "long running" persistence context Transaction tx = Ebean.beginTransaction(); try { List order = Ebean.find(Order.class).where(Expr.eq("customer.id", 1)).findList(); - Assert.assertNotNull(order); - Assert.assertTrue(!order.isEmpty()); + assertNotNull(order); + assertTrue(!order.isEmpty()); Customer customer = order.get(0).getCustomer(); - Assert.assertNotNull(customer); - Assert.assertEquals(1, customer.getId().intValue()); + assertNotNull(customer); + assertEquals(1, customer.getId().intValue()); // this should lazily fetch the contacts List contacts = customer.getContacts(); - Assert.assertNotNull(contacts); - Assert.assertTrue("contacts not lazily fetched", !contacts.isEmpty()); + assertNotNull(contacts); + assertTrue(!contacts.isEmpty()); } finally { tx.commit(); } @@ -77,19 +78,19 @@ public class TestBasicLazy extends BaseTestCase { Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); - Assert.assertNotNull(order); + assertNotNull(order); final Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); + assertNotNull(customer); - Assert.assertTrue(Ebean.getBeanState(customer).isReference()); + assertTrue(Ebean.getBeanState(customer).isReference()); final Throwable throwables[] = new Throwable[2]; Thread t1 = new Thread() { @Override public void run() { try { - Assert.assertNotNull(customer.getName()); + assertNotNull(customer.getName()); } catch (Throwable e) { throwables[0] = e; } @@ -100,7 +101,7 @@ public class TestBasicLazy extends BaseTestCase { @Override public void run() { try { - Assert.assertNotNull(customer.getName()); + assertNotNull(customer.getName()); } catch (Throwable e) { throwables[1] = e; } @@ -119,7 +120,7 @@ public class TestBasicLazy extends BaseTestCase { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0; } - Assert.assertFalse(Ebean.getBeanState(customer).isReference()); + assertFalse(Ebean.getBeanState(customer).isReference()); if (throwables[0] != null) { throw throwables[0]; @@ -178,7 +179,7 @@ public class TestBasicLazy extends BaseTestCase { new FetchThread(tg, 3).start(); orders = Ebean.find(Order.class).fetchLazy("customer").findList(); - Assert.assertTrue(orders.size() >= 4); + assertTrue(orders.size() >= 4); try { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000; @@ -200,7 +201,7 @@ public class TestBasicLazy extends BaseTestCase { for (Throwable exception : exceptions) { exception.printStackTrace(); } - Assert.fail(); + fail(); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index 5354c7cf3..1b884bac2 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -2,14 +2,15 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestBasicNavOnEmpty extends BaseTestCase { @Test @@ -25,7 +26,7 @@ public class TestBasicNavOnEmpty extends BaseTestCase { c = Ebean.find(Customer.class, c.getId()); List contacts = c.getContacts(); - Assert.assertEquals(0, contacts.size()); + assertEquals(0, contacts.size()); // cleanup Ebean.delete(c); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 4558594a5..00307797e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -6,14 +6,14 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index a91cbbd76..55cd76eae 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -2,15 +2,16 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Assert; -import org.junit.Test; import javax.persistence.EntityNotFoundException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestBatchLazyWithDeleted extends BaseTestCase { @Test @@ -53,12 +54,12 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { // is NOT the bean that will invoke the lazy loading // (in this case it is the second bean in the list). int deletedCount = Ebean.delete(UUOne.class, oneB.getId()); - Assert.assertEquals(1, deletedCount); + assertEquals(1, deletedCount); for (UUTwo u : list) { u.getMaster(); //BeanState beanState = Ebean.getBeanState(master); - //Assert.assertTrue(beanState.isReference()); + //assertTrue(beanState.isReference()); } // invoke lazy loading on the second 'master' bean @@ -73,10 +74,10 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { // it was removed from the "lazy load context" earlier try { list.get(2).getMaster().getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // this bean was deleted and lazy loading failed - Assert.assertTrue(true); + assertTrue(true); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java index c6ef4fbd1..5dc8c59ee 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java @@ -5,7 +5,7 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestBeanState extends BaseTestCase { @@ -106,9 +106,8 @@ public class TestBeanState extends BaseTestCase { assertThat(beanState.getChangedProps()).containsOnly("contacts"); } - @Test(expected = IllegalStateException.class) + @Test public void readOnly_when_setManyProperty() { - Customer customer = new Customer(); customer.setContacts(new ArrayList<>()); @@ -117,13 +116,11 @@ public class TestBeanState extends BaseTestCase { beanState.setReadOnly(true); // act, try to mutate read only bean - customer.setContacts(new ArrayList<>()); + assertThrows(IllegalStateException.class, () -> customer.setContacts(new ArrayList<>())); } - - @Test(expected = IllegalStateException.class) + @Test public void readOnly_when_setProperty() { - Customer customer = new Customer(); customer.setName("a"); @@ -132,6 +129,6 @@ public class TestBeanState extends BaseTestCase { beanState.setReadOnly(true); // act, try to mutate read only bean - customer.setName("b"); + assertThrows(IllegalStateException.class, () -> customer.setName("b")); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index 40be470a8..8be7c68a8 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -2,7 +2,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java index bd15f2f6d..2ca9de453 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestLazyJoin extends BaseTestCase { @Test @@ -36,7 +37,7 @@ public class TestLazyJoin extends BaseTestCase { // in the customer (not just name and status) Address billingAddress = customer.getBillingAddress(); - Assert.assertNotNull(billingAddress); + assertNotNull(billingAddress); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java index b44e173dc..4576adbc3 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -2,17 +2,14 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyJoin2 extends BaseTestCase { @Test @@ -33,7 +30,7 @@ public class TestLazyJoin2 extends BaseTestCase { Order o0 = l0.get(0); Customer c0 = o0.getCustomer(); List contacts = c0.getContacts(); - Assert.assertTrue(!contacts.isEmpty()); + assertTrue(!contacts.isEmpty()); // query 1) find order (status, shipDate) // query 2) find orderDetail (quantity, price) join product (sku, name) @@ -57,7 +54,7 @@ public class TestLazyJoin2 extends BaseTestCase { // in the customer (not just name and status) Address billingAddress = customer.getBillingAddress(); - Assert.assertNotNull(billingAddress); + assertNotNull(billingAddress); List list = Ebean.find(Order.class).fetchLazy("customer", "name") .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") @@ -67,7 +64,7 @@ public class TestLazyJoin2 extends BaseTestCase { Customer customer2 = order2.getCustomer(); // customer2.getStatus(); String name = customer2.getName(); - Assert.assertNotNull(name); + assertNotNull(name); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 8f8c770aa..81e7ec0ae 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -6,7 +6,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 0beb20db4..4e948723b 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -3,12 +3,13 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadNonExistantBean extends BaseTestCase { @Test @@ -20,10 +21,10 @@ public class TestLazyLoadNonExistantBean extends BaseTestCase { try { // invoke lazy loading one.getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // expecting this - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 966080ba8..f52c01ae6 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -3,12 +3,13 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadNonExistentBean extends BaseTestCase { @Test @@ -20,10 +21,10 @@ public class TestLazyLoadNonExistentBean extends BaseTestCase { try { // invoke lazy loading one.getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // expecting this - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index e446ae57b..97e7f7011 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -6,13 +6,13 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestQueryDisableLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 822f80a21..90c32ad90 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -9,11 +9,12 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestQueryJoin extends BaseTestCase { @Test @@ -36,21 +37,21 @@ public class TestQueryJoin extends BaseTestCase { Order order = list.get(0); BeanState beanStateOrder = Ebean.getBeanState(order); - Assert.assertNotNull(beanStateOrder.getLoadedProps()); - // Assert.assertTrue(beanStateOrder.getLoadedProps().contains("id")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("status")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("customer")); + assertNotNull(beanStateOrder.getLoadedProps()); + // assertTrue(beanStateOrder.getLoadedProps().contains("id")); + assertTrue(beanStateOrder.getLoadedProps().contains("status")); + assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); + assertTrue(beanStateOrder.getLoadedProps().contains("customer")); Customer customer = order.getCustomer(); BeanState beanStateCustomer = Ebean.getBeanState(customer); - Assert.assertTrue(beanStateCustomer.isReference()); + assertTrue(beanStateCustomer.isReference()); customer.getName(); - Assert.assertNotNull(beanStateCustomer.getLoadedProps()); - Assert.assertTrue(beanStateCustomer.getLoadedProps().contains("name")); - Assert.assertTrue(beanStateCustomer.getLoadedProps().contains("status")); - Assert.assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); + assertNotNull(beanStateCustomer.getLoadedProps()); + assertTrue(beanStateCustomer.getLoadedProps().contains("name")); + assertTrue(beanStateCustomer.getLoadedProps().contains("status")); + assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); customer.getName(); @@ -58,7 +59,7 @@ public class TestQueryJoin extends BaseTestCase { System.out.println(billingAddress); billingAddress.getLine1(); - Assert.assertTrue(!list.isEmpty()); + assertTrue(!list.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 04883177e..480f799be 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.FetchConfig; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index e8a21786c..df54a6ef9 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -3,12 +3,12 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.FetchConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSecondQueryNoRows extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java index e2895c493..a55361bd7 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -2,7 +2,7 @@ package org.tests.batchload; import io.ebean.*; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -10,9 +10,9 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestSecondaryQueries extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java index 80ef3b99d..7265bebe2 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Country; @@ -18,7 +18,7 @@ import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 9eb438032..232ca0e57 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -3,7 +3,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index ffb88f150..908dae151 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -3,15 +3,15 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import java.util.List; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Test class testing clearing cache with delete query diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index 4144ca557..bbf3f08d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -6,7 +6,7 @@ import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 20fa503c7..7131d0f97 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -6,8 +6,9 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestCacheBasic extends BaseTestCase { @@ -20,7 +21,7 @@ public class TestCacheBasic extends BaseTestCase { ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); loadCountryCache(); - Assert.assertTrue(countryCache.size() > 0); + assertTrue(countryCache.size() > 0); // reset the statistics countryCache.statistics(true); @@ -28,26 +29,26 @@ public class TestCacheBasic extends BaseTestCase { Country c0 = Ebean.getReference(Country.class, "NZ"); ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); - Assert.assertEquals(1, hc); - Assert.assertNotNull(c0); + assertEquals(1, hc); + assertNotNull(c0); // Country c1 = Ebean.getReference(Country.class, "NZ"); - // Assert.assertEquals(2, countryCache.getStatistics(false).getHitCount()); - // //Assert.assertEquals(100, + // assertEquals(2, countryCache.getStatistics(false).getHitCount()); + // //assertEquals(100, // countryCache.getStatistics(false).getHitRatio()); // // // same instance as caching with readOnly=true - // Assert.assertTrue(c0 != c1); + // assertTrue(c0 != c1); // // c0.getName(); // c1.getName(); // // // reset the statistics - // Assert.assertEquals(2,countryCache.getStatistics(true).getHitCount()); + // assertEquals(2,countryCache.getStatistics(true).getHitCount()); // // now the count should be 0 again - // Assert.assertEquals(0, countryCache.getStatistics(false).getHitCount()); + // assertEquals(0, countryCache.getStatistics(false).getHitCount()); // // and hitRatio is 0 as well - // Assert.assertEquals(0, countryCache.getStatistics(false).getHitRatio()); + // assertEquals(0, countryCache.getStatistics(false).getHitRatio()); // // // hit the country cache automatically via join // @@ -59,7 +60,7 @@ public class TestCacheBasic extends BaseTestCase { // Country c2 = billingAddress.getCountry(); // c2.getName(); // - // Assert.assertTrue(countryCache.getStatistics(false).getHitCount() > 0); + // assertTrue(countryCache.getStatistics(false).getHitCount() > 0); // // //Country c3 = Ebean.getReference(Country.class, "NZ"); // //Country c4 = Ebean.find(Country.class, "NZ"); @@ -76,28 +77,28 @@ public class TestCacheBasic extends BaseTestCase { // Country c5 = billingAddress.getCountry(); // // but cache is empty so c5 is reference that will load cache // // if it is lazy loaded - // Assert.assertEquals("empty cache",0,countryCache.getStatistics(false).getSize()); - // //Assert.assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount()); + // assertEquals("empty cache",0,countryCache.getStatistics(false).getSize()); + // //assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount()); // // // lazy load on c5 populates the cache // c5.getName(); - // Assert.assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize()); + // assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize()); // // // now these get hits in the cache // Country c6 = Ebean.find(Country.class, "NZ"); // - // Assert.assertTrue("different instance as cache cleared",c2 != c5); - // Assert.assertTrue("these 2 are different",c5 != c6); + // assertTrue("different instance as cache cleared",c2 != c5); + // assertTrue("these 2 are different",c5 != c6); // // // by default readOnly based on deployment annotation - // Assert.assertTrue("read only",Ebean.getBeanState(c6).isReadOnly()); + // assertTrue("read only",Ebean.getBeanState(c6).isReadOnly()); // // try { // // can't modify a readOnly bean // c6.setName("Nu Zilund"); - // Assert.assertFalse("Never get here",true); + // assertFalse("Never get here",true); // } catch (IllegalStateException e){ - // Assert.assertTrue("This is readOnly",true); + // assertTrue("This is readOnly",true); // } // // Country c8 = Ebean.find(Country.class) @@ -106,14 +107,14 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Explicitly NOT readOnly - // Assert.assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly()); + // assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly()); // - // Assert.assertEquals("1 countries in cache", 1, countryCache.size()); + // assertEquals("1 countries in cache", 1, countryCache.size()); // c8.setName("Nu Zilund"); // // the update will remove the entry from the cache // Ebean.save(c8); // - // Assert.assertEquals("1 country in cache", 1, countryCache.size()); + // assertEquals("1 country in cache", 1, countryCache.size()); // // Country c9 = Ebean.find(Country.class) // .setReadOnly(false) @@ -121,26 +122,26 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Find loads cache ... - // Assert.assertFalse(Ebean.getBeanState(c9).isReadOnly()); - // Assert.assertTrue(countryCache.size() > 0); + // assertFalse(Ebean.getBeanState(c9).isReadOnly()); + // assertTrue(countryCache.size() > 0); // // Country c10 = Ebean.find(Country.class,"NZ"); // - // Assert.assertTrue(Ebean.getBeanState(c10).isReadOnly()); - // Assert.assertTrue(countryCache.size() > 0); + // assertTrue(Ebean.getBeanState(c10).isReadOnly()); + // assertTrue(countryCache.size() > 0); // // Ebean.getServerCacheManager().clear(Country.class); - // Assert.assertEquals("0 country in cache", 0, countryCache.size()); + // assertEquals("0 country in cache", 0, countryCache.size()); // // // reference doesn't load cache yet // Country c11 = Ebean.getReference(Country.class, "NZ"); // // // still 0 in cache - // Assert.assertEquals("0 country in cache", 0, countryCache.size()); + // assertEquals("0 country in cache", 0, countryCache.size()); // // // will invoke lazy loading.. // c11.getName(); - // Assert.assertTrue(countryCache.size() > 0); + // assertTrue(countryCache.size() > 0); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 0fcef9cee..f72510f95 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -9,8 +9,8 @@ import io.ebean.Update; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.server.cache.CachedManyIds; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -24,10 +24,10 @@ import org.tests.model.basic.ResetBasicData; import java.util.ArrayList; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheCollectionIds extends BaseTestCase { @@ -303,10 +303,10 @@ public class TestCacheCollectionIds extends BaseTestCase { assertEquals(2, dummyCountries.size()); // assert that the cache contains the expected entry - assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size()); + assertEquals(1, cachedBeanCountriesCache.size()); CachedManyIds dummyEntry = (CachedManyIds) cachedBeanCountriesCache.get(dummyLoad.getId()); assertNotNull(dummyEntry); - assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size()); + assertEquals(2, dummyEntry.getIdList().size()); assertTrue(dummyEntry.getIdList().contains("NZ")); assertTrue(dummyEntry.getIdList().contains("AU")); @@ -320,7 +320,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.update(update); awaitL2Cache(); - assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size()); + assertEquals(1, cachedBeanCountriesCache.size()); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(update.getId()); @@ -369,7 +369,7 @@ public class TestCacheCollectionIds extends BaseTestCase { * When doing an ORM update the collection cache must be cleared. */ @Test - @Ignore + @Disabled public void testClearingCollectionCacheOnORMUpdate() { // arrange ResetBasicData.reset(); @@ -404,7 +404,7 @@ public class TestCacheCollectionIds extends BaseTestCase { * This is true for all changes insert,update, delete. Tested for delete here. */ @Test - @Ignore + @Disabled public void testClearingCollectionCacheOnExternalModification() { // arrange ResetBasicData.reset(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java index 68a91678c..74f7cc3b5 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -3,8 +3,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; @@ -13,6 +12,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestCacheCustomer extends BaseTestCase { @Test @@ -42,7 +43,7 @@ public class TestCacheCustomer extends BaseTestCase { List list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) .findList(); - Assert.assertTrue(list.size() > 1); + assertTrue(list.size() > 1); for (Customer customer : list) { Address billingAddress = customer.getBillingAddress(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java index a5f5e111e..c73954ff9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java @@ -2,11 +2,11 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import org.tests.model.basic.OCachedBeanChild; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java index ccc65f820..ce511ea58 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java @@ -2,11 +2,11 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCacheEmbeddedId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index 992d3eabc..95fc22d92 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -2,13 +2,13 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java index fd6e209b0..c54202896 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.OCachedInhChildA; import org.tests.model.basic.OCachedInhRoot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java index 608b481d7..412010235 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -5,15 +5,15 @@ import io.ebean.CacheMode; import io.ebean.Ebean; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.ResetBasicData; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheNaturalId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java index ef863dc65..dddb4f7d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java @@ -7,10 +7,10 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestExternalNotification extends BaseTestCase { @@ -55,7 +55,7 @@ public class TestExternalNotification extends BaseTestCase { loadCountryCache(); int cacheSize = countryCache.size(); - assertTrue("cacheSize: " + cacheSize, cacheSize > 0); + assertTrue(cacheSize > 0); SqlUpdate sqlUpdate = Ebean .createSqlUpdate("update o_country set name = :name where code = :code"); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 7e02c995c..044c1f932 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -5,11 +5,10 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.cache.ServerCache; import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.FeatureDescription; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TestL2CacheWithSharedBean extends BaseTestCase { @@ -48,12 +47,12 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { // load the cache FeatureDescription fetchOne = Ebean.find(FeatureDescription.class, f1.getId()); - Assert.assertNotNull(fetchOne); + assertNotNull(fetchOne); assertEquals(1, beanCache.statistics(false).getSize()); FeatureDescription fetchTwo = Ebean.find(FeatureDescription.class, f1.getId()); FeatureDescription fetchThree = Ebean.find(FeatureDescription.class, f1.getId()); - Assert.assertSame(fetchTwo, fetchThree); + assertSame(fetchTwo, fetchThree); String description1 = fetchThree.getDescription(); assertEquals("helloOne", description1); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index 6032728a4..ea50565d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java index 83cb402f1..40eee3349 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java @@ -2,7 +2,7 @@ package org.tests.cache; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; import org.tests.model.cache.M2MCacheMaster; diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index 0c4dc2317..b9db72a07 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -7,8 +7,7 @@ import io.ebean.ExpressionList; import io.ebean.bean.BeanCollection; import io.ebean.cache.ServerCache; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.cache.EColAB; @@ -17,6 +16,7 @@ import java.util.List; import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCache extends BaseTestCase { @@ -224,10 +224,10 @@ public class TestQueryCache extends BaseTestCase { .ilike("name", "Rob").findList(); BeanCollection bc = (BeanCollection) list; - Assert.assertTrue(bc.isReadOnly()); - Assert.assertFalse(bc.isEmpty()); - Assert.assertTrue(!list.isEmpty()); - Assert.assertTrue(DB.beanState(list.get(0)).isReadOnly()); + assertTrue(bc.isReadOnly()); + assertFalse(bc.isEmpty()); + assertTrue(!list.isEmpty()); + assertTrue(DB.beanState(list.get(0)).isReadOnly()); List list2 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() .ilike("name", "Rob").findList(); @@ -236,25 +236,22 @@ public class TestQueryCache extends BaseTestCase { // .setReadOnly(true) .where().ilike("name", "Rob").findList(); - Assert.assertSame(list, list2); + assertSame(list, list2); // readOnly defaults to true for query cache - Assert.assertSame(list, list2B); - - - + assertSame(list, list2B); List list3 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where() .ilike("name", "Rob").findList(); - Assert.assertNotSame(list, list3); + assertNotSame(list, list3); BeanCollection bc3 = (BeanCollection) list3; - Assert.assertFalse(bc3.isReadOnly()); - Assert.assertFalse(bc3.isEmpty()); - Assert.assertTrue(list3.size() > 0); + assertFalse(bc3.isReadOnly()); + assertFalse(bc3.isEmpty()); + assertTrue(list3.size() > 0); // TODO: At this stage setReadOnly(false) does create a shallow copy of the List/Set/Map, but does not // change the read only state in the entities. - // Assert.assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly()); + // assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 6e442fa4f..54e94fce9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -1,27 +1,25 @@ package org.tests.cache; import io.ebean.BaseTestCase; +import io.ebean.DB; import io.ebean.Ebean; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCacheCountry extends BaseTestCase { - private ServerCacheManager cacheManager = Ebean.getServerCacheManager(); - private ServerCache queryCache = cacheManager.queryCache(Country.class); - private ServerCache beanCache = cacheManager.beanCache(Country.class); + private final ServerCacheManager cacheManager = DB.getServerCacheManager(); + private final ServerCache queryCache = cacheManager.queryCache(Country.class); + private final ServerCache beanCache = cacheManager.beanCache(Country.class); private void clearCache() { queryCache.clear(); @@ -29,7 +27,6 @@ public class TestQueryCacheCountry extends BaseTestCase { queryCache.statistics(true); } - @Test public void emptyQueryResult_expect_cached() { @@ -142,7 +139,7 @@ public class TestQueryCacheCountry extends BaseTestCase { ServerCacheStatistics statistics = queryCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); - Assert.assertSame(countryList1, countryList0); + assertSame(countryList1, countryList0); Country nz = Ebean.find(Country.class, "NZ"); nz.setName("New Zealandia"); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 0b5517eb7..88cdd7d06 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -5,15 +5,15 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryCacheInsert extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index a8b1bb524..73123adde 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -7,7 +7,7 @@ import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicVer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; @@ -23,7 +23,7 @@ public class TestQueryCacheReadOnly extends BaseTestCase { EbeanServer server = Ebean.getServer(null); EBasicVer account = new EBasicVer("an other junk"); server.save(account); - + Query baseQuery = server.find(EBasicVer.class).setUseQueryCache(CacheMode.ON); List alist = baseQuery.findList(); @@ -82,10 +82,10 @@ public class TestQueryCacheReadOnly extends BaseTestCase { Map amap = baseQuery.setMapKey("name").findMap(); assertThat(amap).isNotEmpty(); - amap.clear(); + amap.clear(); amap = baseQuery.setMapKey("name").findMap(); assertThat(amap).isNotEmpty(); - amap.clear(); + amap.clear(); Set aset = baseQuery.findSet(); assertThat(aset).isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 46c910f83..97511cef9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.cache.ServerCache; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java index c3d6ba97d..49649482c 100644 --- a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java +++ b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java @@ -1,10 +1,10 @@ package org.tests.cache.embeddedid; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBeanCacheEmbeddedIdPrimitives { diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index a5d950009..d351a693b 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -5,7 +5,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheRegion; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PersonCacheTests { diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java index 6379491ff..3434c48eb 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java @@ -2,7 +2,7 @@ package org.tests.cache.personinfo; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java index 11db943a6..70caa7d29 100644 --- a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.CallableSql; import io.ebean.Ebean; import io.ebean.EbeanServer; +import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestMysqlCallable extends BaseTestCase { @@ -28,7 +28,7 @@ public class TestMysqlCallable extends BaseTestCase { /** * Only run this test manually against MySQL with the above stored procedure. */ - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java index 178c5271c..5468657b0 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java @@ -3,14 +3,14 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCascadeOrphanStatelessUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java index f4356d2bf..324774d01 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java b/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java index 63e47b301..bd45cc8ba 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index 7ff1477cc..853ff3ae2 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestMasterDetailDelete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index f0e007547..e98e21878 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.site.DataContainer; import org.tests.model.site.Site; import org.tests.model.site.SiteAddress; @@ -21,12 +21,12 @@ public class TestMultiCascadeBatch extends BaseTestCase { private Transaction txn; - @Before + @BeforeEach public void before() { txn = Ebean.beginTransaction(); } - @After + @AfterEach public void after() { if (txn != null) { txn.end(); diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java index 8da56d1b1..1fecd07d9 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java index a306cb105..5757b10e2 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java @@ -3,7 +3,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java index 5c9ee8235..4965fa834 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -6,14 +6,14 @@ import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPrivateOwned extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 42321dc43..7c7bf8c67 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { @@ -28,6 +29,6 @@ public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { TSMaster master2 = Ebean.find(master1.getClass(), master1.getId()); - Assert.assertTrue(master2.getDetails().isEmpty()); + assertTrue(master2.getDetails().isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java index d3b81fa05..3ce671419 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java @@ -3,7 +3,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index 462956d94..50cf83a9d 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -4,11 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.OptimisticLockException; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { @Test @@ -35,12 +37,12 @@ public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { Ebean.save(master1); } catch (OptimisticLockException exception) { // Occured when the "unsaved" bean was wrongly being deleted - Assert.fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); + fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); return; } master2 = master1 = Ebean.find(master1.getClass(), master1.getId()); - Assert.assertTrue(master2.getDetails().isEmpty()); + assertTrue(master2.getDetails().isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java index 75f8c97bd..b67ad2a14 100644 --- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java @@ -8,19 +8,11 @@ import io.ebean.DatabaseFactory; import io.ebean.annotation.ChangeLog; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPersistRequest; -import io.ebean.event.changelog.BeanChange; -import io.ebean.event.changelog.ChangeLogFilter; -import io.ebean.event.changelog.ChangeLogListener; -import io.ebean.event.changelog.ChangeLogPrepare; -import io.ebean.event.changelog.ChangeLogRegister; -import io.ebean.event.changelog.ChangeSet; -import io.ebean.event.changelog.ChangeType; -import io.ebean.event.changelog.TxnState; +import io.ebean.event.changelog.*; import io.ebeantest.LoggedSql; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; import org.tests.model.json.PlainBean; @@ -28,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestChangeLog extends BaseTestCase { @@ -40,12 +32,12 @@ public class TestChangeLog extends BaseTestCase { Database server; - @Before + @BeforeEach public void setup() { server = createServer(); } - @After + @AfterEach public void shutdown() { server.shutdown(); } @@ -133,7 +125,7 @@ public class TestChangeLog extends BaseTestCase { assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE); assertThat(change.getData()).isNull(); } - + @Test public void testWithJsonMutationDetection() { @@ -142,23 +134,23 @@ public class TestChangeLog extends BaseTestCase { bean.setShortDescription("hello"); PlainBean jsonBean = new PlainBean(); bean.setPlainBean(jsonBean); - jsonBean.setName("A"); + jsonBean.setName("A"); server.save(bean); - + BeanChange change = firstChange(); assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT); - + jsonBean.setName("B"); LoggedSql.start(); server.save(bean); assertThat(LoggedSql.stop()).isNotEmpty(); - + change = firstChange(); assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE); assertThat(change.getData()).contains("\"plainBean\":{\"name\":\"B\""); assertThat(change.getOldData()).contains("\"plainBean\":{\"name\":\"A\""); } - + @Test public void testMutationWithCache() throws Exception { EBasicChangeLog bean = new EBasicChangeLog(); diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java index 3cd3dfa39..fe42c14cb 100644 --- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java +++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java @@ -2,7 +2,7 @@ package org.tests.changelog; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; public class TestChangeLogInt extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java index acd40ad4c..eeb66a5e4 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -2,15 +2,15 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; 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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestCKeyDelete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index b8a0f0781..aefb28085 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -8,12 +8,13 @@ import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; import org.tests.model.composite.ROrder; import org.tests.model.composite.ROrderPK; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestCKeyIdInExpression extends BaseTestCase { @Test @@ -62,14 +63,14 @@ public class TestCKeyIdInExpression extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("(t0.company=? and t0.order_number=?) or")); + assertTrue(sql.contains("(t0.company=? and t0.order_number=?) or")); Query query2 = server.find(ROrder.class).setId(k0); query2.findOne(); sql = query2.getGeneratedSql(); - Assert.assertTrue(sql.contains("t0.company = ? ")); - Assert.assertTrue(sql.contains(" and t0.order_number = ?")); + assertTrue(sql.contains("t0.company = ? ")); + assertTrue(sql.contains(" and t0.order_number = ?")); server.delete(ROrder.class, k0); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 7e5aed4d0..f58453e3f 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -8,14 +8,14 @@ import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCKeyLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index 028c9c9c6..0cea9e28f 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.compositekeys.db.CaoBean; import org.tests.compositekeys.db.CaoKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java index 0a1f96500..2db126951 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java @@ -4,22 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; - -import org.junit.Before; -import org.junit.Test; -import org.tests.compositekeys.db.Item; -import org.tests.compositekeys.db.ItemKey; -import org.tests.compositekeys.db.Region; -import org.tests.compositekeys.db.RegionKey; -import org.tests.compositekeys.db.SubType; -import org.tests.compositekeys.db.SubTypeKey; -import org.tests.compositekeys.db.Type; -import org.tests.compositekeys.db.TypeKey; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.tests.compositekeys.db.*; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test some of the Avaje core functionality in conjunction with composite keys like *
    @@ -29,9 +22,8 @@ import java.util.List; */ public class TestCore extends BaseTestCase { - @Before + @BeforeEach public void setUp() throws Exception { - Ebean.createUpdate(Item.class, "delete from Item").execute(); Ebean.createUpdate(Region.class, "delete from Region").execute(); Ebean.createUpdate(Type.class, "delete from Type").execute(); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 358c1c8e0..a632649ef 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -6,8 +6,8 @@ import io.ebean.annotation.Identity; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.persistence.CascadeType; import javax.persistence.Embeddable; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Read more at https://groups.google.com/forum/#!topic/ebean/VD1MV2-LrOc @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { - @Before + @BeforeEach public void before() { // remove all the User records first diff --git a/ebean-core/src/test/java/org/tests/config/TestTableName.java b/ebean-core/src/test/java/org/tests/config/TestTableName.java index 83fefa08b..be7f699aa 100644 --- a/ebean-core/src/test/java/org/tests/config/TestTableName.java +++ b/ebean-core/src/test/java/org/tests/config/TestTableName.java @@ -2,10 +2,11 @@ package org.tests.config; import io.ebean.BaseTestCase; import io.ebean.config.TableName; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestTableName extends BaseTestCase { @@ -31,26 +32,26 @@ public class TestTableName extends BaseTestCase { public void test() { TableName t = new TableName("a"); - Assert.assertEquals("a", t.getName()); - Assert.assertNull(t.getCatalog()); - Assert.assertNull(t.getSchema()); + assertEquals("a", t.getName()); + assertNull(t.getCatalog()); + assertNull(t.getSchema()); t = new TableName("b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertNull(t.getCatalog()); + assertEquals("a", t.getName()); + assertEquals("b", t.getSchema()); + assertNull(t.getCatalog()); t = new TableName("c.b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertEquals("c", t.getCatalog()); + assertEquals("a", t.getName()); + assertEquals("b", t.getSchema()); + assertEquals("c", t.getCatalog()); // try { // TableName t2 = new TableName("d.c.b.a"); -// Assert.assertNotNull(t2); -// Assert.assertTrue(false); +// assertNotNull(t2); +// assertTrue(false); // } catch (RuntimeException e){ -// Assert.assertTrue(true); +// assertTrue(true); // } @@ -60,8 +61,8 @@ public class TestTableName extends BaseTestCase { // 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()); +// assertNull(intTab.getCatalog()); +// assertEquals("test", intTab.getSchema()); +// assertEquals("oe_order_cust", intTab.getName()); } } diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 44f0175b8..6715efb5c 100644 --- a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -6,8 +6,9 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import org.tests.model.basic.MProtectedConstructBean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestProtectedConstructor extends BaseTestCase { @@ -18,7 +19,7 @@ public class TestProtectedConstructor extends BaseTestCase { // check that we can construc a bean with a protected constructor MProtectedConstructBean bean = server.createEntityBean(MProtectedConstructBean.class); - Assert.assertNotNull(bean); + 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 @@ -27,10 +28,10 @@ public class TestProtectedConstructor extends BaseTestCase { EntityBean entityBean = (EntityBean) bean; Object newBeanInstance = entityBean._ebean_newInstance(); - Assert.assertNotNull(newBeanInstance); + assertNotNull(newBeanInstance); BeanState beanState = Ebean.getBeanState(newBeanInstance); - Assert.assertTrue(beanState.isNew()); - Assert.assertNotSame(entityBean, newBeanInstance); + assertTrue(beanState.isNew()); + assertNotSame(entityBean, newBeanInstance); } diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java index 92aaab8de..fed74f781 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java @@ -1,9 +1,10 @@ package org.tests.ddd.iud; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class TestDExhEntityEl extends TestCase { +public class TestDExhEntityEl { + @Test public void test() { // GlobalProperties.put("classes", DExhEntity.class.toString()); diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 260a98962..72aaa6d9b 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -8,13 +8,13 @@ import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; import org.tests.model.ddd.DPerson; import org.tests.model.ivo.Money; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Currency; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestDPersonEl { diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java index 2992a533d..897d0563a 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java @@ -1,10 +1,10 @@ package org.tests.ddd.iud; -import junit.framework.TestCase; - -public class TestDPersonIUD extends TestCase { +import org.junit.jupiter.api.Test; +public class TestDPersonIUD { + @Test public void test() { // GlobalProperties.put("classes", DPerson.class.toString()); diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java index f6f2ee64e..9dc78289b 100644 --- a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java index a5f7affb2..1ccdf17e7 100644 --- a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -3,7 +3,7 @@ package org.tests.defaultvalues; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index c0a63888b..2db15fdee 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -2,10 +2,10 @@ package org.tests.delete; import io.ebean.BaseTestCase; import org.tests.model.onetoone.Account; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteByIdUsingModel extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index 6858e12d4..2e94a0732 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -4,13 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; import java.util.Arrays; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { @Test @@ -38,9 +39,8 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { Product shadow1 = server.find(Product.class, prod1.getId()); Product shadow2 = server.find(Product.class, prod2.getId()); - Assert.assertNull(shadow1); - Assert.assertNull(shadow2); - + assertNull(shadow1); + assertNull(shadow2); } // cleanup diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java index 7ef161e5f..65c60e755 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -8,7 +8,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmarkUser; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index ccf49f0d7..d36bca9b4 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -3,7 +3,7 @@ package org.tests.delete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index 20eff9e4d..87b357a93 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.EBasicVer; import org.tests.model.converstation.Group; diff --git a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java index e7047cc37..d3729226c 100644 --- a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java index 5c698098e..f1693e3fb 100644 --- a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; @@ -14,7 +14,8 @@ import java.sql.Timestamp; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DocLinkTest extends BaseTestCase { @@ -102,11 +103,11 @@ public class DocLinkTest extends BaseTestCase { try { Ebean.deletePermanent(live); - assertTrue("never get here", false); + fail("never get here"); } catch (PersistenceException e) { // assert nice message when trying to delete live bean - assertThat(e.getMessage().contains("Explicit Delete is not allowed on a 'live' bean - only draft beans")); + assertThat(e.getMessage()).contains("Explicit Delete is not allowed on a 'live' bean - only draft beans"); } } @@ -148,7 +149,7 @@ public class DocLinkTest extends BaseTestCase { // Expect a nice try { live.save(); - assertTrue("Never get here", false); + fail("Never get here"); } catch (PersistenceException e) { // we want to assert the message is nice and meaningful (and not a optimistic locking exception etc) @@ -158,7 +159,6 @@ public class DocLinkTest extends BaseTestCase { @Test public void testDirtyState() { - Timestamp when = new Timestamp(System.currentTimeMillis()); String comment = "Really interesting"; diff --git a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java index 070371ee0..d8cf7837e 100644 --- a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -5,7 +5,7 @@ import io.ebean.EbeanServer; import io.ebean.PagedList; import io.ebean.Query; import org.tests.model.draftable.Link; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java index 3d2dd4b2c..a632f2607 100644 --- a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java @@ -2,7 +2,7 @@ package org.tests.draftable; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Document; import org.tests.model.draftable.DocumentMedia; import org.tests.model.draftable.Organisation; @@ -10,8 +10,8 @@ import org.tests.model.draftable.Organisation; 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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class OrganisationTest { diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index b58a75438..c5e155b3e 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -11,8 +11,9 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.el.ElPropertyChain; import io.ebeaninternal.server.el.ElPropertyDeploy; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestELBasic extends BaseTestCase { @@ -23,46 +24,46 @@ public class TestELBasic extends BaseTestCase { BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); - Assert.assertTrue(elId instanceof BeanProperty); + assertTrue(elId instanceof BeanProperty); ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress"); - Assert.assertTrue(elBillAddress instanceof BeanPropertyAssocOne); + 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()); + assertTrue(elBillAddressId instanceof BeanFkeyProperty); + assertEquals("billing_address_id", elBillAddressId.getDbColumn()); + assertEquals("billingAddress.id", elBillAddressId.getName()); + 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()); + assertTrue(elBillAddressCity instanceof ElPropertyChain); + assertEquals("billingAddress", elBillAddressCity.getElPrefix()); + assertEquals("city", elBillAddressCity.getName()); + assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); + assertEquals("city", elBillAddressCity.getDbColumn()); // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders"); - Assert.assertTrue(elOrders instanceof BeanPropertyAssocMany); + 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()); + assertTrue(elOrderStatus instanceof ElPropertyChain); + assertEquals("orders", elOrderStatus.getElPrefix()); + assertEquals("status", elOrderStatus.getName()); + assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); + assertEquals("status", elOrderStatus.getDbColumn()); ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); - Assert.assertTrue(elOrderCust instanceof ElPropertyChain); + assertTrue(elOrderCust instanceof ElPropertyChain); ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details"); - Assert.assertTrue(elOrderDetails instanceof ElPropertyChain); + assertTrue(elOrderDetails instanceof ElPropertyChain); ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id"); - Assert.assertTrue(elOrderDetailsId instanceof ElPropertyChain); + assertTrue(elOrderDetailsId instanceof ElPropertyChain); } diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index 0852b6327..10b7d45d0 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -8,9 +8,9 @@ import io.ebean.plugin.SpiServer; import org.tests.model.basic.Address; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestPathExpression { diff --git a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java index 2e82d1a83..0a14628de 100644 --- a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java b/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java index eda307b53..0ef60c906 100644 --- a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java +++ b/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java @@ -1,7 +1,7 @@ package org.tests.embedded; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EAddressStatus; import org.tests.model.embedded.EPerson3; diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index e328b3b8c..ef33658fd 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -3,7 +3,7 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index 4b148c02e..fc12e6ea1 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -5,8 +5,9 @@ import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestConstructorPutfieldReplacement extends BaseTestCase { @@ -21,9 +22,8 @@ public class TestConstructorPutfieldReplacement extends BaseTestCase { int namePos = ebi.findProperty("name"); int fileContentPos = ebi.findProperty("fileContent"); - Assert.assertTrue(ebi.isLoadedProperty(namePos)); - Assert.assertTrue(ebi.isLoadedProperty(fileContentPos)); - + assertTrue(ebi.isLoadedProperty(namePos)); + assertTrue(ebi.isLoadedProperty(fileContentPos)); } } diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java index 10bd1b0d6..515d45e73 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java @@ -1,9 +1,10 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * Note take care if you run this test in an IDE with a debugger as that can trigger the equals and @@ -22,12 +23,12 @@ public class TestEnhancementEquals extends BaseTestCase { 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()); + assertEquals(product1, product2); + assertEquals(product1.hashCode(), product2.hashCode()); product2.setName("kumera"); - Assert.assertEquals("still equal based on identity", product1, product2); - Assert.assertEquals("still hashCode equal based on id", product1.hashCode(), product2.hashCode()); + assertEquals(product1, product2); + assertEquals(product1.hashCode(), product2.hashCode()); } @@ -42,13 +43,13 @@ public class TestEnhancementEquals extends BaseTestCase { product1.setId(345); int hashcode2 = product1.hashCode(); - Assert.assertEquals("hashCode can't change", hashcode1, hashcode2); + assertEquals(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()); + assertNotEquals(product1, product2); + assertTrue(product1.hashCode() != product2.hashCode()); } } diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java index 013060804..6ed9b84d1 100644 --- a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java +++ b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java @@ -2,7 +2,7 @@ package org.tests.expression.bitwise; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java index a24127737..02ae8f0bb 100644 --- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java @@ -7,16 +7,16 @@ import io.ebean.annotation.Platform; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.family.ChildPerson; import org.tests.model.family.GrandParentPerson; import org.tests.model.family.ParentPerson; -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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritance extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java index da9aa3ceb..ec5f044f9 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -3,10 +3,10 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.EGenProps; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestGeneratedProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java index 9adb3bb5a..2b3c873f4 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.MyCurrentUserProvider; import org.tests.model.EWhoProps; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.generated.User; import org.tests.model.generated.WhoPropsOneToMany; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestGeneratedWho extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java index 78af8f844..eaf7d57b4 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java @@ -1,13 +1,14 @@ package org.tests.genkey; import io.ebean.Ebean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; -import junit.framework.TestCase; -import org.junit.Assert; -public class TestGeneratedKeys extends TestCase { +import static org.junit.jupiter.api.Assertions.assertNotNull; +public class TestGeneratedKeys { + @Test public void testJdbcBatchInsert() { TOne c = new TOne(); @@ -26,11 +27,10 @@ public class TestGeneratedKeys extends TestCase { Ebean.commitTransaction(); } Integer id = c.getId(); - Assert.assertNotNull("Get Id back after insert", id); + assertNotNull(id); Integer id1 = c1.getId(); - Assert.assertNotNull("Get Id back after insert", id1); - + assertNotNull(id1); } } diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java index 24b0b787d..a46684808 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.TOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSeqBatch extends BaseTestCase { @@ -16,15 +17,11 @@ public class TestSeqBatch extends BaseTestCase { } BeanDescriptor d = spiEbeanServer().getBeanDescriptor(TOne.class); - Object id = d.nextId(null); - Assert.assertNotNull(id); - // System.out.println(id); - + assertNotNull(id); for (int i = 0; i < 16; i++) { Object id2 = d.nextId(null); - Assert.assertNotNull(id2); - // System.out.println(id2); + assertNotNull(id2); } } diff --git a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java index 61db881a1..c5d3f5560 100644 --- a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java @@ -9,7 +9,7 @@ import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.converstation.User; diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java index 6f94dbd53..8a96e3a18 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java @@ -3,11 +3,11 @@ package org.tests.idkeys; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ECustomId; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCustomId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index ee46be72f..9632bebcf 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.api.SpiEbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.GenKeyIdentity; import org.tests.idkeys.db.GenKeySequence; @@ -14,9 +14,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestGeneratedKeys extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java index 1ea628a36..d6fb39d36 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,11 +1,11 @@ package org.tests.idkeys; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; import io.ebean.BaseTestCase; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index 25d72bae2..f00c65b87 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -1,22 +1,22 @@ package org.tests.idkeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSimpleIdInsert extends BaseTestCase { @Test public void test() { - ESimple e = new ESimple(); e.setName("name"); - Ebean.save(e); + DB.save(e); - Assert.assertNotNull(e.getId()); + assertNotNull(e.getId()); } diff --git a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java b/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java index 3b892b864..14712485e 100644 --- a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java +++ b/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java @@ -1,10 +1,10 @@ package org.tests.inherit; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class InheritDiscIntTest { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java index 2b53a3d4a..e17879542 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java @@ -3,12 +3,13 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; import org.tests.model.basic.ListAttributeValue; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestDuplicateKeyException extends BaseTestCase { /** @@ -44,7 +45,7 @@ public class TestDuplicateKeyException extends BaseTestCase { //Ebean.save(holder); }); } catch (Exception e) { - Assert.assertEquals(e.getMessage(), "test rollback"); + assertEquals(e.getMessage(), "test rollback"); } } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java index 9376a400f..ec8caac39 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -9,12 +9,12 @@ import org.tests.model.basic.CarFuse; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestInheritInsert extends BaseTestCase { @@ -32,7 +32,7 @@ public class TestInheritInsert extends BaseTestCase { assertEquals(Double.valueOf(10d), ((Truck) v).getCapacity()); assertNotNull(t0.getId()); } else { - assertTrue("v not a Truck?", false); + fail(); } VehicleDriver driver = new VehicleDriver(); @@ -48,7 +48,7 @@ public class TestInheritInsert extends BaseTestCase { assertEquals(Double.valueOf(10d), capacity); assertNotNull(v.getId()); } else { - assertTrue("v not a Truck?", false); + fail("v not a Truck?"); } List list = Ebean.find(VehicleDriver.class).findList(); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index df91ad2de..228f1d861 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -4,7 +4,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java index 9bcdad41b..a42250f49 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.GroupConfiguration; import org.tests.inheritance.model.ProductConfiguration; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index 695bc09d0..47b76df8a 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -5,8 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.CalculationResult; import org.tests.inheritance.model.Configurations; import org.tests.inheritance.model.GroupConfiguration; @@ -15,6 +14,8 @@ import org.tests.inheritance.model.ProductConfiguration; import java.util.Collections; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInheritanceJoins extends BaseTestCase { @Test @@ -57,7 +58,7 @@ public class TestInheritanceJoins extends BaseTestCase { CalculationResult result = server.find(CalculationResult.class, r.getId()); GroupConfiguration group = result.getGroupConfiguration(); - Assert.assertEquals(group.getId(), gc.getId()); + assertEquals(group.getId(), gc.getId()); } @Test @@ -99,7 +100,7 @@ public class TestInheritanceJoins extends BaseTestCase { List groups = configurationsQueried.getGroupConfigurations(); - Assert.assertTrue(!groups.isEmpty()); + assertTrue(!groups.isEmpty()); } @Test @@ -112,7 +113,7 @@ public class TestInheritanceJoins extends BaseTestCase { Configurations configurationsQueried = server.find(Configurations.class).fetch("groupConfigurations").where().idEq(configurations.getId()).findOne(); - Assert.assertNotNull(configurationsQueried); + assertNotNull(configurationsQueried); } @Test @@ -132,8 +133,8 @@ public class TestInheritanceJoins extends BaseTestCase { Configurations configurationsQueried = database.find(Configurations.class).fetch("groupConfigurations").fetch("productConfigurations").where().idEq(configurations.getId()).findOne(); - Assert.assertEquals(Collections.singletonList(gc), configurationsQueried.getGroupConfigurations()); - Assert.assertEquals(Collections.singletonList(pc), configurationsQueried.getProductConfigurations()); + assertEquals(Collections.singletonList(gc), configurationsQueried.getGroupConfigurations()); + assertEquals(Collections.singletonList(pc), configurationsQueried.getProductConfigurations()); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 1a0bc812c..78fba42ba 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.AnimalShelter; import org.tests.model.basic.BigDog; @@ -15,8 +15,8 @@ import org.tests.model.basic.Dog; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestInheritanceOnMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index dd6ef5832..e0ede7386 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; import org.tests.inheritance.order.OrderedB; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index 3d16b0e46..7de74f3c1 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 040a5e424..8731fc1b9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -4,8 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleLeaseLong; @@ -15,6 +14,8 @@ import java.time.LocalDate; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritanceRawSql extends BaseTestCase { @@ -38,13 +39,13 @@ public class TestInheritanceRawSql extends BaseTestCase { .setParameter("id", truck.getId()) .findList(); - Assert.assertEquals(1, list.size()); + assertEquals(1, list.size()); Vehicle vehicle2 = list.get(0); - Assert.assertTrue(vehicle2 instanceof Truck); + assertTrue(vehicle2 instanceof Truck); Truck truck2 = (Truck) vehicle2; - Assert.assertEquals("ASB23", truck2.getLicenseNumber()); + assertEquals("ASB23", truck2.getLicenseNumber()); // invoke lazy loading and set the capacity truck2.setCapacity(30D); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index f38000825..8774b3fef 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,13 +1,13 @@ package org.tests.inheritance; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.ebeantest.LoggedSqlCollector; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java index 42a2bb210..61cb4a3c8 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -5,8 +5,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TIntChild; import org.tests.model.basic.TIntRoot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestIntInherit extends BaseTestCase { @@ -34,13 +35,13 @@ public class TestIntInherit extends BaseTestCase { Ebean.save(c2); TIntRoot result1 = Ebean.find(TIntRoot.class, r.getId()); - Assert.assertTrue(result1 instanceof TIntRoot); + assertTrue(result1 instanceof TIntRoot); TIntRoot ref3 = Ebean.getReference(TIntRoot.class, c1.getId()); - Assert.assertTrue(ref3 instanceof TIntRoot); + assertTrue(ref3 instanceof TIntRoot); TIntRoot result3 = Ebean.find(TIntRoot.class, c1.getId()); - Assert.assertTrue(result3 instanceof TIntChild); + assertTrue(result3 instanceof TIntChild); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index 3dd088406..b956704ff 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -2,7 +2,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestNpeOnDiscriminator extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java index 9f5448823..6cc099987 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; import org.tests.model.basic.ListAttributeValue; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.*; + public class TestSkippable extends BaseTestCase { private static final Logger logger = LoggerFactory.getLogger(TestSkippable.class); @@ -36,10 +37,10 @@ public class TestSkippable extends BaseTestCase { logger.info(" -- seeded data"); final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId()); - Assert.assertNotNull(listAttributeDB); + assertNotNull(listAttributeDB); final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next(); - Assert.assertTrue(value1.getId().equals(value1_DB.getId())); + assertTrue(value1.getId().equals(value1_DB.getId())); logger.info(" -- asserted data in db"); @@ -61,12 +62,12 @@ public class TestSkippable extends BaseTestCase { final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId()); - Assert.assertNotNull(listAttributeDB_2); + 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())); + assertEquals(value2.getId(), value2_DB_2.getId()); + assertTrue(value2.getId().equals(value2_DB_2.getId())); Ebean.delete(listAttributeDB_2); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index 3bdc08d8a..8adec83ec 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -3,9 +3,9 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestTreeOrganisations extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java index 42f36d263..f31360ba9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java +++ b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java @@ -2,7 +2,7 @@ package org.tests.inheritance.abstrakt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestInheritanceNum extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index df7a28462..70ddcd518 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.stream.Collectors; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java index 3c88e598e..9b533afd9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java @@ -1,8 +1,9 @@ package org.tests.inheritance.cache; import io.ebean.DB; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInheritCacheRefLoad { @@ -29,17 +30,17 @@ public class TestInheritCacheRefLoad { // 2 - Read Data (no Cache Hit) //========================================================================= Class streetClass = reloadCustomer(customer, false); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); streetClass = reloadCustomer(customer, false); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); //========================================================================= // 3 - Read Data (L2-Cache Hit) //========================================================================= streetClass = reloadCustomer(customer, true); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); streetClass = reloadCustomer(customer, true); //returns StreetParent -> NOT OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index f4161d79e..72bb02fa0 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -5,7 +5,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index ad104db21..a390674ba 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -3,7 +3,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRef; import org.tests.model.basic.cache.CInhRoot; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java index 269642b2f..b11abf5ed 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java @@ -2,10 +2,10 @@ package org.tests.inheritance.cascadedelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInheritanceDeleteCascade extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 4e4e5b64a..84e4ccd37 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -2,13 +2,16 @@ package org.tests.inheritance.company.domain; import io.ebean.Ebean; import io.ebean.EbeanServer; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Test; import java.util.List; -public class TestInheritAbstract extends TestCase { +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; +public class TestInheritAbstract { + + @Test public void testMe() { EbeanServer server = Ebean.getServer(null); @@ -16,13 +19,13 @@ public class TestInheritAbstract extends TestCase { List list0 = server.find(AbstractBar.class) .findList(); - Assert.assertNotNull(list0); + assertNotNull(list0); List list1 = server.find(AbstractBar.class) .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list1); + assertNotNull(list1); Foo f = new Foo(); f.setImportantText("blah"); @@ -37,13 +40,13 @@ public class TestInheritAbstract extends TestCase { .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list2); - Assert.assertTrue(!list2.isEmpty()); + assertNotNull(list2); + assertThat(list2).isNotEmpty(); for (AbstractBar abstractBar : list2) { Foo foo = abstractBar.getFoo(); String importantText = foo.getImportantText(); - Assert.assertNotNull(importantText); + assertNotNull(importantText); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java index a58e2b418..4cbf3dbaa 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.plugin.Property; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Document; import java.util.Set; @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestInsertCheckUnique extends BaseTestCase { - @Before + @BeforeEach public void clearDb() { DB.find(Document.class).asDraft().where().contains("title", "UniqueKey").delete(); DB.find(Document.class).asDraft().where().isNull("title").delete(); diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java index 87b5d98cf..bbf529b92 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java @@ -3,12 +3,13 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInsertCollection extends BaseTestCase { @Test @@ -26,13 +27,13 @@ public class TestInsertCollection extends BaseTestCase { Ebean.insertAll(customers); - Assert.assertNotNull(cust1.getId()); - Assert.assertNotNull(cust2.getId()); + assertNotNull(cust1.getId()); + assertNotNull(cust2.getId()); Customer cust1Check = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals(cust1.getName(), cust1Check.getName()); + assertEquals(cust1.getName(), cust1Check.getName()); Customer cust2Check = Ebean.find(Customer.class, cust2.getId()); - Assert.assertEquals(cust2.getName(), cust2Check.getName()); + assertEquals(cust2.getName(), cust2Check.getName()); cust1.setName("jim-changed"); cust2.setName("bob-changed"); @@ -41,9 +42,9 @@ public class TestInsertCollection extends BaseTestCase { awaitL2Cache(); Customer cust1Check2 = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals("jim-changed", cust1Check2.getName()); + assertEquals("jim-changed", cust1Check2.getName()); Customer cust2Check2 = Ebean.find(Customer.class, cust2.getId()); - Assert.assertEquals("bob-changed", cust2Check2.getName()); + assertEquals("bob-changed", cust2Check2.getName()); cust1Check2.setName("jim-updated"); @@ -59,9 +60,9 @@ public class TestInsertCollection extends BaseTestCase { Customer cust1Check3 = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals("jim-updated", cust1Check3.getName()); + assertEquals("jim-updated", cust1Check3.getName()); Customer cust3Check = Ebean.find(Customer.class, cust3.getId()); - Assert.assertEquals("mac", cust3Check.getName()); + assertEquals("mac", cust3Check.getName()); List deleteList = new ArrayList<>(); deleteList.add(cust1Check3); @@ -71,11 +72,9 @@ public class TestInsertCollection extends BaseTestCase { Ebean.deleteAll(deleteList); awaitL2Cache(); - Assert.assertNull(Ebean.find(Customer.class, cust1Check3.getId())); - Assert.assertNull(Ebean.find(Customer.class, cust2Check2.getId())); - Assert.assertNull(Ebean.find(Customer.class, cust3.getId())); - + assertNull(Ebean.find(Customer.class, cust1Check3.getId())); + assertNull(Ebean.find(Customer.class, cust2Check2.getId())); + assertNull(Ebean.find(Customer.class, cust3.getId())); } - } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index 539f05f8d..157c4579f 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -6,18 +6,21 @@ import io.ebean.DataIntegrityException; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; +import javax.persistence.PersistenceException; + +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestInsertDataIntegrityException extends BaseTestCase { @IgnorePlatform(Platform.NUODB) - @Test(expected = DataIntegrityException.class) + @Test public void insert_invalidForeignKey() { - ResetBasicData.reset(); // an invalid foreign key value @@ -27,6 +30,6 @@ public class TestInsertDataIntegrityException extends BaseTestCase { order.setStatus(Order.Status.NEW); order.setCustomer(invalidCustomer); - DB.save(order); + assertThrows(DataIntegrityException.class, () -> DB.save(order)); } } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 0c728eaa3..efa1fad4a 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -5,8 +5,8 @@ import io.ebean.DuplicateKeyException; import io.ebean.Ebean; import io.ebean.annotation.Transactional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.draftable.Document; @@ -15,46 +15,47 @@ import java.sql.SQLException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestInsertDuplicateKey extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestInsertDuplicateKey.class); - @Before + @BeforeEach public void clearDb() { server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete(); } - @Test(expected = DuplicateKeyException.class) + @Test public void insert_duplicateKey() { - Document doc1 = new Document(); doc1.setTitle("ThisIsAUniqueKey"); doc1.setBody("one"); - doc1.save(); - Document doc2 = new Document(); - doc2.setTitle("ThisIsAUniqueKey"); - doc2.setBody("clashes with doc1"); + assertThrows(DuplicateKeyException.class, () -> { + Document doc2 = new Document(); + doc2.setTitle("ThisIsAUniqueKey"); + doc2.setBody("clashes with doc1"); + doc2.save(); + }); + } - doc2.save(); + @Test + public void insertBatch_duplicateKey() { + assertThrows(DuplicateKeyException.class, this::insertBatch_duplicateKey_action); } @Transactional(batchSize = 100) - @Test(expected = DuplicateKeyException.class) - public void insertBatch_duplicateKey() { - + void insertBatch_duplicateKey_action() { Document doc1 = new Document(); doc1.setTitle("ThisIsASecondUniqueKey"); doc1.setBody("one"); - doc1.save(); Document doc2 = new Document(); doc2.setTitle("ThisIsASecondUniqueKey"); doc2.setBody("clash when batch flushed"); - doc2.save(); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 1a856001d..60d8bbfe6 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.orderentity.OrderEntity; import org.tests.model.orderentity.OrderItemEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java index d2777fc3b..e2c1b9ebc 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java @@ -2,7 +2,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java index cb576612c..effd778e5 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -6,7 +6,7 @@ import io.ebean.Database; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index 20d320a80..d6a6d401b 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java +++ b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -1,7 +1,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java index 7d2be0607..87b97e24d 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.carwheel.Car; import org.tests.model.carwheel.Tire; import org.tests.model.carwheel.Wheel; diff --git a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java index 9fad6d8ec..e2aa263e4 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.info.InfoCompany; import org.tests.model.info.InfoCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInfoOneToOne extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index d191bff8c..e9a324e12 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestInsertQueryUpdate extends BaseTestCase { @Test @@ -25,7 +26,7 @@ public class TestInsertQueryUpdate extends BaseTestCase { BeanState beanState = Ebean.getBeanState(e1); Set loadedProps = beanState.getLoadedProps(); - Assert.assertFalse(loadedProps.contains("description")); + assertFalse(loadedProps.contains("description")); //lastUpdate e1.setName("name1"); diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java index 32dc30f16..f6bee6094 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -3,10 +3,12 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestInsertUpdateTrans extends BaseTestCase { @Test @@ -18,9 +20,9 @@ public class TestInsertUpdateTrans extends BaseTestCase { e0.setDescription("something"); Ebean.save(e0); - Assert.assertNotNull(e0.getId()); - Assert.assertNotNull(e0.getLastUpdate()); - Assert.assertEquals("onInsert", e0.getName()); + assertNotNull(e0.getId()); + assertNotNull(e0.getLastUpdate()); + assertEquals("onInsert", e0.getName()); e0.setName("onUpdate"); e0.setDescription("differentFromInsert"); @@ -30,9 +32,9 @@ public class TestInsertUpdateTrans extends BaseTestCase { 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()); + assertEquals(e0.getId(), e1.getId()); + assertEquals("onUpdate", e1.getName()); + assertEquals("differentFromInsert", e1.getDescription()); txn.commit(); } diff --git a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java index e523ddf83..0cd2bcda1 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java @@ -3,7 +3,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java index 1107c6b8d..44ed27534 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -3,7 +3,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java index 01b971ab8..e83ff4839 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -3,7 +3,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; import org.tests.model.json.StringJacksonType; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 0c16edc7d..66dd79cf6 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -7,7 +7,7 @@ import io.ebean.ValuePair; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson3; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.EBasicJsonMulti; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index 771a5f54a..f7d4650ab 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.text.TextException; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; @@ -18,10 +18,10 @@ import java.util.Map; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestDbJson_List extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java index 01d105760..fd10d9e99 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.text.json.EJson; import io.ebeantest.LoggedSql; import org.tests.model.json.EBasicJsonMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMapDetail; import java.io.IOException; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapBasic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java index 25091d91c..6f2285dd6 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapBlob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapBlob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java index ecf21b7fe..b8c5b1f6c 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapClob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapClob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java index d33efe02f..e5292734d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapJsonB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapJsonB extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java index 96b775ef3..7564c2d5e 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapVarchar; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapVarchar extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index 9141b171e..7d166819d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -10,17 +10,17 @@ import org.tests.model.basic.Order; import org.tests.model.json.EBasicJsonNode; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestJsonNodeBasic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index ace17c972..d775fc01a 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeBlob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index a50ce5d44..1e3121146 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeJsonb extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index eaa17ba62..903b425ca 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeVarchar extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java index 7ae086e8d..593e19080 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java @@ -2,7 +2,7 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicOldValue; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java index fd108204e..549063869 100644 --- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java @@ -1,16 +1,14 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.ValuePair; - -import org.assertj.core.api.SoftAssertions; -import org.junit.Ignore; -import org.junit.Test; -import org.tests.model.json.EBasicOldValue; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.ValuePair; +import org.assertj.core.api.SoftAssertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicOldValue; import java.util.List; import java.util.Map; @@ -18,11 +16,9 @@ import java.util.Set; public class TestOldValue extends BaseTestCase { - - @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testDbJsonOldValue() throws Exception { + public void testDbJsonOldValue() { EBasicOldValue bean = new EBasicOldValue(); JsonNodeFactory jnf = new JsonNodeFactory(false); @@ -86,7 +82,7 @@ public class TestOldValue extends BaseTestCase { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - @Ignore("Old value detection does not work for @DbArray") + @Disabled("Old value detection does not work for @DbArray") public void testDbArrayOldValue() throws Exception { EBasicOldValue bean = new EBasicOldValue(); @@ -98,8 +94,6 @@ public class TestOldValue extends BaseTestCase { bean.getStringArr().add("sa2"); - - Map dirty = DB.beanState(bean).getDirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java index 095c4c011..99d1a4974 100644 --- a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -3,7 +3,7 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.json.EBasicJsonUnmapped; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index 646060eef..04b8714b6 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptyList { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index d0fc56e7e..06528823b 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.json.EBasicJsonMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptyMap { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index b7bdb5be5..6ade9c12c 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.AttributeHolder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptySet { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java index fea06e6bb..4f99bce89 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -4,9 +4,9 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.json.transientproperties.EJsonTransientObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeNull { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index f10e67ece..661503290 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -6,12 +6,12 @@ import io.ebean.text.PathProperties; import io.ebean.text.json.JsonWriteOptions; import org.tests.json.transientproperties.EJsonTransientEntityList; import org.tests.json.transientproperties.EJsonTransientList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeTransientEmptyList { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java index 234e3aa8b..c0feb5070 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJacksonIgnore { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java index e81acc734..c55ec91a1 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java @@ -2,7 +2,7 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; import io.ebean.text.PathProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java index bf89a3482..2dc7fd597 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTransientListProperty { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java index cfd7e54c6..2add46e7a 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTransientObjectProperty { diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 679556fe2..8ecedd6c6 100644 --- a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -6,20 +6,18 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.text.PathProperties; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; 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.jupiter.api.Assertions.*; public class TestLazyForeignKeys extends BaseTestCase { - @Before + @BeforeEach public void prepare() { MainEntity ent1 = new MainEntity(); ent1.setId("ent1"); @@ -37,7 +35,7 @@ public class TestLazyForeignKeys extends BaseTestCase { DB.save(rel1); } - @After + @AfterEach public void cleanup() { DB.find(MainEntity.class).delete(); DB.find(MainEntityRelation.class).delete(); diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java index b0ef7592b..dea936887 100644 --- a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java +++ b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java @@ -2,7 +2,7 @@ package org.tests.lazyloadconf; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java index 52cf6098f..bbfb37b0a 100644 --- a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -6,13 +6,13 @@ import org.tests.level.Level1; import org.tests.level.Level2; import org.tests.level.Level3; import org.tests.level.Level4; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ManyToManyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 8ecd7cdcf..6fe0948b3 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.EBasicWithLifecycle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 3e5ddf4a3..b3bd52fa2 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -3,7 +3,7 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; import org.tests.model.basic.EBasicWithLifecycleExceptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 56bb64311..97b07b941 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; import org.tests.model.basic.EBasicWithLog; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index f8e2189e3..12f2f9806 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -3,12 +3,12 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyA; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2MDeleteCascadeFromParent extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index fde4594fb..995641642 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -6,8 +6,8 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MnocRole; import org.tests.model.basic.MnocUser; @@ -22,7 +22,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { private static MnocRole r1 = new MnocRole("r1"); private static MnocRole r2 = new MnocRole("r2"); - @BeforeClass + @BeforeAll public static void setup() { DB.save(r0); DB.save(r1); diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index b5a8f5137..a4554fd7b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -5,13 +5,14 @@ import io.ebean.Ebean; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { @Test @@ -45,9 +46,9 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { List roleList = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(1, tenantList.size()); - Assert.assertEquals(2, permissionList.size()); - Assert.assertEquals(1, roleList.size()); + assertEquals(1, tenantList.size()); + assertEquals(2, permissionList.size()); + assertEquals(1, roleList.size()); Ebean.delete(tenant1); @@ -55,9 +56,9 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(0, tenantList2.size()); - Assert.assertEquals(0, roleList2.size()); - Assert.assertEquals(2, permissionList2.size()); + assertEquals(0, tenantList2.size()); + assertEquals(0, roleList2.size()); + assertEquals(2, permissionList2.size()); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index ac44be657..f1571c4e7 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -4,13 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestM2MDeleteWithCascade extends BaseTestCase { @Test @@ -34,19 +36,19 @@ public class TestM2MDeleteWithCascade extends BaseTestCase { Ebean.delete(u0); MUser notThere = Ebean.find(MUser.class, u0.getUserid()); - Assert.assertNull("been deleted", notThere); + assertNull(notThere); List roleIds = new ArrayList<>(); Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid()); int rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); - Assert.assertEquals("roles not deleted", 2, rc); + assertEquals(2, rc); Ebean.deleteAll(roles); rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); - Assert.assertEquals("roles deleted now", 0, rc); + assertEquals(0, rc); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index d06989acb..cf10919f7 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java index 3a50fa547..7089bedca 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java @@ -2,7 +2,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index a1f9db3eb..a94a7198d 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.m2m.MailBox; import org.tests.model.m2m.MailUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2MMultipleLists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 1683f5aa8..91fcb23fe 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -3,7 +3,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.m2m.MnyTopic; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Added to test DDL generation for ManyToMany related back to itself. diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java index 3ccad9fb8..a96294c3b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -3,8 +3,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.meta.MetaTimedMetric; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; @@ -14,6 +13,7 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2mDeleteObject extends BaseTestCase { @@ -55,9 +55,9 @@ public class TestM2mDeleteObject extends BaseTestCase { List roleList = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(1, tenantList.size()); - Assert.assertEquals(2, permissionList.size()); - Assert.assertEquals(1, roleList.size()); + assertEquals(1, tenantList.size()); + assertEquals(2, permissionList.size()); + assertEquals(1, roleList.size()); Ebean.delete(role1); @@ -65,9 +65,9 @@ public class TestM2mDeleteObject extends BaseTestCase { List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(0, roleList2.size()); - Assert.assertEquals(1, tenantList2.size()); - Assert.assertEquals(2, permissionList2.size()); + assertEquals(0, roleList2.size()); + assertEquals(1, tenantList2.size()); + assertEquals(2, permissionList2.size()); } diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java index 2dbd07c90..5c2866043 100644 --- a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java +++ b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java @@ -3,13 +3,13 @@ package org.tests.m2m.softdelete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2MSoftDeleteExists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java index 1e274d6bb..05af24970 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java index 61a1a9cfc..f7f4fdb7f 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -7,7 +7,7 @@ import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import io.ebean.text.PathProperties; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java index 6ad18dbec..1c6e20e38 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java b/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java index b9222f8b6..86cb2ab2b 100644 --- a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java +++ b/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java @@ -1,6 +1,6 @@ package org.tests.mockito; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.aggregation.DOrg; import org.tests.model.basic.PersistentFile; diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index 6c7fa4d62..b2b778e6a 100644 --- a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -3,7 +3,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index 30ee89027..3199bc005 100644 --- a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestAggregationTopLevel extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { loadData(); } diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 907bac4ac..cc4eb48ba 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.LinkedHashSet; @@ -15,7 +15,7 @@ import java.util.Set; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestDbArray_asSet extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java index f6c7b7da1..bdd88410e 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.ArrayList; @@ -18,8 +18,8 @@ import java.util.Set; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDbArray_basic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index bad02c0c4..917a9f494 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -7,7 +7,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 34175b77c..4befd66a9 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -8,7 +8,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index d96d49b17..0099f9e73 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java index 13c8a299c..ac34b2fce 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java @@ -2,7 +2,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index d40c14ac5..ca1c71f7d 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index 74ecd0f08..53aedd28a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestNatKeyUid extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java index 9907fa04e..e4a160bf7 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java +++ b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -2,7 +2,7 @@ package org.tests.model.basic.first; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestFirstSecond extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java index 85f7c06c0..7dff5caf5 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -2,8 +2,10 @@ package org.tests.model.basic.mapsuper; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class TestMapSuperEquals extends BaseTestCase { @@ -23,10 +25,10 @@ public class TestMapSuperEquals extends BaseTestCase { a.setId(456l); - Assert.assertTrue("equals By Id value on enhanced mapped super", a.equals(b)); - Assert.assertTrue(b.equals(a)); - Assert.assertTrue(!a.equals(c)); - Assert.assertTrue(!b.equals(c)); + assertEquals(a, b); + assertEquals(b, a); + assertNotEquals(a, c); + assertNotEquals(b, c); } else { System.out.println("--- ok, not running TestMapSuperEquals test"); diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java index 29caa03a4..18ed4403d 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -8,9 +8,9 @@ import io.ebean.annotation.TxType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DummyDao { diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index fbaeac4d2..0412c5d75 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -1,23 +1,24 @@ package org.tests.model.basic.xtra; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + public class OptimisticLockExceptionThrowingDao { Transaction inMethodTransaction; @Transactional public void doSomething(EBasicVer v) { - - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); inMethodTransaction = server.currentTransaction(); @@ -25,15 +26,15 @@ public class OptimisticLockExceptionThrowingDao { SqlUpdate u = server.sqlUpdate("update e_basicver set last_update = last_update+1 where id = ?"); u.setParameter(1, v.getId()); int count = server.execute(u, t); - Assert.assertEquals(1, count); + assertEquals(1, count); t.commit(); v.setName("some change"); try { - Ebean.save(v); + DB.save(v); // never get here - Assert.assertTrue(false); + fail(); } catch (PersistenceException e) { throw e; } diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 2291bd0b7..427f10752 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index f42b1c2b7..8d849f9c1 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -6,14 +6,14 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index 7ccd6c4d2..d5fea0e3e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 9bfe75f00..eceb8e12c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -6,12 +6,12 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index ed22ae4c4..b7c579fb3 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -2,7 +2,7 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 2e00493fe..a148dc262 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index b7d4b3970..f5253f69a 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -3,7 +3,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 62ed889d4..030898a62 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -3,7 +3,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index 179754200..be67a92a1 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Random; diff --git a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 3499c5162..13fc0d96e 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -3,7 +3,7 @@ package org.tests.model.composite; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java index dec65742a..ee59d1eeb 100644 --- a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java @@ -1,7 +1,7 @@ package org.tests.model.ddd; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index dc50fe412..19f250680 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -5,7 +5,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index df763beaf..ac815b67b 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 78562fb6d..a64be330d 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index dee55eeea..a690a47f1 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 277e7bb37..6101352c3 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index 0fc42ea26..a3553900e 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 564c00b8d..614c6afb2 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 02f6fa5d3..4b43b702a 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java index 4518420f6..7d949d94a 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index e7291ba33..4569132f8 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 47e47727b..923ba37af 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 56c22aa4c..1182f6773 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index a214b225c..4b88410de 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 94d970101..593326fc3 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index 2a26c5ea0..e60921867 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java index d95b2549e..2c55ceae4 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 264bef274..34a042947 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -3,7 +3,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java index f5dcb38b9..77fca97ee 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java @@ -1,9 +1,9 @@ package org.tests.model.embedded; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEmbeddedEqualsWhenCreated { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index bfbb97d46..8b86aab7e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java index 2b19bc612..f6f636c1e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java @@ -2,10 +2,10 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestEmbeddedNullableOverride extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index ffe82ac75..10773c52e 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -7,13 +7,13 @@ import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestHistoryEmbeddedId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java index 0132f9d7f..ad852a427 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java index 1ba178b70..31afb8e03 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index 75e0bc871..2ccd4d03c 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java index 36ba5d279..0ce7505c2 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java @@ -2,7 +2,7 @@ package org.tests.model.history; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index aea5586cf..0817a0967 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -3,7 +3,7 @@ package org.tests.model.inheritexposedtype.test; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.inheritexposedtype.IXPhoto; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestInheritExposeDtype extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index baf913b7c..f03fc7626 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -3,11 +3,12 @@ package org.tests.model.inheritmany; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Random; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestMediaInheritanceJoinToMany extends BaseTestCase { @Test @@ -24,7 +25,7 @@ public class TestMediaInheritanceJoinToMany extends BaseTestCase { // assert we get the profile with a null picture MProfile profile = query.findOne(); - Assert.assertNotNull(profile); + assertNotNull(profile); String generatedSql = query.getGeneratedSql(); assertSql(generatedSql).contains("select t0.id, t0.name, t1.type, t1.id, t1.url, t1.note from mprofile t0 left join mmedia t1 on t1.id = t0.picture_id and t1.type = 'Picture' where t0.name = ?"); diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java index e12c47cfd..ec164715d 100644 --- a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java +++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java @@ -2,7 +2,7 @@ package org.tests.model.interfaces; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestSelfMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java index 9db04f045..974d7aeef 100644 --- a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java +++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java @@ -2,7 +2,7 @@ package org.tests.model.interfaces; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java index d1396dde4..57a4d97ad 100644 --- a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java @@ -2,7 +2,7 @@ package org.tests.model.ivo.test; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.ESomeConvertType; import org.tests.model.ivo.Money; diff --git a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index b29737060..61f1f66ff 100644 --- a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -6,12 +6,12 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.Period; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestJodaInsertUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index 2a7456b07..164bbe1b9 100644 --- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -3,7 +3,7 @@ package org.tests.model.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index ce5d35b26..aa6c04542 100644 --- a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithcache; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index f230cec9e..2a475f40b 100644 --- a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -2,7 +2,7 @@ package org.tests.model.lazywithid; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java index 1c59dbf3e..5c5b8a840 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java @@ -1,7 +1,7 @@ package org.tests.model.m2m; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestM2MDoubleInsert { diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 6a6c8e85e..48680f619 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index eb993da93..bc074d9be 100644 --- a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java +++ b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java index 48288e7a3..089df1a94 100644 --- a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java +++ b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java @@ -1,7 +1,7 @@ package org.tests.model.map; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java index bf00656a8..9f80ac280 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -5,21 +5,21 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; // test that simulates relations with @formula public class Test2NoFk extends BaseTestCase { - @Before + @BeforeEach public void setup() { // Reset t DB.truncate(EFile2NoFk.class, EUserNoFk.class, EUserNoFkSoftDel.class); diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java index e9ed12dbe..e7d352d32 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -6,21 +6,21 @@ import io.ebean.Ebean; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestNoFk extends BaseTestCase { - @Before + @BeforeEach public void setup() { // Reset t Ebean.find(EFileNoFk.class).delete(); @@ -334,7 +334,7 @@ public class TestNoFk extends BaseTestCase { @Test - @Ignore("this would be a bonus task :)") + @Disabled("this would be a bonus task :)") public void testLazyLoadUser500() { // user 500 does not exist in DB EUserNoFk owner = Ebean.find(EUserNoFk.class, 500); @@ -360,7 +360,7 @@ public class TestNoFk extends BaseTestCase { } @Test - @Ignore("Bonus Task 2") + @Disabled("Bonus Task 2") public void testM2mLazyLoadFile() { List files = Ebean.find(EFileNoFk.class).findList(); assertThat(files).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java b/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java index bf22cb284..3e468714d 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java @@ -1,7 +1,7 @@ package org.tests.model.nofk; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java index b7257afcf..bc4b7c94a 100644 --- a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java +++ b/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java @@ -1,26 +1,22 @@ package org.tests.model.noid; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import org.junit.Test; +import io.ebean.DB; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; public class TestInsertNoIdBean extends BaseTestCase { @Test public void testInsert() { - - NoIdBean bean = new NoIdBean(); bean.setName("Rocky"); bean.setSubject("Blowing up stuff"); - Ebean.save(bean); - - int rowCount = Ebean.find(NoIdBean.class).findCount(); - - assertTrue("rowCount:" + rowCount, rowCount > 0); + DB.save(bean); + int rowCount = DB.find(NoIdBean.class).findCount(); + assertThat(rowCount).isGreaterThan(0); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index eedfaa2fb..b39351ca8 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -2,15 +2,14 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestOneToOneCascadeSave extends BaseTestCase { @Test public void test() { - - OtoMaster master = new OtoMaster(); master.setName("CName"); @@ -24,12 +23,11 @@ public class TestOneToOneCascadeSave extends BaseTestCase { Ebean.save(master); - Assert.assertNotNull(child.getId()); + assertNotNull(child.getId()); OtoChild child2 = Ebean.find(OtoChild.class, child.getId()); OtoMaster master2 = child2.getMaster(); - Assert.assertNotNull(master2); - + assertNotNull(master2); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index f23e3ce39..32a39cdbf 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 60d7eab3b..866568799 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneJoinColumn extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java index 6ba85879a..46f7bf476 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneManyDelete { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index c53205e48..34ecf0879 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -2,16 +2,16 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestOneToOneOptionalRelationship extends BaseTestCase { @Test public void test() { - Account account = new Account(); account.setName("AC234"); account.save(); @@ -19,10 +19,10 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.byId(account.getId()); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + 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 @@ -30,8 +30,8 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // 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 = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); } @@ -50,14 +50,14 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.byId(account.getId()); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); - Assert.assertNotNull(fetchedAccount.getUser()); - Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); - Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); + assertNotNull(fetchedAccount.getUser()); + assertEquals(user.getId(), fetchedAccount.getUser().getId()); + assertEquals(user.getName(), fetchedAccount.getUser().getName()); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(2, loggedSql.size()); + 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 @@ -65,11 +65,11 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // 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 = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + 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 = ?")); + 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 = ?")); } @@ -88,14 +88,14 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.query().fetch("user").setId(account.getId()).findOne(); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); - Assert.assertNotNull(fetchedAccount.getUser()); - Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); - Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); + assertNotNull(fetchedAccount.getUser()); + assertEquals(user.getId(), fetchedAccount.getUser().getId()); + assertEquals(user.getName(), fetchedAccount.getUser().getName()); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + 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 @@ -103,7 +103,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // 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 = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 7c0828c25..6cb1040de 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -6,7 +6,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 6867177ed..17655b945 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 0265b1c14..a2fb61c7f 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index 6f5921435..e7958eb79 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 173bb87b8..fa5c5ee1d 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java index 326f822dc..4497dc27e 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index ddadfe530..77e835ffc 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; 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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DeleteById_SoftDelete_Tests extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 41011c84b..9f96fa221 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java index 9e1aa68f0..e115543ee 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone.calcd; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java index 9c6fa045b..446fff4b2 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java @@ -1,12 +1,12 @@ package org.tests.model.orphanremoval; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestOrphanRemovalOverwrite { @@ -29,9 +29,8 @@ public class TestOrphanRemovalOverwrite { // Refreshing here generates new objects for the associated children that are referred to by the parent. parent.refresh(); - assertNotNull("The children should now have Ids as they are persisted to the db.", childList.get(0).getId()); - assertEquals("The children should have the same Id as the ones on the parent.", - childList.get(0).getId(), parent.getChildren().get(0).getId()); - assertEquals("The children should therefore equal the children on the parent.", childList, parent.getChildren()); + assertNotNull(childList.get(0).getId()); + assertEquals(childList.get(0).getId(), parent.getChildren().get(0).getId()); + assertEquals(childList, parent.getChildren()); } } diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index 0148979fa..c40131fa4 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -3,7 +3,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java index 74c1c5fc1..cdfe68995 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index afdcfb78a..d44184b16 100644 --- a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -2,7 +2,7 @@ package org.tests.model.prnt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPrinterStateIssue extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java index d1de56f0d..541d310ae 100644 --- a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java @@ -3,7 +3,7 @@ package org.tests.model.pview; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index fbb2ee7ae..f3c803365 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -3,7 +3,7 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestResourceFileSelfRef extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 65e00f683..2c27bc798 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -3,13 +3,13 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSelfRefExample extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 5163c9ffb..48134bd4f 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -3,11 +3,12 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestTextJsonSelfRef extends BaseTestCase { @Test @@ -39,7 +40,7 @@ public class TestTextJsonSelfRef extends BaseTestCase { // Check that there are no 'reference' beans here for (SelfRefCustomer cust : customers) { BeanState beanState = Ebean.getBeanState(cust); - Assert.assertFalse(beanState.isReference()); + assertFalse(beanState.isReference()); } // JsonWriteOptions options = JsonWriteOptions.parsePath("(id,name,referredBy(id))"); diff --git a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java index 54eb9b808..ecfff5430 100644 --- a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java @@ -2,7 +2,7 @@ package org.tests.model.site; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java index b401696f0..2fc281e2a 100644 --- a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -2,12 +2,12 @@ package org.tests.model.survey; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOrderByFetch extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 377087985..01bf94513 100644 --- a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -2,7 +2,7 @@ package org.tests.model.tevent; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestAssocOneNullTraverse extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java b/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java index 42cfa2a62..25e56347b 100644 --- a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java +++ b/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java @@ -1,13 +1,10 @@ package org.tests.model.uuidsibling; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SoftDeleteCascadeTest { @@ -36,31 +33,15 @@ public class SoftDeleteCascadeTest { parent.refresh(); - assertThat("Parent should have one child loaded", - parent.getChildren().size(), - is(1) - ); - - assertThat("Parent should have correct child loaded", - parent.getChildren().get(0).getId(), - is(child.getId()) - ); - - assertThat("Child that was loaded should have its sibling available", - parent.getChildren().get(0).getChildSibling(), - not(nullValue()) - ); - - assertThat( - "Child that was loaded should have loaded correct sibling", - parent.getChildren().get(0).getChildSibling().getId(), - is(childSibling.getId()) - ); + assertThat(parent.getChildren()).hasSize(1); + assertThat(parent.getChildren().get(0).getId()).isEqualTo(child.getId()); + assertThat(parent.getChildren().get(0).getChildSibling()).isNotNull(); + assertThat(parent.getChildren().get(0).getChildSibling().getId()).isEqualTo(childSibling.getId()); } private void assertAfter(Long parentId, UUID childId, Long childSiblingId) { - assertThat(USibParent.find.byId(parentId), is(nullValue())); - assertThat(USibChild.find.byId(childId), is(nullValue())); - assertThat(USibChildSibling.find.byId(childSiblingId), is(nullValue())); + assertThat(USibParent.find.byId(parentId)).isNull(); + assertThat(USibChild.find.byId(childId)).isNull(); + assertThat(USibChildSibling.find.byId(childSiblingId)).isNull(); } } diff --git a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java index 8c7608450..efdd41302 100644 --- a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java +++ b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java @@ -2,15 +2,15 @@ package org.tests.model.version; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; public class TestVersionHierarchyModification extends BaseTestCase { - @Before + @BeforeEach public void setup() { final VersionParent parent = new VersionParent(); parent.setName("vParent"); @@ -42,7 +42,7 @@ public class TestVersionHierarchyModification extends BaseTestCase { Ebean.save(parent); } - @After + @AfterEach public void cleanUp() { Ebean.find(VersionParent.class).delete(); } diff --git a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java index a341644af..2068496ba 100644 --- a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java +++ b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -3,7 +3,7 @@ package org.tests.model.view; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java index ce7b68719..7c71c20d3 100644 --- a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java +++ b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java @@ -2,10 +2,10 @@ package org.tests.model.zero; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestWithZero extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index cb95ad388..9505d9d50 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -3,13 +3,13 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestOneToManyNoMappedBy extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index a07c415d4..9ca312ce8 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOneToManyOnlyBean extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java index e2dca664a..66ec5e744 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java index 2cf5561c8..6b4674a94 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java @@ -1,7 +1,7 @@ package org.tests.o2m; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index c0747fb7a..560f86ee9 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -3,7 +3,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index 19e600b7b..b469d4489 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.config.dbplatform.IdType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; import org.tests.o2m.jointable.inheritance.ClassB; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 500a0ef79..607a1a4ed 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java index 8eee5d3e8..f6c41bebe 100644 --- a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java +++ b/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java @@ -2,7 +2,7 @@ package org.tests.o2m.lazy; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index a80277abd..8af0550d8 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -3,7 +3,7 @@ package org.tests.o2o; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java index 11d3bd9f2..84c858b1f 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -3,7 +3,7 @@ package org.tests.o2o; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.update.EPersonOnline; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java index a3722daad..431b7a30c 100644 --- a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java @@ -3,7 +3,7 @@ package org.tests.order; import io.ebean.Ebean; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Comparator; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index 93adb4e01..c67369022 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 6e80dc3d4..9e95b7c5d 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -3,13 +3,13 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import static io.ebean.PersistenceContextScope.QUERY; import static io.ebean.PersistenceContextScope.TRANSACTION; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestPersistenceContextQueryScope extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 2db2125f9..c93df67bd 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashSet; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Set; import static io.ebean.PersistenceContextScope.QUERY; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPersistenceContextScopeUsingOrders extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 73175fb06..f17a8ffa7 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -9,12 +9,12 @@ import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.Properties; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestPersistenceContextServerConfig extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java index c7b0edfe9..b89c5e448 100644 --- a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java +++ b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java @@ -1,7 +1,7 @@ package org.tests.profile; import io.ebean.ProfileLocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 1a7e708aa..60329b4e3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 0c21fb250..ae0839bfd 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -10,7 +10,7 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index baddc58dc..6f848175b 100644 --- a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.fail; public class TestConnectionCloseOnSqlerr extends BaseTestCase { @@ -27,7 +28,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { q0.findList(); } catch (Exception e) { if (e.getMessage().contains("Unsuccessfully waited")) { - Assert.fail("No connections found while only one thread is running. (after " + i + " queries)"); + fail(); } else { e.printStackTrace(); } @@ -58,7 +59,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { Ebean.commitTransaction(); } catch (Exception e) { if (e.getMessage().contains("Unsuccessfully waited")) { - Assert.fail("No connections found while only one thread is running. (after " + i + " queries)"); + fail("No connections found while only one thread is running. (after " + i + " queries)"); } else { e.printStackTrace(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index dffdadb96..0a33ced29 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -5,11 +5,12 @@ import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.MyLobSize; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class TestDefaultFetchLazy extends BaseTestCase { @Test @@ -22,20 +23,20 @@ public class TestDefaultFetchLazy extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(m.getId()); + assertNotNull(m.getId()); MyLobSize myLobSize = Ebean.find(MyLobSize.class, m.getId()); BeanState beanState = Ebean.getBeanState(myLobSize); Set loadedProps = beanState.getLoadedProps(); - Assert.assertNotNull(loadedProps); - Assert.assertTrue(loadedProps.contains("id")); - Assert.assertTrue(loadedProps.contains("name")); + assertNotNull(loadedProps); + assertTrue(loadedProps.contains("id")); + assertTrue(loadedProps.contains("name")); // FetchType.LAZY properties excluded - Assert.assertFalse(loadedProps.contains("myLob")); - Assert.assertFalse(loadedProps.contains("myCount")); + assertFalse(loadedProps.contains("myLob")); + assertFalse(loadedProps.contains("myCount")); // the details is also tuned Query queryMany = Ebean.find(MyLobSize.class).fetch("details")// ,"+query") @@ -44,8 +45,8 @@ public class TestDefaultFetchLazy extends BaseTestCase { queryMany.findList(); String generatedSql = queryMany.getGeneratedSql(); - Assert.assertTrue(generatedSql.contains("t1.other")); - Assert.assertFalse(generatedSql.contains("t1.something")); + assertTrue(generatedSql.contains("t1.other")); + assertFalse(generatedSql.contains("t1.something")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java index cceeb63ae..e290bb817 100644 --- a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java +++ b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java index d9952c8c0..7bdad3793 100644 --- a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestIContains.java b/ebean-core/src/test/java/org/tests/query/TestIContains.java index 236e7895a..f100b6cab 100644 --- a/ebean-core/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-core/src/test/java/org/tests/query/TestIContains.java @@ -8,7 +8,7 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index eac3303fb..868e50c7e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java index 987dc058d..fd96088ba 100644 --- a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -1,34 +1,35 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import org.junit.Test; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestInvalidFetchPath extends BaseTestCase { - @Test(expected = PersistenceException.class) + @Test public void invalidFetchPathAndProperties_expect_error() { - - Ebean.find(Customer.class) - .fetch("notValidPath", "notHaveProps") - .findList(); + assertThrows(PersistenceException.class, () -> + DB.find(Customer.class) + .fetch("notValidPath", "notHaveProps") + .findList()); } - @Test(expected = PersistenceException.class) + @Test public void invalidFetchPath_expect_error() { - - Ebean.find(Customer.class) - .fetch("notValidPath") - .findList(); + assertThrows(PersistenceException.class, () -> + DB.find(Customer.class) + .fetch("notValidPath") + .findList()); } @Test public void fetchWithInvalidPropertyName_expect_allowed() { - - Ebean.find(Customer.class) + DB.find(Customer.class) .fetch("billingAddress", "invalidPropertyName") .findList(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java index 881117d75..8f3202f34 100644 --- a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EOptOneA; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java index b5ac9abcc..5b571781f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java index 4c9f9f3e5..af7200141 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLimitQuery extends BaseTestCase { @Test @@ -24,7 +25,7 @@ public class TestLimitQuery extends BaseTestCase { .findList(); // should at least find the "Cust NoAddress" customer - Assert.assertTrue(!customers.isEmpty()); + assertTrue(!customers.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java index b90751c83..e583e9430 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java index f936e2442..54ba80459 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Assert; -import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestManyWhereJoinM2M extends BaseTestCase { @@ -60,10 +60,10 @@ public class TestManyWhereJoinM2M extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("select distinct")); - Assert.assertTrue(sql.contains("left join mrole ")); - Assert.assertTrue(sql.contains("join mrole ")); - Assert.assertTrue(sql.contains(".role_name = ?")); + assertTrue(sql.contains("select distinct")); + assertTrue(sql.contains("left join mrole ")); + assertTrue(sql.contains("join mrole ")); + assertTrue(sql.contains(".role_name = ?")); isEmpty(); isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 65f6efd1f..e7426c427 100644 --- a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -7,10 +7,10 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMyAdHocSqlSelect extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 69cb9383e..19645684e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -6,11 +6,11 @@ import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOneToManyCorrectGrouping extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java index 61b7ffd25..4f548b1cc 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java @@ -3,8 +3,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebeantest.LoggedSql; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -21,12 +21,11 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class TestOuterJoin extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { ResetBasicData.reset(); } - @Test public void testOuterOnNullQuery() throws Exception { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java index 4e77d49d6..d3df77f11 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.ResetBasicData; @@ -36,7 +36,7 @@ public class TestQueryAlias extends BaseTestCase { assertThat(sql).contains("ckey_parent myt0"); assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)"); } - + @Test public void testExistsWithConcat() { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java index 22caeeace..4b4c1b1b0 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java index 6034e16ab..a83fb6d83 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index 68a382e5c..df5c17d04 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -2,15 +2,15 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestQueryFetchJoinWithOrder extends BaseTestCase { @Test @@ -23,7 +23,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().asc("id") .order().desc("details.id").findList(); - Assert.assertNotNull(list); + assertNotNull(list); List list2 = Ebean.find(Order.class) .fetchQuery("customer") @@ -32,7 +32,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().asc("customer.contacts.lastName") .findList(); - Assert.assertNotNull(list2); + assertNotNull(list2); List list3 = Ebean.find(Customer.class) .fetch("orders") @@ -40,7 +40,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().desc("orders.id") .findList(); - Assert.assertNotNull(list3); + assertNotNull(list3); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 048a6e97c..90e10f4c6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -8,13 +8,13 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryFetchManyTwoDeep extends BaseTestCase { @@ -36,7 +36,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { List sql = LoggedSqlCollector.stop(); - assertTrue("has rows", !list.isEmpty()); + assertTrue(!list.isEmpty()); String mainSql = sqlOf(query); assertThat(mainSql).contains("from o_customer t0 "); assertThat(mainSql).contains("left join o_order t1 on t1.kcustomer_id = t0.id"); @@ -78,7 +78,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("order.details"); List shipList = shipQuery.findList(); - assertTrue("has rows", !shipList.isEmpty()); + assertTrue(!shipList.isEmpty()); String generatedSql = shipQuery.getGeneratedSql(); @@ -119,7 +119,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("customer.orders"); List shipList = query.findList(); - assertTrue("has rows", !shipList.isEmpty()); + assertTrue(!shipList.isEmpty()); String generatedSql = query.getGeneratedSql(); @@ -151,7 +151,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .query(); List list = query.findList(); - assertTrue("has rows", !list.isEmpty()); + assertTrue(!list.isEmpty()); String generatedSql = query.getGeneratedSql(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index 196b56fa4..10f95d355 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -7,7 +7,7 @@ import org.tests.model.basic.ContactNote; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java index 86a71b324..c7ac0311f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java @@ -2,8 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestQueryFilterCaseInsensitive extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { ResetBasicData.reset(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java index eafadf8b8..3babba0f6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -15,7 +15,7 @@ import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryFilterMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 02cc7c9e2..37e2bbf75 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index f87c4c9c9..9db665351 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -9,11 +9,13 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryFilterManyOnSecondary extends BaseTestCase { @Test @@ -31,7 +33,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { for (Customer customer : list) { List orders = customer.getOrders(); for (Order order : orders) { - Assert.assertEquals(Order.Status.NEW, order.getStatus()); + assertEquals(Order.Status.NEW, order.getStatus()); } } @@ -55,7 +57,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { for (OrderDetail orderDetail : details) { Product product = orderDetail.getProduct(); String name = product.getName(); - Assert.assertTrue(name.startsWith("C")); + assertTrue(name.startsWith("C")); } } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 7dae5d580..7c3bcead7 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java index b37f67279..f1de21cfc 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Contact; @@ -18,12 +18,13 @@ import org.tests.model.basic.ResetBasicData; import org.tests.o2m.OmBasicChild; import org.tests.o2m.OmBasicParent; +import javax.persistence.PersistenceException; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindEach extends BaseTestCase { @@ -59,7 +60,7 @@ public class TestQueryFindEach extends BaseTestCase { private void seedData() { for (int i = 0; i < 15; i++) { - EBasicLog log = new EBasicLog("findEachBatch "+i); + EBasicLog log = new EBasicLog("findEachBatch " + i); DB.save(log); } } @@ -101,7 +102,7 @@ public class TestQueryFindEach extends BaseTestCase { private void findEachWithBatch(int batchSize) { DB.find(EBasicLog.class) - .where().startsWith("name","findEachBatch") + .where().startsWith("name", "findEachBatch") .findEach(batchSize, batch -> { int batchId = batchCount.incrementAndGet(); int rows = rowCount.addAndGet(batch.size()); @@ -140,9 +141,8 @@ public class TestQueryFindEach extends BaseTestCase { /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected = IllegalStateException.class) + @Test public void testVisitThrowingException() { - ResetBasicData.reset(); Query query = DB.find(Customer.class) @@ -152,14 +152,13 @@ public class TestQueryFindEach extends BaseTestCase { final AtomicInteger counter = new AtomicInteger(0); - query.findEach(customer -> { - counter.incrementAndGet(); - if (counter.intValue() > 0) { - throw new IllegalStateException("cause a failure"); - } - }); - - fail("Never get here - exception thrown"); + assertThrows(IllegalStateException.class, () -> + query.findEach(customer -> { + counter.incrementAndGet(); + if (counter.intValue() > 0) { + throw new IllegalStateException("cause a failure"); + } + })); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java index 2588edf56..c7a2dbb98 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -4,15 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindEachWhile extends BaseTestCase { @@ -41,9 +39,8 @@ public class TestQueryFindEachWhile extends BaseTestCase { /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected = IllegalStateException.class) + @Test public void testVisitThrowingException() { - ResetBasicData.reset(); Query query = DB.find(Customer.class).setAutoTune(false) @@ -52,14 +49,14 @@ public class TestQueryFindEachWhile extends BaseTestCase { final AtomicInteger counter = new AtomicInteger(0); - query.findEachWhile(customer -> { - counter.incrementAndGet(); - if (counter.intValue() > 0) { - throw new IllegalStateException("cause a failure"); - } - return true; - }); - - fail("Never get here - exception thrown"); + assertThrows(IllegalStateException.class, () -> { + query.findEachWhile(customer -> { + counter.incrementAndGet(); + if (counter.intValue() > 0) { + throw new IllegalStateException("cause a failure"); + } + return true; + }); + }); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java index 074603e41..57a04439c 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -6,13 +6,13 @@ import io.ebean.FutureList; import io.ebean.Transaction; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryFindFutureList extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 7ad3fe99e..1b0715e86 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -4,10 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderShipment; @@ -19,10 +21,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; 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.fail; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindIterate extends BaseTestCase { @@ -173,14 +172,14 @@ public class TestQueryFindIterate extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Got SQL: " + loggedSql, 2, loggedSql.size()); + assertEquals(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) + @ForPlatform(Platform.H2) + @Test public void testWithExceptionInQuery() { - ResetBasicData.reset(); // intentionally a query with incorrect type binding @@ -190,21 +189,11 @@ public class TestQueryFindIterate extends BaseTestCase { .setMaxRows(2).query(); // this throws an exception immediately - query.findEach(bean -> { - - }); - - if (!DB.getDefault().name().equals("h2")) { - // MySql allows the query with type conversion? - throw new PersistenceException("H2 does expected thing but MySql does not"); - } - fail("Never get here as exception thrown"); + assertThrows(PersistenceException.class, () -> query.findEach(bean -> { })); } - - @Test(expected = IllegalStateException.class) + @Test public void testWithExceptionInLoop() { - ResetBasicData.reset(); Query query = DB.find(Customer.class) @@ -212,11 +201,12 @@ public class TestQueryFindIterate extends BaseTestCase { .where().gt("id", 0) .setMaxRows(2).query(); - query.findEach(customer -> { - if (customer != null) { - throw new IllegalStateException("cause an exception"); - } - }); + assertThrows(IllegalStateException.class, () -> + query.findEach(customer -> { + if (customer != null) { + throw new IllegalStateException("cause an exception"); + } + })); } @Test @@ -267,7 +257,7 @@ public class TestQueryFindIterate extends BaseTestCase { assertFalse(queryIterator.hasNext()); assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns); - try { + try { queryIterator.next(); fail("noSuchElementException expected"); } catch (NoSuchElementException e) { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index 8ea8457a0..195350e39 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; @@ -11,7 +11,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestQueryFindMapTypedKey extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java index 8e11d3328..35693707e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import io.ebean.PagedList; import org.assertj.core.util.Lists; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java index 16e1e8ee3..a4561aa0f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -17,9 +17,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.jupiter.api.Assertions.*; public class TestQueryFindPagedList extends BaseTestCase { @@ -37,15 +35,14 @@ public class TestQueryFindPagedList extends BaseTestCase { assertThat(empty.getDisplayXtoYofZ("a", "b")).isEqualTo(""); } - @Test(expected = PersistenceException.class) + @Test public void test_noMaxRows() { - - Ebean.find(Order.class).findPagedList(); + assertThrows(PersistenceException.class, () -> + Ebean.find(Order.class).findPagedList()); } @Test public void test_maxRows_NoCount() { - ResetBasicData.reset(); PagedList pagedList = Ebean.find(Order.class) @@ -59,7 +56,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(1, loggedSql.size()); } @@ -167,7 +164,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(1, loggedSql.size()); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java index 5df8231fc..02b8063a1 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -3,13 +3,14 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Section; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestQueryFindReadOnly extends BaseTestCase { @Test @@ -23,25 +24,25 @@ public class TestQueryFindReadOnly extends BaseTestCase { Article ar1 = Ebean.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne(); - Assert.assertNotNull(ar1); - Assert.assertTrue("readonly", Ebean.getBeanState(ar1).isReadOnly()); + assertNotNull(ar1); + assertTrue(Ebean.getBeanState(ar1).isReadOnly()); List
    ar1sections = ar1.getSections(); - Assert.assertEquals(1, ar1sections.size()); + assertEquals(1, ar1sections.size()); Section s2 = ar1sections.get(0); - Assert.assertTrue("readonly cascading", Ebean.getBeanState(s2).isReadOnly()); + assertTrue(Ebean.getBeanState(s2).isReadOnly()); Ebean.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList(); Article ar0 = Ebean.find(Article.class, a0.getId()); - Assert.assertNotNull(ar0); - Assert.assertFalse(Ebean.getBeanState(ar0).isReadOnly()); + assertNotNull(ar0); + assertFalse(Ebean.getBeanState(ar0).isReadOnly()); List
    ar0sections = ar0.getSections(); Section s1 = ar0sections.get(0); - Assert.assertFalse(Ebean.getBeanState(s1).isReadOnly()); + assertFalse(Ebean.getBeanState(s1).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java index c4a852f38..63a6c5c8f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java index 9de07f3ff..3dafbe3c4 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java index d92e3e096..72a6d98a5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java index f80aee9f5..ff3a7b1a6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.m2m.Role; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 721939ef9..1945c8951 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index b4cf4e8ac..42df03083 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestQueryJoinMulipleMany extends BaseTestCase { @Test @@ -20,7 +21,7 @@ public class TestQueryJoinMulipleMany extends BaseTestCase { List list = Ebean.find(Order.class).fetch("customer").fetch("customer.contacts").where() .gt("id", 0).findList(); - Assert.assertNotNull(list); + assertNotNull(list); for (Order order : list) { List contacts = order.getCustomer().getContacts(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index 674cf07e9..407bf8f72 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryMultiManyOrder extends BaseTestCase { @Test @@ -23,12 +25,12 @@ public class TestQueryMultiManyOrder extends BaseTestCase { List list = q.findList(); String sql = q.getGeneratedSql(); - Assert.assertTrue(!list.isEmpty()); - Assert.assertTrue(sql.contains("join o_customer ")); + assertTrue(!list.isEmpty()); + assertTrue(sql.contains("join o_customer ")); - Assert.assertFalse(sql.contains("left join contact ")); - Assert.assertFalse(sql.contains("left join o_order_detail ")); - Assert.assertFalse(sql.contains("left join o_product ")); + assertFalse(sql.contains("left join contact ")); + assertFalse(sql.contains("left join o_order_detail ")); + assertFalse(sql.contains("left join o_product ")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java index d47143442..97b10c468 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryNullAssocOne extends BaseTestCase { @Test @@ -20,26 +22,26 @@ public class TestQueryNullAssocOne extends BaseTestCase { Query q0 = Ebean.find(Order.class).where().eq("customer", null).query(); List orders = q0.findList(); - Assert.assertNotNull(orders); - Assert.assertTrue(q0.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertNotNull(orders); + assertTrue(q0.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q1 = Ebean.find(Order.class).where().eq("customer.id", null).query(); List o1 = q1.findList(); - Assert.assertTrue(o1.size() == orders.size()); - Assert.assertTrue(q1.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o1.size() == orders.size()); + assertTrue(q1.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q2 = Ebean.find(Order.class).where().isNull("customer").query(); List o2 = q2.findList(); - Assert.assertTrue(o2.size() == orders.size()); - Assert.assertTrue(q2.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o2.size() == orders.size()); + assertTrue(q2.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q3 = Ebean.find(Order.class).where().isNull("customer").query(); List o3 = q3.findList(); - Assert.assertTrue(o3.size() == orders.size()); - Assert.assertTrue(q3.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o3.size() == orders.size()); + assertTrue(q3.getGeneratedSql().contains("where t0.kcustomer_id is null")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java index 3c536a6f8..c9f5c8bb3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index 74ea5496b..be27bcc7a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestQueryPathJoinAndOrder extends BaseTestCase { @Test @@ -19,7 +20,7 @@ public class TestQueryPathJoinAndOrder extends BaseTestCase { List list = Ebean.find(Customer.class).select("id,name, status").fetch("contacts") .order().asc("id").order().desc("contacts.firstName").setMaxRows(3).findList(); - Assert.assertNotNull(list); + assertNotNull(list); // can't really assert that the contacts are batch loaded // via a secondary query join diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 0abc2b414..6ee11db34 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + public class TestQueryPlanCacheRowCount extends BaseTestCase { @Test @@ -23,19 +25,19 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { int rc0 = query.findCount(); List ids = query.findIds(); - Assert.assertEquals(rc0, ids.size()); + assertEquals(rc0, ids.size()); List list0 = query.findList(); - Assert.assertEquals(rc0, list0.size()); + assertEquals(rc0, list0.size()); int rc1 = query.findCount(); - Assert.assertEquals(rc0, rc1); + assertEquals(rc0, rc1); List ids1 = query.findIds(); - Assert.assertEquals(rc0, ids1.size()); + assertEquals(rc0, ids1.size()); List list1 = query.findList(); - Assert.assertEquals(rc0, list1.size()); + assertEquals(rc0, list1.size()); int idGt = 5; if (!ids1.isEmpty()) { @@ -50,13 +52,13 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { int rc2 = query2.findCount(); System.out.println("Expection Not same " + rc0 + " != " + rc2); - Assert.assertNotSame(rc0, rc2); + assertNotSame(rc0, rc2); List ids2 = query2.findIds(); - Assert.assertEquals(rc2, ids2.size()); + assertEquals(rc2, ids2.size()); List list2 = query2.findList(); - Assert.assertEquals(rc2, list2.size()); + assertEquals(rc2, list2.size()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 340b6c275..09cb4514f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestRefToLazyLoadMany extends BaseTestCase { @Test @@ -22,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { Customer c = custList.get(0); List contacts2 = c.getContacts(); - Assert.assertEquals(3, Ebean.getBeanState(c).getLoadedProps().size()); + assertEquals(3, Ebean.getBeanState(c).getLoadedProps().size()); // now lazy load the contacts contacts2.size(); diff --git a/ebean-core/src/test/java/org/tests/query/TestRowCount.java b/ebean-core/src/test/java/org/tests/query/TestRowCount.java index d0c058a38..c37bcbaf5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestRowCount.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -11,7 +11,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRowCount extends BaseTestCase { @@ -37,13 +37,12 @@ public class TestRowCount extends BaseTestCase { order.getStatus(); } - assertEquals("same rc to ids.size() ", rc, ids.size()); - assertEquals("same rc to list.size()", rc, list.size()); + assertEquals(rc, ids.size()); + assertEquals(rc, list.size()); } @Test public void find_count_distinct_singleProperty() { - ResetBasicData.reset(); Query query = Ebean.find(Customer.class) diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java index 7386f9bac..e917fdd4d 100644 --- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.*; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 315a4263a..89f28425e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java b/ebean-core/src/test/java/org/tests/query/TestWhereIn.java index 410a24840..618b20363 100644 --- a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java +++ b/ebean-core/src/test/java/org/tests/query/TestWhereIn.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java index f98ff3d81..49f6219b5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java @@ -8,7 +8,7 @@ import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 261202696..71ce72841 100644 --- a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -5,8 +5,8 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestAggregationCount extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { TEventOne one = new TEventOne("first", TEventOne.Status.AA); one.getLogs().add(new TEventMany("all", 1, 10)); diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 33804cfb3..2c0487e6b 100644 --- a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -3,8 +3,8 @@ package org.tests.query.autotune; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -16,7 +16,7 @@ import java.util.Random; public class TestAutoTuneProfiling extends BaseTestCase { - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java index e67c2d0ea..b58ea42d6 100644 --- a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java @@ -3,7 +3,7 @@ package org.tests.query.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.ExpressionList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 5d51620c2..abf8f8d74 100644 --- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -12,8 +12,8 @@ import java.util.function.Function; import javax.persistence.PersistenceException; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import io.ebean.BaseTestCase; @@ -69,7 +69,7 @@ public class SqlQueryCancelTest extends BaseTestCase { private final int timing = 20; - @BeforeClass + @BeforeAll public static void setupTestData() throws SQLException { for (int i = 0; i < 128; i++) { EBasic model = new EBasic("Basic " + i); diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index 263de866b..fefae450d 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -3,18 +3,16 @@ package org.tests.query.embedded; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.ExpressionList; -import org.hamcrest.core.Is; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test that selecting A and filtering on 'B.C=some_value' will correctly create join on table for B. * Model: @@ -23,53 +21,52 @@ import java.util.List; */ public class TestFilteringByEmbeddedInJoinedTable extends BaseTestCase { - private EEmbOuter createOuter(String nomeOuter, Date date1, Date date2) { - EEmbOuter outer1 = new EEmbOuter(); - outer1.setNomeOuter(nomeOuter); + private EEmbOuter createOuter(String nomeOuter, Date date1, Date date2) { + EEmbOuter outer1 = new EEmbOuter(); + outer1.setNomeOuter(nomeOuter); - EEmbDatePeriod eEmbDatePeriod = new EEmbDatePeriod(); - eEmbDatePeriod.setDate1(date1); - eEmbDatePeriod.setDate2(date2); - outer1.setDatePeriod(eEmbDatePeriod); + EEmbDatePeriod eEmbDatePeriod = new EEmbDatePeriod(); + eEmbDatePeriod.setDate1(date1); + eEmbDatePeriod.setDate2(date2); + outer1.setDatePeriod(eEmbDatePeriod); - Ebean.save(outer1); - return outer1; - } + Ebean.save(outer1); + return outer1; + } - @Test - public void testOuterTableJoined() { + @Test + public void testOuterTableJoined() { - EEmbOuter outer1 = createOuter("outer1", new Date(11111), new Date(12222)); - // Unused outer2 just to populate the DB - EEmbOuter outer2 = createOuter("outer2", new Date(21111), new Date(22222)); - assertThat(outer2).isNotNull(); + EEmbOuter outer1 = createOuter("outer1", new Date(11111), new Date(12222)); + // Unused outer2 just to populate the DB + EEmbOuter outer2 = createOuter("outer2", new Date(21111), new Date(22222)); + assertThat(outer2).isNotNull(); - EEmbOuter outer3 = createOuter("outer3", new Date(31111), new Date(32222)); + EEmbOuter outer3 = createOuter("outer3", new Date(31111), new Date(32222)); - EEmbInner inner1 = new EEmbInner(); - inner1.setOuter(outer1); - inner1.setNomeInner("inner1-1"); - Ebean.save(inner1); + EEmbInner inner1 = new EEmbInner(); + inner1.setOuter(outer1); + inner1.setNomeInner("inner1-1"); + Ebean.save(inner1); - EEmbInner inner2 = new EEmbInner(); - // Setting outer1 also here - inner2.setOuter(outer1); - inner2.setNomeInner("inner2-1"); - Ebean.save(inner2); + EEmbInner inner2 = new EEmbInner(); + // Setting outer1 also here + inner2.setOuter(outer1); + inner2.setNomeInner("inner2-1"); + Ebean.save(inner2); - EEmbInner inner3 = new EEmbInner(); - inner3.setOuter(outer3); - inner3.setNomeInner("inner3-3"); - Ebean.save(inner3); + EEmbInner inner3 = new EEmbInner(); + inner3.setOuter(outer3); + inner3.setNomeInner("inner3-3"); + Ebean.save(inner3); - ExpressionList el = Ebean.find(EEmbInner.class).where() - .eq("outer.datePeriod.date1", new Date(11111)); - List list = el.findList(); + ExpressionList el = Ebean.find(EEmbInner.class).where() + .eq("outer.datePeriod.date1", new Date(11111)); + List list = el.findList(); - Assert.assertThat(list.size(), Is.is(2)); - - } + assertThat(list).hasSize(2); + } } diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 52fb10c60..481012c36 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -9,13 +9,13 @@ import io.ebean.cache.ServerCacheStatistics; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EInvoice; import org.tests.model.embedded.EInvoice.State; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMultipleEmbeddedLoading extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 04b0e755d..3bdff89b4 100644 --- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -11,7 +11,7 @@ import io.ebean.meta.QueryPlanRequest; import io.ebean.meta.ServerMetrics; import io.ebean.meta.SortMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.ResetBasicData; @@ -19,7 +19,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCustomerFinder extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index 5d895adbc..aef592d92 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Expr; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.basic.one2one.Wheel; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index 5f88152f9..75aac4ac2 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -3,14 +3,13 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestDisjunctWhereOuterOnMany extends BaseTestCase { @@ -54,8 +53,8 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase { // where (t0.name = ? or u1.name = ? ) ; // --bind(testDisjOuter_2_name,testDisjOuter_CHILD_1) - Assert.assertEquals(2, list.size()); - Assert.assertEquals(2, rowCount); + assertEquals(2, list.size()); + assertEquals(2, rowCount); if (isPostgres()) { String expectedSql = "select distinct on (t0.id) t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id where (t0.name = ? or u1.name = ?)"; diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index fc2ac644f..1d1b04d00 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -2,19 +2,16 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; import io.ebean.Query; +import org.ebeantest.LoggedSqlCollector; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryJoinManyNonRoot extends BaseTestCase { @@ -59,10 +56,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { for (Order o: list) { int withoutFetch = ordersById.get(o.getId()).getCustomer().getContacts().size(); int withFetch = o.getCustomer().getContacts().size(); - assertEquals(String.format("order.customer.contacts for order %d did not match. " + - "Items without fetch: %d, with fetch: %d", o.getId(), withoutFetch, withFetch), - withoutFetch, - withFetch); + assertEquals(withoutFetch, withFetch); } @@ -96,7 +90,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(sql.contains("left join o_order_detail ")); assertTrue(sql.contains("left join o_product ")); - Assert.assertFalse(sql.contains("left join contact")); + assertFalse(sql.contains("left join contact")); } @@ -123,8 +117,8 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(sql.contains("join o_customer t1 on t1.id ")); assertTrue(sql.contains("left join contact ")); - Assert.assertFalse(sql.contains("left join o_order_detail ")); - Assert.assertFalse(sql.contains("left join o_product ")); + assertFalse(sql.contains("left join o_order_detail ")); + assertFalse(sql.contains("left join o_product ")); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index 73449c398..35af2fcf7 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -2,24 +2,23 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; +import org.ebeantest.LoggedSqlCollector; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.family.ChildPerson; import org.tests.model.family.ParentPerson; -import org.ebeantest.LoggedSqlCollector; -import org.junit.Before; -import org.junit.Test; import java.sql.Date; import java.util.List; -import static org.assertj.core.api.Assertions.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryJoinOnFormula extends BaseTestCase { - - @Before + @BeforeEach public void init() { ResetBasicData.reset(); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index b24c07472..cc104af6b 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -9,11 +9,13 @@ import io.ebeaninternal.server.el.ElPropertyValue; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryJoinQueryNonRoot extends BaseTestCase { @Test @@ -23,7 +25,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { BeanDescriptor d = server.getBeanDescriptor(Order.class); ElPropertyValue elGetValue = d.getElGetValue("customer.contacts"); - Assert.assertTrue(elGetValue.containsMany()); + assertTrue(elGetValue.containsMany()); ResetBasicData.reset(); @@ -33,8 +35,8 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { .fetch("customer.contacts.group") .where().lt("id", 3).findList(); - Assert.assertNotNull(list); - Assert.assertTrue(!list.isEmpty()); + assertNotNull(list); + assertTrue(!list.isEmpty()); for (Order order : list) { List contacts = order.getCustomer().getContacts(); @@ -49,7 +51,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { // q.setAutoTune(false); // List list2 = q.findList(); // - // Assert.assertTrue(list2.size() > 0); + // assertTrue(list2.size() > 0); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index e7a07bb2d..9e3e821c1 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -5,8 +5,9 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { @@ -27,7 +28,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { //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)); + 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 @@ -51,7 +52,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { //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)); + 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 @@ -78,9 +79,9 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { 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 ")); + assertTrue(generatedSql.contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id")); + assertTrue(generatedSql.contains("left join contact t2 on t2.customer_id = t1.id")); + 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, diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index e1d9afd02..8ff707e98 100644 --- a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 371c4b128..ffe259a6f 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -6,10 +6,10 @@ import io.ebean.OrderBy; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByClear extends BaseTestCase { @@ -26,7 +26,7 @@ public class TestOrderByClear extends BaseTestCase { assertTrue(orderBy.containsProperty("orderDate")); orderBy.clear(); - Assert.assertFalse(orderBy.containsProperty("orderDate")); + assertFalse(orderBy.containsProperty("orderDate")); orderBy.asc("shipDate"); assertTrue(orderBy.containsProperty("shipDate")); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index 0e5ee65da..07c545590 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -3,14 +3,14 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByOnComplex extends BaseTestCase { @@ -24,8 +24,7 @@ public class TestOrderByOnComplex extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by t0.kcustomer_id desc")); - + assertTrue(sql.contains("order by t0.kcustomer_id desc")); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index cf451eee2..44d5083dc 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -5,9 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; @@ -18,6 +16,7 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOrderByWithDistinct extends BaseTestCase { @@ -135,8 +134,8 @@ public class TestOrderByWithDistinct extends BaseTestCase { // where u1.role_name = ? // order by t1.name, t0.user_name; --bind(A) - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); + assertEquals(1, list.size()); + assertEquals(user1, list.get(0)); String generatedSql = query.getGeneratedSql(); if (isPostgres()) { assertThat(generatedSql).contains("select distinct on (t1.name, t0.user_name, t0.userid) t0.userid"); // using distinct @@ -161,8 +160,8 @@ public class TestOrderByWithDistinct extends BaseTestCase { .order("userType.name").query(); list = query.findList(); - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); + assertEquals(1, list.size()); + assertEquals(user1, list.get(0)); // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 // from muser t0 diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index 196001bab..e74129648 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -4,23 +4,21 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; 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); + assertEquals("helloasc boodesc", test); } - @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index 70972ec28..68db9d12d 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -5,8 +5,9 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByWithFunction extends BaseTestCase { @@ -18,12 +19,12 @@ public class TestOrderByWithFunction extends BaseTestCase { if (isSqlServer()) { length = "len"; } - + Query query = Ebean.find(Customer.class).order(length + "(name),name"); query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by " + length + "(t0.name)")); + assertTrue(sql.contains("order by " + length + "(t0.name)")); } } diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 7855fefcb..6e487eefa 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestOrderByWithMany extends BaseTestCase { @Test @@ -47,12 +48,12 @@ public class TestOrderByWithMany extends BaseTestCase { // first one is the main query and others are lazy loading queries List loggedSql = LoggedSqlCollector.stop(); - Assert.assertTrue(loggedSql.size() > 1); + assertTrue(loggedSql.size() > 1); String lazyLoadSql = loggedSql.get(1); // contains the foreign key back to the parent bean (t0.order_id) - Assert.assertTrue(lazyLoadSql, trimSql(lazyLoadSql, 2).contains("select t0.order_id, t0.id")); - Assert.assertTrue(lazyLoadSql.contains("order by t0.order_id, t0.id, t0.order_qty, t0.cretime desc")); + assertTrue(trimSql(lazyLoadSql, 2).contains("select t0.order_id, t0.id")); + assertTrue(lazyLoadSql.contains("order by t0.order_id, t0.id, t0.order_qty, t0.cretime desc")); } @@ -63,7 +64,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); + assertTrue(sql.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); } private void checkWithBuiltInMany() { @@ -75,8 +76,8 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // t0.id inserted into the middle of the order by - Assert.assertTrue(sql.contains("order by t1.name desc, t0.id, t2.id asc")); - Assert.assertTrue(sql.contains("t2.id asc, t2.order_qty asc, t2.cretime desc")); + assertTrue(sql.contains("order by t1.name desc, t0.id, t2.id asc")); + assertTrue(sql.contains("t2.id asc, t2.order_qty asc, t2.cretime desc")); } private void checkAppendId() { @@ -88,7 +89,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // append the id to ensure ordering of root level objects - Assert.assertTrue(sql.contains("order by t1.name desc, t0.id")); + assertTrue(sql.contains("order by t1.name desc, t0.id")); } private void checkNone() { @@ -101,8 +102,8 @@ public class TestOrderByWithMany extends BaseTestCase { // no need to append id to order by as there is no 'many' included in the // query - Assert.assertTrue(sql.contains("order by t1.name desc")); - Assert.assertTrue(!sql.contains("order by t1.name desc,")); + assertTrue(sql.contains("order by t1.name desc")); + assertTrue(!sql.contains("order by t1.name desc,")); } private void checkBoth() { @@ -114,7 +115,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // insert id into the middle of the order by - Assert.assertTrue(sql.contains("order by t1.name, t0.id, t2.ship_time desc")); + assertTrue(sql.contains("order by t1.name, t0.id, t2.ship_time desc")); } private void checkPrepend() { @@ -126,7 +127,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); } private void checkAlreadyIncluded() { @@ -138,7 +139,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); } private void checkAlreadyIncluded2() { @@ -150,6 +151,6 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.order_date, t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.order_date, t0.id, t1.ship_time desc")); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java index 806d2200f..82b77cd85 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index 35f430b5b..5b2582375 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestFindIdsWithInheritance extends BaseTestCase { @Test @@ -20,10 +21,9 @@ public class TestFindIdsWithInheritance extends BaseTestCase { Ebean.save(truck); List ids = Ebean.find(Vehicle.class).findIds(); - Assert.assertNotNull(ids); + assertNotNull(ids); Ebean.delete(truck); - } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index 3c395f3d6..d997dc556 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -3,10 +3,10 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; +import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; import com.sun.management.HotSpotDiagnosticMXBean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.management.MBeanServer; import java.io.File; @@ -28,7 +28,7 @@ public class TestFindIterateHeapDump extends BaseTestCase { /** * Ignore this test generally - run it manually against MySQL specifically for Issue #56. */ - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index ff9dcb89f..5dd124f7a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -5,13 +5,13 @@ import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFindPartialWithConstructorSetFields extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index 274b5eeb4..772719d90 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.Ebean; import io.ebean.TransactionalTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonEnum; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index b4d50582c..328ab92a8 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -6,11 +6,13 @@ import io.ebean.EbeanServer; import io.ebean.ExpressionList; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestFormulaWithFindCount extends BaseTestCase { @Test @@ -26,12 +28,12 @@ public class TestFormulaWithFindCount extends BaseTestCase { for (Order order : list) { Double amount = order.getTotalAmount(); - Assert.assertNotNull(amount); + assertNotNull(amount); } ExpressionList expressionList = server.find(Order.class).where().gt("totalAmount", 1d); int rowCount = expressionList.findCount(); - Assert.assertEquals(list.size(), rowCount); + assertEquals(list.size(), rowCount); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java index d5eb0e92c..f775c5944 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -5,7 +5,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index 4070496c1..a265499fb 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index a3e331311..5779a39ba 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 36da8bd82..71b49dc82 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.map.MpRole; import org.tests.model.map.MpUser; @@ -10,8 +10,8 @@ import java.util.LinkedHashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestOneToManyAsMap extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index db528a536..e648754e5 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryConversationRowCount extends BaseTestCase { @@ -63,7 +63,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { // ); --bind(1,true,1,true) List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); String countSql = trimSql(loggedSql.get(0), 0); assertThat(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/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java index 3a16940b0..927cbeb84 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -7,14 +7,12 @@ import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static junit.framework.TestCase.assertNull; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryDistinct extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 55901a720..aef18b94e 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 44c8a78f0..6ef74b43a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryRowCountWithMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 989ae123d..264bc18b9 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -6,10 +6,10 @@ import io.ebean.CountedValue; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.Data; import org.tests.inherit.EUncle; @@ -478,7 +478,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { } @Test - @Ignore //don't know if ebean can handle this on many to many, as this means that the cartesian product is generated + @Disabled //don't know if ebean can handle this on many to many, as this means that the cartesian product is generated public void distinctFetchManyToManyInheritedBean() { ResetBasicData.reset(); @@ -758,7 +758,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { } } - @Before + @BeforeEach public void setup() { MainEntity e1 = new MainEntity(); e1.setId("1"); @@ -791,7 +791,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { DB.save(rel); } - @After + @AfterEach public void cleanup() { Ebean.find(MainEntityRelation.class).delete(); Ebean.find(MainEntity.class).delete(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java index ce15e7895..45ac3cb55 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java @@ -3,11 +3,12 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.selfref.SelfParent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestSelfParent extends BaseTestCase { @Test @@ -39,10 +40,9 @@ public class TestSelfParent extends BaseTestCase { List roots = Ebean.find(SelfParent.class).where().eq("parent", null).findList(); - Assert.assertEquals(1, roots.size()); + assertEquals(1, roots.size()); printNode(roots.get(0)); - } public static void printNode(SelfParent o) { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java index a2b1815d6..b8396593a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.Expression; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestSubQueryBinding extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java index c3ad40ce6..341d553e5 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -3,8 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -12,6 +11,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWhereAnnotation extends BaseTestCase { @@ -28,10 +29,10 @@ public class TestWhereAnnotation extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); String sql = loggedSql.get(0); - Assert.assertTrue(sql.contains("t1.order_date is not null")); + assertTrue(sql.contains("t1.order_date is not null")); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index c36cd28c8..0bd6ae56e 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -3,12 +3,12 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestWhereLikeWithSlash extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index e3fe57b18..293c4acaa 100644 --- a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -4,7 +4,7 @@ import io.ebean.Ebean; import io.ebean.PagedList; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index f16828ec5..0312b3282 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -9,7 +9,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlQueryTests extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index bc96f4e46..e87a3a3d5 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.annotation.Platform; import io.ebean.plugin.SpiServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java index caf230efc..e7ae20429 100644 --- a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java +++ b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java @@ -2,7 +2,7 @@ package org.tests.quotedidentifier; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BWithQIdent; public class TestQuotedIdentifierQuery extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index b8fdba507..f4c4c26b7 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -5,12 +5,12 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebeaninternal.api.SpiTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; import java.util.Arrays; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestInsertSqlLogging extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 589bf6591..538a950e8 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -8,12 +8,12 @@ import io.ebean.RawSqlBuilder; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestOrderReportTotal extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 4e0fe97a1..50395973d 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -7,11 +7,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlAsKeyword extends BaseTestCase { @Test @@ -39,8 +40,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); List list = query.findList(); - Assert.assertNotNull(list); - + assertNotNull(list); // try valid query with no spaces rawSql = @@ -53,7 +53,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); rawSql = RawSqlBuilder @@ -64,7 +64,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); // this will barf - expecting the AS keyword now rawSql = @@ -76,6 +76,6 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index 1de360045..f383d9f04 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -7,11 +7,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlCustomerAggregate extends BaseTestCase { @Test @@ -29,6 +30,6 @@ public class TestRawSqlCustomerAggregate extends BaseTestCase { query.where().ge("customer.id", 1); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 359bf2ebe..0931ed28c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -9,13 +9,13 @@ import org.tests.model.basic.EBasic; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Random; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestRawSqlMasterDetail extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index 62f3f3002..38494aecc 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -13,13 +13,13 @@ import io.ebean.annotation.Platform; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestRawSqlNamedParams extends BaseTestCase { @@ -39,8 +39,7 @@ public class TestRawSqlNamedParams extends BaseTestCase { query.where().lt("id", 1000); List list = query.findList(); - - Assert.assertNotNull(list); + assertNotNull(list); } @Test diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index bece172f6..4f59c0ce0 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -11,8 +11,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -21,6 +20,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestRawSqlOrmQuery extends BaseTestCase { @@ -41,7 +42,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); // check also select count(*) LoggedSqlCollector.start(); @@ -64,7 +65,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.where().ilike("name", "r%"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } @Test @@ -93,8 +94,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase { int rowCount = query.findCount(); FutureRowCount futureRowCount = query.findFutureCount(); - Assert.assertEquals(initialRowCount, rowCount); - Assert.assertEquals(initialRowCount, futureRowCount.get().intValue()); + assertEquals(initialRowCount, rowCount); + assertEquals(initialRowCount, futureRowCount.get().intValue()); // check that lazy loading still executes for (Customer customer : list) { @@ -123,8 +124,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase { List list = page.getList(); int rowCount = page.getTotalCount(); - Assert.assertEquals(2, list.size()); - Assert.assertEquals(initialRowCount, rowCount); + assertEquals(2, list.size()); + assertEquals(initialRowCount, rowCount); // check that lazy loading executes for (Customer customer : list) { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 19c53d44d..3b89a8d1c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,18 +1,14 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlOrmQueryDistinct extends BaseTestCase { @Test @@ -38,7 +34,7 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase { query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index a012e5e5e..cbecd82fc 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -9,11 +9,12 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlOrmWrapper extends BaseTestCase { @Test @@ -39,7 +40,7 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { .where().gt("order.id", 0).having().gt("totalAmount", 20); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); output(list); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 94df85a74..2a7b288e1 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -9,11 +9,12 @@ import io.ebean.RawSqlBuilder; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlOrmWrapper2 extends BaseTestCase { @Test @@ -36,13 +37,12 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { .order().desc("totalAmount").setMaxRows(10); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); for (OrderAggregate oa : list) { oa.getTotalAmount(); Order order = oa.getOrder(); order.getId(); } - } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 3e3bc2e20..6fc475bd9 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java index 75d678fd6..6444593e6 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java index 1e576f0b7..61942668e 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 300ecd524..c137f64d3 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -8,7 +8,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.Transaction; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index 38dc54918..523f2f2c7 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -7,14 +7,14 @@ import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; import org.tests.inherit.Parent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class ParentQueryTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index e410bb9af..bf8f0c534 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -2,11 +2,10 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; @@ -17,13 +16,13 @@ import org.tests.inherit.ParentAggregate; 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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ParentRawSqlTest extends BaseTestCase { - @Before + @BeforeEach public void clearDb() { Ebean.deleteAll(Ebean.find(Data.class).findList()); Ebean.deleteAll(Ebean.find(Parent.class).findList()); diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index b127b249a..73acc39af 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -4,7 +4,7 @@ import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 39f63c31b..5b5f82b8c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; import org.tests.model.json.PlainBean; diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index 91ccb2b78..87ab6de65 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -12,9 +12,9 @@ import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.event.readaudit.ReadAuditQueryPlan; import io.ebean.event.readaudit.ReadEvent; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.EBasicChangeLog; @@ -39,7 +39,7 @@ public class TestReadAudit extends BaseTestCase { Long id1; Long id2; - @Before + @BeforeEach public void setup() { server = createServer(); @@ -61,7 +61,7 @@ public class TestReadAudit extends BaseTestCase { server.save(ar); } - @After + @AfterEach public void shutdown() { server.shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java index 65ca483f8..19a489e9c 100644 --- a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -8,11 +8,11 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRefreshWithMany extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java index 6bb90a87d..f09823412 100644 --- a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java +++ b/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java @@ -2,7 +2,7 @@ package org.tests.repository; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java index 9724050fc..ff3d868e8 100644 --- a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java +++ b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -2,10 +2,11 @@ package org.tests.saveassociation; import io.ebean.BaseTestCase; import io.ebean.Ebean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSaveAssociation extends BaseTestCase { @@ -25,8 +26,7 @@ public class TestSaveAssociation extends BaseTestCase { TSMaster m0Check = Ebean.find(TSMaster.class).fetch("details").where().idEq(m0.getId()) .findOne(); - Assert.assertEquals(2, m0Check.getDetails().size()); - + assertEquals(2, m0Check.getDetails().size()); } } diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java index e2a21562d..4229cbf65 100644 --- a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java +++ b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java @@ -2,11 +2,11 @@ package org.tests.saveassociation; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveSamePK extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 7c7d20a34..5f76c3fc9 100644 --- a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -8,11 +8,12 @@ import org.tests.singleTableInheritance.model.Warehouse; import org.tests.singleTableInheritance.model.Zone; import org.tests.singleTableInheritance.model.ZoneExternal; import org.tests.singleTableInheritance.model.ZoneInternal; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInheritQuery extends BaseTestCase { @Test @@ -33,13 +34,13 @@ public class TestInheritQuery extends BaseTestCase { // Ebean.find(PalletLocation.class).where().eq("zone.id", // zone.getId()).findList(); - Assert.assertNotNull(locations); - Assert.assertEquals(1, locations.size()); + assertNotNull(locations); + assertEquals(1, locations.size()); PalletLocation rereadLoc = locations.get(0); - Assert.assertTrue(rereadLoc instanceof PalletLocation); + assertTrue(rereadLoc instanceof PalletLocation); Zone rereadZone = rereadLoc.getZone(); - Assert.assertNotNull(rereadZone); - Assert.assertTrue(rereadZone instanceof ZoneExternal); + assertNotNull(rereadZone); + assertTrue(rereadZone instanceof ZoneExternal); } @SuppressWarnings("unlikely-arg-type") @@ -66,26 +67,26 @@ public class TestInheritQuery extends BaseTestCase { // 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)); + assertEquals(2, zones.size()); + assertTrue(zones.contains(zoneInt)); + 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); + assertEquals(1, internalZones.size()); + assertTrue(internalZones.contains(zoneInt)); + assertFalse(internalZones.contains(zoneExt)); + 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); + assertEquals(1, externalZones.size()); + assertTrue(externalZones.contains(zoneExt)); + assertFalse(externalZones.contains(zoneInt)); + assertTrue(externalZones.get(0) instanceof ZoneExternal); // parents with children of Zones and subclasses @@ -98,10 +99,10 @@ public class TestInheritQuery extends BaseTestCase { // 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()); + assertNotNull(wh2); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); + assertEquals(wh.getOfficeZone().getAttribute(), wh2.getOfficeZone().getAttribute()); // before the fix, next assertion runs this lazy query: @@ -114,8 +115,8 @@ public class TestInheritQuery extends BaseTestCase { // this works here because we have at least one shipping zone - Assert.assertEquals(1, wh2.getShippingZones().size()); - Assert.assertTrue(wh2.getShippingZones().contains(zoneExt)); + assertEquals(1, wh2.getShippingZones().size()); + assertTrue(wh2.getShippingZones().contains(zoneExt)); // set optional concrete to null to set stage for failure wh.setOfficeZone(null); @@ -126,7 +127,7 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); - Assert.assertNotNull(wh2); + 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 @@ -138,24 +139,24 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); // key assertion #1 - fails due to left join with discriminator in WHERE - Assert.assertNotNull(wh2); + 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()); + assertNotNull(wh2); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); // query with lazy load of abstract children wh = Ebean.find(Warehouse.class) .where().eq("id", wh.getId()) .findOne(); - Assert.assertNotNull(wh); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); + assertNotNull(wh); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); // query with fetch of abstract children wh = Ebean.find(Warehouse.class) @@ -163,9 +164,9 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); // 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()); + assertNotNull(wh); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); } diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 4f271f0f6..f3ce1f658 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -7,7 +7,7 @@ import io.ebean.SqlQuery; import io.ebean.SqlRow; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; import org.tests.model.softdelete.EBasicSoftDelete; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 68c2c7f69..a9cae80f8 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.softdelete.ESoftDelBook; import org.tests.model.softdelete.ESoftDelUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 918445e1e..06fd33447 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 8f730921a..99dcc20dd 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelY; import org.tests.model.softdelete.ESoftDelZ; @@ -60,7 +60,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { final List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - if (isSqlServer()) { + if (isSqlServer() || isMySql() || isMariaDB()) { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where"); } else { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where"); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index d5eeefedc..ca0dfc089 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelOneA; import org.tests.model.softdelete.ESoftDelOneB; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index ee8c1590a..616481f6c 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EsdDetail; import org.tests.model.softdelete.EsdMaster; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index 07388a367..8fd4862d0 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelMid; import org.tests.model.softdelete.ESoftDelTop; import org.tests.model.softdelete.ESoftDelUp; diff --git a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index a505a5d54..1d4a262d6 100644 --- a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.sp.model.car.Car; import org.tests.sp.model.car.Door; import org.tests.sp.model.car.Wheel; @@ -13,8 +13,8 @@ import java.util.LinkedList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestManyToManySaveTwice extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java index 670080584..19fb84364 100644 --- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java @@ -6,15 +6,16 @@ import io.ebean.EbeanServer; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.InheritInfo; +import org.junit.jupiter.api.Test; import org.tests.model.inheritmany.IMRelated; import org.tests.model.inheritmany.IMRoot; import org.tests.model.inheritmany.IMRootOne; import org.tests.model.inheritmany.IMRootTwo; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestInheritWithMany extends BaseTestCase { @@ -23,12 +24,12 @@ public class TestInheritWithMany extends BaseTestCase { public void test() { EbeanServer server = Ebean.getServer(null); - Assert.assertNotNull(server); + assertNotNull(server); SpiEbeanServer spiServer = (SpiEbeanServer) server; BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class); InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); - Assert.assertNotNull(inheritInfo); + assertNotNull(inheritInfo); IMRootOne one = new IMRootOne(); diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java index 57ac6755f..313f5017c 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -3,7 +3,7 @@ package org.tests.text.csv; import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index 76127c8cb..ef6bfd8c7 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.io.File; diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java index fac5e5095..3aea61ade 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java @@ -2,21 +2,22 @@ package org.tests.text.csv; import io.ebean.BaseTestCase; import io.ebean.text.TimeStringParser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Time; +import static org.junit.jupiter.api.Assertions.*; + public class TestTimeStringParser extends BaseTestCase { @Test public void testSimple() { Time t = (Time) TimeStringParser.get().parse("12:00"); - Assert.assertNotNull(t); + assertNotNull(t); t = (Time) TimeStringParser.get().parse("12:00:12"); - Assert.assertNotNull(t); + assertNotNull(t); expectError("12"); expectError("12:"); @@ -29,9 +30,9 @@ public class TestTimeStringParser extends BaseTestCase { private void expectError(String value) { try { TimeStringParser.get().parse(value); - Assert.assertTrue(false); + fail(); } catch (IllegalArgumentException e) { - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index eaf1825fc..dab45d3cb 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -8,24 +8,24 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.text.json.ReadJson; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.io.IOException; import java.io.StringReader; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestJsonBeanDescriptorParse extends BaseTestCase { @Test public void test() throws IOException { - 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); @@ -33,16 +33,15 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { Customer customer = descriptor.jsonRead(readJson, null); - Assert.assertEquals(Integer.valueOf(123), customer.getId()); - Assert.assertEquals("Hello rob", customer.getName()); + assertEquals(Integer.valueOf(123), customer.getId()); + 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")); - + assertEquals(2, loadedProps.size()); + assertTrue(loadedProps.contains("id")); + assertTrue(loadedProps.contains("name")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index 63630140f..17219fe5e 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -3,25 +3,24 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BeanWithTimeZone; -import org.junit.Assert; -import org.junit.Test; -import java.io.IOException; import java.util.TimeZone; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonBeanWithTimeZone extends BaseTestCase { @Test - public void testSimple() throws IOException { - + public void testSimple() { TimeZone defaultTimeZone = TimeZone.getDefault(); TimeZone.getAvailableIDs(defaultTimeZone.getRawOffset()); String id = defaultTimeZone.getID(); TimeZone timeZone = TimeZone.getTimeZone(id); - Assert.assertEquals(defaultTimeZone, timeZone); + assertEquals(defaultTimeZone, timeZone); BeanWithTimeZone bean = new BeanWithTimeZone(); bean.setName("foo"); @@ -32,13 +31,12 @@ public class TestJsonBeanWithTimeZone extends BaseTestCase { BeanWithTimeZone bean2 = jsonContext.toBean(BeanWithTimeZone.class, jsonContent); - Assert.assertEquals(bean.getTimezone(), bean2.getTimezone()); + assertEquals(bean.getTimezone(), bean2.getTimezone()); Ebean.save(bean); BeanWithTimeZone bean3 = Ebean.find(BeanWithTimeZone.class, bean.getId()); - Assert.assertEquals(bean.getTimezone(), bean3.getTimezone()); - + assertEquals(bean.getTimezone(), bean3.getTimezone()); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 75402e4d9..7c0975d02 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -3,7 +3,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.Cat; import org.tests.model.basic.Dog; @@ -11,7 +11,7 @@ import org.tests.model.basic.Dog; import java.sql.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonInheritanceDiscriminator extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java index 4237d5fd6..0495d4afb 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java @@ -7,13 +7,13 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestJsonMap extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java index d64a4b702..a00e95829 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -4,20 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.io.Reader; +import java.io.*; import java.util.LinkedHashMap; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + public class TestJsonSimple extends BaseTestCase { @SuppressWarnings("unchecked") @@ -40,11 +35,11 @@ public class TestJsonSimple extends BaseTestCase { Object el = EJson.parse(jsonText); assertThat(el).isNotNull(); - + 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")); + assertEquals(12L, e2.get("a")); + assertEquals("rob", ((Map) e2.get("name")).get("first")); Map m = new LinkedHashMap<>(); m.put("hello", "rob"); @@ -56,12 +51,11 @@ public class TestJsonSimple extends BaseTestCase { String s = "{\"parishId\":\"18\",\"contentId\":null,\"contentStatus\":null,\"contentType\":\"pg-hello\",\"content\":\"asd\"}"; Object jsonElement = EJson.parse(s); - Assert.assertNotNull(jsonElement); + assertNotNull(jsonElement); Map e3 = EJson.parseObject("{\"name\":\"\\u60a8\\u597d\"}"); - Assert.assertTrue(((String) e3.get("name")).length() == 2); - + assertTrue(((String) e3.get("name")).length() == 2); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index be569ac77..0d0f84a21 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -3,17 +3,18 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.SomeEnum; import org.tests.model.basic.SomeEnumBean; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonSomeEnumWithToString extends BaseTestCase { @Test - public void testJsonConversion() throws IOException { + public void testJsonConversion() { SomeEnumBean bean = new SomeEnumBean(); bean.setId(100l); @@ -25,10 +26,9 @@ public class TestJsonSomeEnumWithToString extends BaseTestCase { SomeEnumBean bean2 = json.toBean(SomeEnumBean.class, jsonContent); - Assert.assertEquals(bean.getSomeEnum(), bean2.getSomeEnum()); - Assert.assertEquals(bean.getName(), bean2.getName()); - Assert.assertEquals(bean.getId(), bean2.getId()); - + assertEquals(bean.getSomeEnum(), bean2.getSomeEnum()); + assertEquals(bean.getName(), bean2.getName()); + assertEquals(bean.getId(), bean2.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index 8ecef61fc..b67112308 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -3,15 +3,16 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.io.StringReader; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestTextJsonBeanReadVisitor extends BaseTestCase { @Test @@ -36,7 +37,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { StringReader reader = new StringReader(s); List mList2 = json.toList(Customer.class, reader); - Assert.assertEquals(mList.size(), mList2.size()); + assertEquals(mList.size(), mList2.size()); } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 8c39075a5..2ee1393f6 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -5,7 +5,7 @@ package org.tests.text.json; //import org.junit.Assert; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; // //import com.avaje.ebean.Ebean; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 288a61cc5..6cf13502f 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.tests.model.basic.Car; import org.tests.model.basic.CarAccessory; @@ -10,12 +10,12 @@ import org.tests.model.basic.Trip; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTextJsonInheritance extends BaseTestCase { @@ -24,7 +24,7 @@ public class TestTextJsonInheritance extends BaseTestCase { String fom = "{\"id\":90,\"name\":\"Frank\",\"vehicle\":{\"id\":42,\"licenseNumber\":\"T100\",\"capacity\":99.0,\"dtype\":\"T\"}}"; - VehicleDriver driver1 = Ebean.json().toBean(VehicleDriver.class, fom); + VehicleDriver driver1 = DB.json().toBean(VehicleDriver.class, fom); assertThat(driver1.getVehicle()).isInstanceOf(Truck.class); assertThat(driver1.getVehicle().getLicenseNumber()).isEqualTo("T100"); } @@ -34,36 +34,33 @@ public class TestTextJsonInheritance extends BaseTestCase { setupData(); - List list = Ebean.find(Vehicle.class).setAutoTune(false).findList(); + List list = DB.find(Vehicle.class).setAutoTune(false).findList(); - Assert.assertEquals(2, list.size()); + assertEquals(2, list.size()); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); String jsonString = jsonContext.toJson(list); List rebuiltList = jsonContext.toList(Vehicle.class, jsonString); - Assert.assertEquals(2, rebuiltList.size()); - + assertEquals(2, rebuiltList.size()); } private void setupData() { - - Ebean.createUpdate(CarAccessory.class, "delete from CarAccessory").execute(); - Ebean.createUpdate(CarFuse.class, "delete from CarFuse").execute(); - Ebean.createUpdate(Trip.class, "delete from trip").execute(); - Ebean.createUpdate(VehicleDriver.class, "delete from vehicleDriver").execute(); - Ebean.createUpdate(Vehicle.class, "delete from vehicle").execute(); + DB.createUpdate(CarAccessory.class, "delete from CarAccessory").execute(); + DB.createUpdate(CarFuse.class, "delete from CarFuse").execute(); + DB.createUpdate(Trip.class, "delete from trip").execute(); + DB.createUpdate(VehicleDriver.class, "delete from vehicleDriver").execute(); + DB.createUpdate(Vehicle.class, "delete from vehicle").execute(); Car c = new Car(); c.setLicenseNumber("C6788"); c.setDriver("CarDriver"); - Ebean.save(c); + DB.save(c); Truck t = new Truck(); t.setLicenseNumber("T1098"); t.setCapacity(20D); - Ebean.save(t); - + DB.save(t); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index d11aba2ee..d27d28098 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import io.ebean.util.StringHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index fa11fc3e4..345cd390a 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -4,24 +4,23 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Before; -import org.junit.Test; import java.io.IOException; import java.util.List; public class TestTextJsonInvokeLazy extends BaseTestCase { - @Before + @BeforeEach public void clearBeanCache() { server().pluginApi().beanType(Customer.class).clearBeanCache(); } @Test public void test() throws IOException { - ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("name").findList(); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index d7b7bf4e6..6fe78b3d1 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -5,18 +5,19 @@ import io.ebean.Ebean; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestTextJsonReadManyLazyLoad extends BaseTestCase { @Test - public void test_lazyLoadBoth() throws IOException { + public void test_lazyLoadBoth() { ResetBasicData.reset(); @@ -31,9 +32,8 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } @Test @@ -52,13 +52,12 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } @Test - public void test_lazyLoadContacts() throws IOException { + public void test_lazyLoadContacts() { ResetBasicData.reset(); @@ -74,9 +73,8 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index d73f561ed..ce1734ce5 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -8,16 +8,17 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestTextJsonReferenceBean extends BaseTestCase { @Test @@ -46,16 +47,15 @@ public class TestTextJsonReferenceBean extends BaseTestCase { prodDesc.isReference(eb._ebean_getIntercept()); BeanState beanState = Ebean.getBeanState(refProd); - Assert.assertTrue(beanState.isNew()); + assertTrue(beanState.isNew()); String name = refProd.getName(); - Assert.assertNull(name); + assertNull(name); // Set to be 'loaded' to invoke lazy loading beanState.setLoaded(); String name2 = refProd.getName(); - Assert.assertNotNull(name2); - + assertNotNull(name2); } List orders = Ebean.find(Order.class) @@ -75,9 +75,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); - Assert.assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); - - + assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java index f77ff3fd8..5ea710bbc 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -7,18 +7,17 @@ import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; import io.ebean.text.json.JsonReadOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TestTextJsonSimple extends BaseTestCase { @@ -76,7 +75,7 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list); // check that transient fields are included by default in the JSON output - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); List mList = json.toList(Customer.class, jsonOutput); assertEquals(list.size(), mList.size()); @@ -113,7 +112,7 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list); // check that transient fields are included by default in the JSON output - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); List mList = json.toList(Customer.class, jsonOutput); assertEquals(list.size(), mList.size()); @@ -136,13 +135,13 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list, pathProperties); // check that transient fields are included by explicit pathProperties - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); pathProperties = PathProperties.parse("(id,name)"); jsonOutput = json.toJson(list, pathProperties); // check that transient fields are NOT included when explicitly excluded by pathProperties - Assert.assertFalse(jsonOutput.contains("\"selected\":")); + assertFalse(jsonOutput.contains("\"selected\":")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index 59040b598..7e6b13f0f 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -4,14 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestTextJsonSuperSimple extends BaseTestCase { @Test @@ -31,7 +32,7 @@ public class TestTextJsonSuperSimple extends BaseTestCase { String s = json.toJson(customer); int statusPos = s.indexOf("status"); - Assert.assertEquals(-1, statusPos); + assertEquals(-1, statusPos); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index ff79d7fac..6569cae2b 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -4,20 +4,15 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.TransactionalTestCase; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.Customer; -import org.tests.model.basic.MRole; -import org.tests.model.basic.MUser; -import org.tests.model.basic.Order; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import org.tests.model.basic.Order.Status; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestTextJsonUpdateCascade extends TransactionalTestCase { @Test @@ -28,12 +23,12 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { Customer c2 = Ebean.getReference(Customer.class, c0.getId()); List orders = c2.getOrders(); - Assert.assertEquals(1, orders.size()); + assertEquals(1, orders.size()); Order order = orders.get(0); int size = order.getDetails().size(); - Assert.assertTrue(size >= 3); + assertTrue(size >= 3); Customer cref = Ebean.getReference(Customer.class, c0.getId()); order.setCustomer(cref); @@ -45,7 +40,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { // remove one of the details... OrderDetail removedDetail = order.getDetails().remove(2); - Assert.assertNotNull(removedDetail); + assertNotNull(removedDetail); Product p = Ebean.getReference(Product.class, 1); OrderDetail newDetail = new OrderDetail(p, 899, 12.12d); diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java index 7f144f77f..beef2fbc9 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java @@ -2,8 +2,8 @@ package org.tests.timezone; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.sql.Connection; import java.sql.PreparedStatement; @@ -23,7 +23,7 @@ public class TimezoneTests { public TimezoneTests() { } - @Ignore + @Disabled @Test public void rawJdbc() throws SQLException { diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java index ff50ee5a5..c9d3c93d3 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java @@ -1,8 +1,8 @@ package org.tests.timezone; import io.ebean.Ebean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; @@ -35,7 +35,7 @@ public class TzBeanTests { /** * Run this 5 times with different modes. */ - @Ignore + @Disabled @Test public void insert_one_at_a_time() { @@ -65,7 +65,7 @@ public class TzBeanTests { /** * In separate JVM/execution fetch the beans with various timezones etc. */ - @Ignore + @Disabled @Test public void fetch_beans() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 0330a103b..05c64077a 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyTopic; import org.tests.model.m2m.Role; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 2849adcb5..3d86b9976 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.UTDetail; @@ -15,7 +15,7 @@ import org.tests.model.basic.UTMaster; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestBatchPersistCascade extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java index a5432596e..754ed3359 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +14,7 @@ import javax.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBeanStateReset extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index eb61b7010..e70a636bc 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -4,39 +4,38 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; import java.sql.Connection; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestBeginTransactionWithExisting extends BaseTestCase { @Test public void testTransactionIsoLevels() { - assertEquals(Transaction.READ_COMMITTED, Connection.TRANSACTION_READ_COMMITTED); assertEquals(Transaction.READ_UNCOMMITTED, Connection.TRANSACTION_READ_UNCOMMITTED); assertEquals(Transaction.REPEATABLE_READ, Connection.TRANSACTION_REPEATABLE_READ); assertEquals(Transaction.SERIALIZABLE, Connection.TRANSACTION_SERIALIZABLE); } - @Test(expected = PersistenceException.class) + @Test public void test() { assertEquals(Transaction.READ_COMMITTED, Connection.TRANSACTION_READ_COMMITTED); - - Transaction txn = Ebean.beginTransaction(); - try { - - try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) { - fail("Expected persitenceException here"); + assertThrows(PersistenceException.class, () -> { + Transaction txn = Ebean.beginTransaction(); + try { + try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) { + fail("Expected persitenceException here"); + } + } finally { + txn.end(); } - - } finally { - txn.end(); - } + }); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java index 157a20056..641adbcaf 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -7,13 +7,13 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.m2m.MnyB; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestCommitAndContinue extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index cc42c1c3a..6e5afa823 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 93f1cbbfe..e3f6572af 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -5,11 +5,11 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiTransaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestDeleteFromPersistenceContext extends BaseTestCase { @@ -37,7 +37,7 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { Ebean.delete(bean2); Object bean5 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); - assertNull("Bean is deleted from PersistenceContext", bean5); + assertNull(bean5); Ebean.commitTransaction(); @@ -46,12 +46,11 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { } EBasicVer bean6 = Ebean.find(EBasicVer.class).where().eq("id", bean.getId()).findOne(); - assertNull("Bean where id eq is not found " + bean6, bean6); + assertNull(bean6); awaitL2Cache(); EBasicVer bean7 = Ebean.find(EBasicVer.class, bean.getId()); - assertNull("Bean is not expected to be found? " + bean7, bean7); - + assertNull(bean7); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java index 60b6e6e03..b24a87dda 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -10,12 +10,12 @@ import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebeaninternal.api.SpiTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestExecuteComplete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index de123a74d..979794ced 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.BBookmark; import org.tests.model.basic.BBookmarkUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNested.java b/ebean-core/src/test/java/org/tests/transaction/TestNested.java index d2ba0423b..5fb05152b 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNested.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; import java.util.concurrent.Callable; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index ba8c3ecae..87487c305 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 55aa39bc0..89a50aca0 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 8666fcffd..5232b3e3a 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index f597ec347..4a44cecf5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java index de3184595..b290e8938 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index 313019b5f..ca0da6828 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -8,12 +8,12 @@ import io.ebean.Transaction; import io.ebean.TxScope; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestNestedSubTransaction extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java index 57d61c82d..f52639c6f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java @@ -3,8 +3,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasic; @@ -17,7 +17,7 @@ public class TestNestedTransaction extends BaseTestCase { private EBasic bean; - @Before + @BeforeEach public void init() { bean = new EBasic("new"); Ebean.save(bean); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java index 21a39af21..53b774231 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -9,11 +9,12 @@ import io.ebeaninternal.api.SpiTransaction; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestPersistContextClear extends BaseTestCase { @Test @@ -30,24 +31,23 @@ public class TestPersistContextClear extends BaseTestCase { PersistenceContext pc = spiTxn.getPersistenceContext(); // no orders or customers in the PC - Assert.assertEquals(0, pc.size(Order.class)); - Assert.assertEquals(0, pc.size(Customer.class)); - + assertEquals(0, pc.size(Order.class)); + assertEquals(0, pc.size(Customer.class)); EbeanServer server = Ebean.getServer(null); List list = server.find(Order.class).fetch("customer").fetch("details").findList(); int orderSize = list.size(); - Assert.assertTrue(orderSize > 1); + assertTrue(orderSize > 1); // keep a hold of one of them order0 = list.get(0); - Assert.assertEquals(orderSize, pc.size(Order.class)); + assertEquals(orderSize, pc.size(Order.class)); System.gc(); - Assert.assertEquals(orderSize, pc.size(Order.class)); - Assert.assertTrue(pc.size(Customer.class) > 0); + assertEquals(orderSize, pc.size(Order.class)); + assertTrue(pc.size(Customer.class) > 0); list = null; // System.gc(); @@ -55,8 +55,8 @@ public class TestPersistContextClear extends BaseTestCase { // transaction still holds PC ... // System.out.println("pc2:"+pc); // These asserts may not succeed depending on JVM - // Assert.assertEquals(pc.size(Order.class), 1); - // Assert.assertEquals(pc.size(Customer.class), 1); + // assertEquals(pc.size(Order.class), 1); + // assertEquals(pc.size(Customer.class), 1); } finally { t.end(); @@ -65,13 +65,13 @@ public class TestPersistContextClear extends BaseTestCase { System.gc(); // we still have the order - Assert.assertNotNull(order0); + assertNotNull(order0); // its likely the only one in the PC now // due to the System.gc(); but can't garuntee it // so removing these asserts... can put them back // to manually test. - // Assert.assertEquals(pc.size(Order.class), 1); - // Assert.assertEquals(pc.size(Customer.class), 1); + // assertEquals(pc.size(Order.class), 1); + // assertEquals(pc.size(Customer.class), 1); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java index 5a159b333..9b2ea86ad 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.sql.Connection; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java index 019193413..d75ed5dc2 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; /** diff --git a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index bb2222038..3d7629dc8 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -3,10 +3,10 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestStatelessUpdateClearPC extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java index d926b8067..9481eb10f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestTransactionCallback extends BaseTestCase { @@ -69,14 +70,14 @@ public class TestTransactionCallback extends BaseTestCase { assertEquals(1, countPostRollback); } - @Test(expected = PersistenceException.class) + @Test public void test_noActiveTransaction() { - DB.register(new MyCallback()); + assertThrows(PersistenceException.class, () -> DB.register(new MyCallback())); } - @Test(expected = PersistenceException.class) + @Test public void test_noActiveTransaction_withDatabase() { - DB.getDefault().register(new MyCallback()); + assertThrows(PersistenceException.class, () -> DB.getDefault().register(new MyCallback())); } class MyCallback extends TransactionCallbackAdapter { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java index 787fb7653..305a878b5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java @@ -3,12 +3,12 @@ package org.tests.transaction; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestTransactionRollbackOnly { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index d02424c9d..3f2483138 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -5,7 +5,7 @@ import io.ebean.CacheMode; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java index f53640dfd..179c099cb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.draftable.Document; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java index e62aaae19..e633c216c 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -5,12 +5,14 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestTransactionalNever extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestTransactionalNever.class); @@ -23,9 +25,9 @@ public class TestTransactionalNever extends BaseTestCase { new SomeTransactionalWithNever().doStuff(); } - @Test(expected = PersistenceException.class) + @Test public void testBarfOnExisting() { - doWithTransaction(); + assertThrows(PersistenceException.class, this::doWithTransaction); } class SomeTransactionalWithNever { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index a13e73022..a5053881e 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -5,13 +5,13 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalNotSupports extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java index 28e0be699..2c8156ccb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java index be62f7d66..920db0b69 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -5,13 +5,13 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalRequired extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 7e0415575..cfdbeda77 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -7,17 +7,17 @@ import io.ebean.Transaction; import io.ebean.TxScope; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.Connection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalRequiresNew extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java index a67812243..1fa65483b 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java @@ -5,14 +5,14 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestTransactionalSupports extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java index 057f76ada..0cbbba720 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.DB; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasicVer; diff --git a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index eb693ca48..738f01f75 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.Ebean; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,8 +12,9 @@ import javax.persistence.PersistenceException; import javax.persistence.Table; import java.util.List; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * It shows the issue that the user record does NOT rolback when there is an exception thrown @@ -31,7 +32,7 @@ public class TransactionNotTerminatedAfterRollback { } List users = Ebean.find(User.class).findList(); LOG.debug("users: {}", users); - assertTrue("users should be empty", users.isEmpty()); + assertThat(users).isEmpty(); } @Transactional(rollbackFor = PersistenceException.class) diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 8a870f8ab..8251fa024 100644 --- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -5,7 +5,7 @@ import io.ebean.annotation.*; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; diff --git a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java index 3f510b4b3..a75b286b3 100644 --- a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java +++ b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java @@ -2,7 +2,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/ebean-core/src/test/java/org/tests/types/TestFileType.java b/ebean-core/src/test/java/org/tests/types/TestFileType.java index 85d3d2173..8988c00bd 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileType.java @@ -3,7 +3,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomeFileBean; import java.io.File; @@ -11,10 +11,10 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URL; -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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFileType extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 365c4ae91..53289d93b 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.types.SomeFileBean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestFileTypeFetching extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestHstore.java b/ebean-core/src/test/java/org/tests/types/TestHstore.java index 946f256f4..3dd2da5f7 100644 --- a/ebean-core/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-core/src/test/java/org/tests/types/TestHstore.java @@ -7,12 +7,12 @@ import io.ebean.annotation.Platform; import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestHstore extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java index b55a37d0e..bc9e6bba6 100644 --- a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomeNewTypesBean; import java.io.File; @@ -26,9 +26,9 @@ import java.time.ZonedDateTime; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestNewTypes extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java index 7d7dc995a..5b4b4b2df 100644 --- a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java +++ b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java @@ -2,7 +2,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomePeriodBean; import java.sql.Date; @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.time.MonthDay; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestPeriodType extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java index 244678cfd..1afe4dd76 100644 --- a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -4,11 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestUniDirectional extends BaseTestCase { @Test @@ -22,13 +24,13 @@ public class TestUniDirectional extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(m.getId()); - Assert.assertNotNull(m.getVersion()); + assertNotNull(m.getId()); + assertNotNull(m.getVersion()); List details = m.getDetails(); for (UTDetail utDetail : details) { - Assert.assertNotNull(utDetail.getId()); - Assert.assertNotNull(utDetail.getVersion()); + assertNotNull(utDetail.getId()); + assertNotNull(utDetail.getVersion()); } UTDetail d4 = new UTDetail("d14", 2, 3.0); @@ -36,15 +38,15 @@ public class TestUniDirectional extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(d4.getId()); + assertNotNull(d4.getId()); Integer d4ver = d4.getVersion(); - Assert.assertNotNull(d4ver); + assertNotNull(d4ver); d4.setName("d14Upd"); Ebean.save(d4); Integer d4ver2 = d4.getVersion(); - Assert.assertNotNull(d4ver2); - Assert.assertEquals((d4ver + 1), d4ver2.intValue()); + assertNotNull(d4ver2); + assertEquals((d4ver + 1), d4ver2.intValue()); Ebean.delete(d4); } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java index ae0c42370..b1a281eaf 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java @@ -1,14 +1,12 @@ package org.tests.unitinternal; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestBasics { - private String parentPath(String path) { - int pos = path.lastIndexOf('.'); if (pos == -1) { return null; @@ -19,10 +17,8 @@ public class TestBasics { @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"))); - + assertTrue((parentPath("banana") == null)); + assertTrue((parentPath("banana.apple").equals("banana"))); + assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java index 95124fcad..a9a5af80e 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java @@ -1,9 +1,9 @@ package org.tests.unitinternal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.ebean.util.EncodeB64.enc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEncodeB64 { diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index b11b2626b..b85d21421 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -4,14 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestEqualsOnEnhanced extends BaseTestCase { @Test public void test() { - Customer c = new Customer(); if (c instanceof EntityBean) { Order o = new Order(); @@ -21,21 +22,21 @@ public class TestEqualsOnEnhanced extends BaseTestCase { o.setId(1); - Assert.assertFalse(c.equals(o)); - Assert.assertFalse(c.equals(null)); - Assert.assertTrue(c.equals(c)); + assertFalse(c.equals(o)); + assertFalse(c.equals(null)); + assertTrue(c.equals(c)); Customer c2 = new Customer(); c2.setId(1); - Assert.assertTrue(c.equals(c2)); + assertTrue(c.equals(c2)); Customer c3 = new Customer(); // c2.setId(1); - Assert.assertFalse(c.equals(c3)); + assertFalse(c.equals(c3)); Customer c4 = new Customer(); c4.setId(2); - Assert.assertFalse(c.equals(c4)); + assertFalse(c.equals(c4)); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java index 4db75771e..48df8f825 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java @@ -1,12 +1,13 @@ package org.tests.unitinternal; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class TestNamingConvention extends TestCase { +public class TestNamingConvention { /** * Test dummy method to allow rest to be commented out. */ + @Test public void testDummy() { } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 7e00c5978..ca2de36b3 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -5,33 +5,34 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection; import org.tests.model.basic.ENullCollection; import org.tests.model.basic.ENullCollectionDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestNullCollectionSet extends BaseTestCase { @Test public void test() { - ENullCollection c = new ENullCollection(); Ebean.save(c); ENullCollection c2 = Ebean.find(ENullCollection.class, c.getId()); - Assert.assertNotNull(c2); + assertNotNull(c2); List details = c2.getDetails(); - Assert.assertNotNull(details); + assertNotNull(details); - Assert.assertTrue("Is BeanCollection", details instanceof BeanCollection); + assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(!bc.isPopulated()); - Assert.assertNotNull(bc.getOwnerBean()); - Assert.assertNotNull(bc.getPropertyName()); + assertTrue(!bc.isPopulated()); + assertNotNull(bc.getOwnerBean()); + assertNotNull(bc.getPropertyName()); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 11136a786..d1e338894 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -2,14 +2,14 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.OrderBy; -import org.junit.Test; +import org.junit.jupiter.api.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.assertNotEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test the OrderBy object and especially its parsing. diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java b/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java index 439b68020..1bf1f45e2 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; import io.ebeaninternal.server.type.SimpleAesEncryptor; import org.tests.basic.encrypt.BasicEncryptKey; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.sql.Timestamp; @@ -25,7 +25,7 @@ public class TestSimpleEncryptor extends BaseTestCase { byte[] ecData = e.encrypt(data, key); byte[] deData = e.decrypt(ecData, key); - + assertThat(data).containsExactly(deData); Timestamp t = new Timestamp(System.currentTimeMillis()); @@ -33,7 +33,6 @@ public class TestSimpleEncryptor extends BaseTestCase { String tsFormat = e.decryptString(ecTimestamp, key); Timestamp t1 = Timestamp.valueOf(tsFormat); - Assert.assertEquals(t, t1); - + assertEquals(t, t1); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index 7be4ccc01..d598d1e03 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -6,13 +6,15 @@ import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.xtra.DummyDao; import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.persistence.OptimisticLockException; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; + public class TestTxTypeOnTransactional extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestTxTypeOnTransactional.class); @@ -47,11 +49,10 @@ public class TestTxTypeOnTransactional extends BaseTestCase { try { dao.doSomething(v); // never get here - Assert.assertTrue(false); + fail(); } catch (OptimisticLockException e) { Transaction inMethodTransaction = dao.getInMethodTransaction(); - boolean active = inMethodTransaction.isActive(); - Assert.assertFalse(active); + assertFalse(inMethodTransaction.isActive()); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index e445ef954..18991a4b6 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection; import org.tests.model.basic.EVanillaCollection; import org.tests.model.basic.EVanillaCollectionDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestVanillaCollectionSet extends BaseTestCase { @Test @@ -21,17 +23,17 @@ public class TestVanillaCollectionSet extends BaseTestCase { EVanillaCollection c2 = Ebean.find(EVanillaCollection.class, c.getId()); - Assert.assertNotNull(c2); + assertNotNull(c2); List details = c2.getDetails(); - Assert.assertNotNull(details); + assertNotNull(details); - Assert.assertTrue("Is BeanCollection", details instanceof BeanCollection); + assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(!bc.isPopulated()); - Assert.assertNotNull(bc.getOwnerBean()); - Assert.assertNotNull(bc.getPropertyName()); + assertTrue(!bc.isPopulated()); + assertNotNull(bc.getOwnerBean()); + assertNotNull(bc.getPropertyName()); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 97528f820..7f2dbd91a 100644 --- a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index f05b74f6d..d4b38366c 100644 --- a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -6,11 +6,12 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonStatelessUpdate extends BaseTestCase { @Test @@ -40,9 +41,9 @@ public class TestJsonStatelessUpdate extends BaseTestCase { UUTwo two2 = jsonContext.toBean(UUTwo.class, jsonString); - Assert.assertEquals(twoX.getId(), two2.getId()); - Assert.assertEquals("twoNameModified", two2.getName()); - Assert.assertEquals("oneNameModified", two2.getMaster().getName()); + assertEquals(twoX.getId(), two2.getId()); + assertEquals("twoNameModified", two2.getName()); + 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 @@ -54,8 +55,8 @@ public class TestJsonStatelessUpdate extends BaseTestCase { // confirm the properties where updated as expected UUTwo twoConfirm = Ebean.find(UUTwo.class, two.getId()); - Assert.assertEquals("twoNameModified", twoConfirm.getName()); - Assert.assertEquals("oneNameModified", twoConfirm.getMaster().getName()); + assertEquals("twoNameModified", twoConfirm.getName()); + assertEquals("oneNameModified", twoConfirm.getMaster().getName()); } diff --git a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java index f3da6422f..ef8f618df 100644 --- a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -3,11 +3,13 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestMarkAsDirty extends BaseTestCase { @Test @@ -17,7 +19,7 @@ public class TestMarkAsDirty extends BaseTestCase { Ebean.save(bean); Timestamp lastUpdate = bean.getLastUpdate(); - Assert.assertNotNull(lastUpdate); + assertNotNull(lastUpdate); Thread.sleep(100); @@ -26,8 +28,8 @@ public class TestMarkAsDirty extends BaseTestCase { Ebean.save(bean); Timestamp lastUpdate2 = bean.getLastUpdate(); - Assert.assertNotNull(lastUpdate2); - Assert.assertNotEquals(lastUpdate, lastUpdate2); + assertNotNull(lastUpdate2); + assertNotEquals(lastUpdate, lastUpdate2); } diff --git a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java index e8559bb0d..371336e36 100644 --- a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java +++ b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -1,15 +1,12 @@ package org.tests.update; import io.ebean.BaseTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPostgresTruncate extends BaseTestCase { @Test public void test() { - - Assert.assertTrue(true); // EbeanServer server = Ebean.getServer(null); // // EBasic e = new EBasic(); diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java index 1cc735fa0..cd06f3711 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Testclass that ensures the correct behaviour of SqlUpdate in combination with batching. diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index b81597eab..94dd7a2dc 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -5,13 +5,13 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSqlUpdateBindMultipleLists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index 8253f7c87..dfc78d1f3 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -5,11 +5,12 @@ import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestSqlUpdateExceptions extends BaseTestCase { @@ -32,9 +33,8 @@ public class TestSqlUpdateExceptions extends BaseTestCase { assertThat(foundId).isEqualTo(id); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey() { - UUID id = UUID.randomUUID(); SqlUpdate sqlUpdate = DB.sqlUpdate(sql); @@ -46,12 +46,11 @@ public class TestSqlUpdateExceptions extends BaseTestCase { sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "fail"); sqlUpdate.setParameter(3, 1); - sqlUpdate.execute(); + assertThrows(DuplicateKeyException.class, sqlUpdate::execute); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_executeNow() { - UUID id = UUID.randomUUID(); SqlUpdate sqlUpdate = DB.sqlUpdate(sql); @@ -63,51 +62,50 @@ public class TestSqlUpdateExceptions extends BaseTestCase { sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "fail"); sqlUpdate.setParameter(3, 1); - sqlUpdate.executeNow(); + assertThrows(DuplicateKeyException.class, sqlUpdate::executeNow); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_inBatch() { - UUID id = UUID.randomUUID(); + assertThrows(DuplicateKeyException.class, () -> { + try (Transaction transaction = DB.beginTransaction()) { - try (Transaction transaction = DB.beginTransaction()) { + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "hi in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - SqlUpdate sqlUpdate = DB.sqlUpdate(sql); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "hi in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "fail in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "fail in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - transaction.commit(); - } + transaction.commit(); + } + }); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_executeBatch() { - UUID id = UUID.randomUUID(); + assertThrows(DuplicateKeyException.class, () -> { + try (Transaction transaction = DB.beginTransaction()) { + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "hi in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - try (Transaction transaction = DB.beginTransaction()) { + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "fail in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - SqlUpdate sqlUpdate = DB.sqlUpdate(sql); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "hi in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "fail in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - sqlUpdate.executeBatch(); - transaction.commit(); - } + sqlUpdate.executeBatch(); + transaction.commit(); + } + }); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index c539beda8..f343e4ab0 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -6,13 +6,13 @@ import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.meta.MetaTimedMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSqlUpdateInTxn extends BaseTestCase { @@ -143,7 +143,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Ebean.save(log); AuditLog log2 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo", log2.getDescription()); + assertEquals("foo", log2.getDescription()); final Long id = log2.getId(); final String updateDml = "update audit_log set description = :desc where id = :id"; @@ -159,8 +159,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { updateMod.execute(); AuditLog log3 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo2", log3.getDescription()); - Assert.assertEquals("mod0", log3.getModifiedDescription()); + assertEquals("foo2", log3.getDescription()); + assertEquals("mod0", log3.getModifiedDescription()); Ebean.execute(() -> { SqlUpdate update = Ebean.createSqlUpdate(updateDml); @@ -174,8 +174,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { }); AuditLog log4 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo3", log4.getDescription()); - Assert.assertEquals("mod1", log4.getModifiedDescription()); + assertEquals("foo3", log4.getDescription()); + assertEquals("mod1", log4.getModifiedDescription()); Ebean.beginTransaction(); @@ -194,8 +194,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Ebean.endTransaction(); } AuditLog log5 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo4", log5.getDescription()); - Assert.assertEquals("mod2", log5.getModifiedDescription()); + assertEquals("foo4", log5.getDescription()); + assertEquals("mod2", log5.getModifiedDescription()); } diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index 36b7c195b..ee7f10283 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.SqlUpdate; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java index 02f17ffe5..2104b8c03 100644 --- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,9 +1,10 @@ package org.tests.update; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.TransactionalTestCase; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -17,11 +18,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.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestStatelessUpdate extends TransactionalTestCase { @@ -79,20 +76,18 @@ public class TestStatelessUpdate extends TransactionalTestCase { assertThat(sql.get(0)).contains("update e_basic set name=?, description=? where id=?; -- bind(updateWithNull,null,"); } - @Test(expected = EntityNotFoundException.class) + @Test public void update_NoRowsUpdated_expect_EntityNotFoundException() { - EBasic basic = new EBasic(); basic.setId(999999999); basic.setName("something"); basic.setStatus(Status.ACTIVE); - DB.update(basic); + assertThrows(EntityNotFoundException.class, () -> DB.update(basic)); } @Test public void delete_NoRowsDeleted_expect_false() { - EBasic basic = new EBasic(); basic.setId(999999999); basic.setName("something"); @@ -189,7 +184,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { // assert null list was ignored (missing children not deleted) assertNotNull(result.getContacts()); - assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); + assertFalse(result.getContacts().isEmpty()); assertThat(sql).hasSize(1); assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;"); } @@ -231,14 +226,13 @@ public class TestStatelessUpdate extends TransactionalTestCase { // assert empty bean list was ignore (missing children not deleted) assertNotNull(result.getContacts()); - assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); + assertFalse(result.getContacts().isEmpty()); assertThat(sql).hasSize(1); assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;"); } @Test public void testStatelessUpdateDeleteChildrenForNonBeanCollection() { - // arrange Contact contact = new Contact(); contact.setFirstName("wobu :P"); diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 38c33c206..9939fe905 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -5,14 +5,14 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestUpdateAllLoadedProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java index b32046435..7727d1a86 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java @@ -2,15 +2,15 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.update.objects.Child; import org.tests.update.objects.Parent; import org.tests.update.objects.SiblingA; import org.tests.update.objects.SiblingB; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestUpdateCircularSave extends BaseTestCase { @@ -44,7 +44,7 @@ public class TestUpdateCircularSave extends BaseTestCase { return siblingA.getId(); } - @Ignore + @Disabled @Test public void testFetchChildModifyChildSaveParent() { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java index ac1085896..6c723d576 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestUpdatePartial extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index 181b0ede0..af80300d4 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestUpdatePartialNoVer extends BaseTestCase { From d017b2ef39f7058ad1289744bf03591e922f5c83 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 15:08:28 +1200 Subject: [PATCH 062/102] MySQL Ignore tests that use Hash/Source JSON dirty detection MySQL JSON type will not preserve ordering of keys. No way to return a consistent JSON result with this type hence Hash/Source do not work --- .../java/org/tests/json/TestDbJson_Jackson3.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 66dd79cf6..e68d29cde 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -4,6 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.ValuePair; +import io.ebean.annotation.IgnorePlatform; +import io.ebean.annotation.Platform; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import io.ebeantest.LoggedSql; @@ -43,9 +45,10 @@ public class TestDbJson_Jackson3 extends BaseTestCase { return true; } } + + @IgnorePlatform(Platform.MYSQL) @Test public void updateIncludesJsonColumn_when_explicit_isMarkedDirty() { - PlainBeanDirtyAware contentBean = new PlainBeanDirtyAware("a", 42); EBasicJsonJackson3 bean = new EBasicJsonJackson3(); @@ -78,7 +81,6 @@ public class TestDbJson_Jackson3 extends BaseTestCase { @Test public void updateIncludesJsonColumn_when_loadedAndNotDirtyAware() { - PlainBean contentBean = new PlainBean("a", 42); EBasicJsonList bean = new EBasicJsonList(); bean.setName("p1"); @@ -101,10 +103,9 @@ public class TestDbJson_Jackson3 extends BaseTestCase { pair = state.getDirtyValues().get("beanList"); assertThat(pair.getNewValue()).isEqualTo(null); - assertThat((List)pair.getOldValue()).hasSize(1) + assertThat((List) pair.getOldValue()).hasSize(1) .extracting(PlainBean::getName).containsExactly("a"); - LoggedSql.start(); DB.save(found); @@ -113,7 +114,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { assertThat(EBasicJsonListPersistController.updatedValues.entrySet()) .extracting(Map.Entry::toString) - .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1"); + .containsExactlyInAnyOrder("beanList=null,[name:a]", "name=p1-mod,p1", "version=2,1"); assertThat(DB.beanState(found).isDirty()).isFalse(); @@ -142,7 +143,6 @@ public class TestDbJson_Jackson3 extends BaseTestCase { @Test public void updateIncludesJsonColumn_when_list_loadedAndNotDirtyAware() { - PlainBean contentBean = new PlainBean("a", 42); EBasicJsonList bean = new EBasicJsonList(); bean.setName("p1"); @@ -157,6 +157,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); } + @IgnorePlatform(Platform.MYSQL) @Test public void update_with_differentDbJsonSettings() { PlainBeanDirtyAware contentBean1 = new PlainBeanDirtyAware("x", 42); @@ -225,7 +226,6 @@ public class TestDbJson_Jackson3 extends BaseTestCase { @Test public void push_pop_test() { - EBasicJsonMulti bean = new EBasicJsonMulti(); bean.setPlainValue2(new PlainBeanDirtyAware("x", 42)); bean.save(); From aab2dff49cae19329613aca57518e3dcc6cc39f8 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 16:04:07 +1200 Subject: [PATCH 063/102] MySQL Ignore tests that use Hash/Source JSON dirty detection MySQL JSON type will not preserve ordering of keys. No way to return a consistent JSON result with this type hence Hash/Source do not work --- .../src/test/java/org/tests/json/TestDbJson_Jackson3.java | 2 ++ .../src/test/java/org/tests/json/TestDbJson_List.java | 7 +++---- .../java/org/tests/model/json/TestJacksonPlainBean.java | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index e68d29cde..bfe594afa 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -79,6 +79,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { assertThat(found2.getPlainValue().getName()).isEqualTo("b"); } + @IgnorePlatform(Platform.MYSQL) @Test public void updateIncludesJsonColumn_when_loadedAndNotDirtyAware() { PlainBean contentBean = new PlainBean("a", 42); @@ -141,6 +142,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { LoggedSql.stop(); } + @IgnorePlatform(Platform.MYSQL) @Test public void updateIncludesJsonColumn_when_list_loadedAndNotDirtyAware() { PlainBean contentBean = new PlainBean("a", 42); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index f7d4650ab..30499053e 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -31,12 +31,9 @@ public class TestDbJson_List extends BaseTestCase { @Test public void insert() { - bean.setName("stuff"); - bean.getTags().add("one"); bean.getTags().add("two"); - bean.getFlags().add(42L); bean.getFlags().add(43L); bean.getFlags().add(44L); @@ -114,7 +111,9 @@ public class TestDbJson_List extends BaseTestCase { // we don't update the phone numbers (as they are not dirty) // plain_bean=?, no longer included with dirty detection - assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where"); + if (!isMySql()) { + assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where"); + } } private void update_when_dirty() { diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index 164bbe1b9..c9241ab47 100644 --- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -29,8 +29,9 @@ public class TestJacksonPlainBean extends BaseTestCase { final EBasicPlain found = DB.find(EBasicPlain.class, bean.getId()); found.setAttr("n2"); DB.save(found); - expectedSql(1, "update ebasic_plain set attr=?, version=? where id=? and version=?"); - + if (!isMySql()) { + expectedSql(1, "update ebasic_plain set attr=?, version=? where id=? and version=?"); + } LoggedSql.stop(); } From ddb63c1488238d0cda89d9338f7db97f912be268 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 16:30:39 +1200 Subject: [PATCH 064/102] Update tests for MariaDB --- .../query/cancel/SqlQueryCancelTest.java | 83 +++++++++++-------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index abf8f8d74..dfb1ab580 100644 --- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -2,6 +2,7 @@ package org.tests.query.cancel; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.sql.SQLException; import java.util.UUID; @@ -35,7 +36,7 @@ import io.ebean.annotation.Platform; * query.cancel(); * query.findList(); * - * + *

    * The query was caneled before executing. In this case we do hit the DB driver *
    *
    @@ -49,12 +50,12 @@ import io.ebean.annotation.Platform; * ...finding query.cancel(); * ...JDBC-Exception * - * + *

    * The test tries to simulate a slow query by installing the * {@link SlowDownEBasic} 'SELECT' trigger. The trigger can be configured to * wait 3 * timing ms and a second thread will cancel the query in * timing ms. - * + *

    * in this case, we expect a JDBC exception from the driver.
    *
    * NOTE:
    @@ -63,7 +64,6 @@ import io.ebean.annotation.Platform; * queries like findCount or findOne, because they only return one row. * * @author Roland Praml, FOCONIS AG - * */ public class SqlQueryCancelTest extends BaseTestCase { @@ -84,7 +84,8 @@ public class SqlQueryCancelTest extends BaseTestCase { public void cancelSqlQueryAtBegin() throws SQLException { doCancelSqlAtBegin(SqlQuery::findList); doCancelSqlAtBegin(SqlQuery::findOne); - doCancelSqlAtBegin(q -> q.findEach(e -> {})); + doCancelSqlAtBegin(q -> q.findEach(e -> { + })); doCancelSqlAtBegin(q -> q.findEachWhile(e -> true)); } @@ -95,7 +96,8 @@ public class SqlQueryCancelTest extends BaseTestCase { doCancelSqlDuringRun(SqlQuery::findList); // doCancelSqlDuringRun(q -> q.setMaxRows(1).findOne()); // findOne cannot be tested, as H2 does the cancel check every 128 rows only - doCancelSqlDuringRun(q -> q.findEach(e -> {})); + doCancelSqlDuringRun(q -> q.findEach(e -> { + })); doCancelSqlDuringRun(q -> q.findEachWhile(e -> true)); } @@ -117,9 +119,10 @@ public class SqlQueryCancelTest extends BaseTestCase { doCancelOrmAtBegin(q -> q.select("name").findSingleAttribute()); doCancelOrmAtBegin(q -> q.select("name").findSingleAttributeList()); doCancelOrmAtBegin(Query::findStream); - // testDuringRun(Query::findVersions); + // testDuringRun(Query::findVersions); // EBasic has no history support, but it should work if @History is added - doCancelOrmAtBegin(q -> q.findEach(e -> {})); + doCancelOrmAtBegin(q -> q.findEach(e -> { + })); doCancelOrmAtBegin(q -> q.findEachWhile(e -> true)); } @@ -142,9 +145,10 @@ public class SqlQueryCancelTest extends BaseTestCase { doCancelOrmDuringRun(q -> q.select("name").findSingleAttribute()); doCancelOrmDuringRun(q -> q.select("name").findSingleAttributeList()); doCancelOrmDuringRun(Query::findStream); - // testDuringRun(Query::findVersions); + // testDuringRun(Query::findVersions); // EBasic has no history support, but it should work if @History is added - doCancelOrmDuringRun(q -> q.findEach(e -> {})); + doCancelOrmDuringRun(q -> q.findEach(e -> { + })); doCancelOrmDuringRun(q -> q.findEachWhile(e -> true)); } @@ -160,7 +164,7 @@ public class SqlQueryCancelTest extends BaseTestCase { // We might have 100 entities in a buffer. So we must iterate through all. assertThatThrownBy(() -> { - while(iter.hasNext()) iter.next(); + while (iter.hasNext()) iter.next(); }) .isInstanceOf(PersistenceException.class) .hasMessageContaining("Query was cancelled"); @@ -173,7 +177,8 @@ public class SqlQueryCancelTest extends BaseTestCase { doCancelOrmDtoAtBegin(DtoQuery::findList); doCancelOrmDtoAtBegin(DtoQuery::findOne); doCancelOrmDtoAtBegin(DtoQuery::findStream); - doCancelOrmDtoAtBegin(q -> q.findEach(e -> {})); + doCancelOrmDtoAtBegin(q -> q.findEach(e -> { + })); doCancelOrmDtoAtBegin(q -> q.findEachWhile(e -> true)); } @@ -186,23 +191,27 @@ public class SqlQueryCancelTest extends BaseTestCase { // doCancelOrmDtoDuringRun(q -> q.setMaxRows(1).findOne()); // findOne cannot be tested, as H2 does the cancel check every 128 rows only doCancelOrmDtoDuringRun(DtoQuery::findStream); - doCancelOrmDtoDuringRun(q -> q.findEach(e -> {})); + doCancelOrmDtoDuringRun(q -> q.findEach(e -> { + })); doCancelOrmDtoDuringRun(q -> q.findEachWhile(e -> true)); } @Test - public void cancelOrmDtoDuringIterate() throws SQLException { - + public void cancelOrmDtoDuringIterate() { DtoQuery query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class); QueryIterator iter = query.findIterate(); assertThat(iter.hasNext()).isTrue(); query.cancel(); - assertThat(iter.next()).isNotNull(); + if (isMariaDB()) { + assertThrows(PersistenceException.class, iter::next); + } else { + assertThat(iter.next()).isNotNull(); + } // We might have 100 entities in a buffer. So we must iterate through all. assertThatThrownBy(() -> { - while(iter.hasNext()) iter.next(); + while (iter.hasNext()) iter.next(); }) .isInstanceOf(PersistenceException.class) .hasMessageContaining("Query was cancelled"); @@ -215,7 +224,8 @@ public class SqlQueryCancelTest extends BaseTestCase { doCancelSqlDtoAtBegin(DtoQuery::findList); doCancelSqlDtoAtBegin(DtoQuery::findOne); doCancelSqlDtoAtBegin(DtoQuery::findStream); - doCancelSqlDtoAtBegin(q -> q.findEach(e -> {})); + doCancelSqlDtoAtBegin(q -> q.findEach(e -> { + })); doCancelSqlDtoAtBegin(q -> q.findEachWhile(e -> true)); } @@ -228,7 +238,8 @@ public class SqlQueryCancelTest extends BaseTestCase { // doCancelSqlDtoDuringRun(q -> q.setMaxRows(1).findOne()); // findOne cannot be tested, as H2 does the cancel check every 128 rows only doCancelSqlDtoDuringRun(DtoQuery::findStream); - doCancelSqlDtoDuringRun(q -> q.findEach(e -> {})); + doCancelSqlDtoDuringRun(q -> q.findEach(e -> { + })); doCancelSqlDtoDuringRun(q -> q.findEachWhile(e -> true)); } @@ -244,7 +255,7 @@ public class SqlQueryCancelTest extends BaseTestCase { // We might have 100 entities in a buffer. So we must iterate through all. assertThatThrownBy(() -> { - while(iter.hasNext()) iter.next(); + while (iter.hasNext()) iter.next(); }) .isInstanceOf(PersistenceException.class) .hasMessageContaining("Query was cancelled"); @@ -254,8 +265,8 @@ public class SqlQueryCancelTest extends BaseTestCase { SqlQuery query = DB.sqlQuery("select * from e_basic"); query.cancel(); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasMessageContaining("Query was cancelled"); + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Query was cancelled"); } private void doCancelSqlDuringRun(Consumer test) throws SQLException { @@ -264,16 +275,16 @@ public class SqlQueryCancelTest extends BaseTestCase { SqlQuery query = DB.sqlQuery("select * from e_basic"); executeDelayed(query::cancel); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); + .isInstanceOf(PersistenceException.class) + .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); } private void doCancelOrmAtBegin(Consumer> test) throws SQLException { Query query = DB.find(EBasic.class); query.cancel(); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasMessageContaining("Query was cancelled"); + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Query was cancelled"); } private void doCancelOrmDuringRun(Consumer> test) throws SQLException { @@ -284,8 +295,8 @@ public class SqlQueryCancelTest extends BaseTestCase { Query query = DB.find(EBasic.class); executeDelayed(query::cancel); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); + .isInstanceOf(PersistenceException.class) + .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); } private void doCancelOrmFutureDuringRun(Function, Future> test) throws SQLException, InterruptedException, ExecutionException { @@ -309,8 +320,8 @@ public class SqlQueryCancelTest extends BaseTestCase { DtoQuery query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class); query.cancel(); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasMessageContaining("Query was cancelled"); + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Query was cancelled"); } private void doCancelOrmDtoDuringRun(Consumer> test) throws SQLException { @@ -320,16 +331,16 @@ public class SqlQueryCancelTest extends BaseTestCase { DtoQuery query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class); executeDelayed(query::cancel); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); + .isInstanceOf(PersistenceException.class) + .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); } private void doCancelSqlDtoAtBegin(Consumer> test) throws SQLException { DtoQuery query = DB.findDto(EBasicDto.class, "select id, status from e_basic"); query.cancel(); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasMessageContaining("Query was cancelled"); + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Query was cancelled"); } private void doCancelSqlDtoDuringRun(Consumer> test) throws SQLException { @@ -339,8 +350,8 @@ public class SqlQueryCancelTest extends BaseTestCase { DtoQuery query = DB.findDto(EBasicDto.class, "select id, status from e_basic"); executeDelayed(query::cancel); assertThatThrownBy(() -> test.accept(query)) - .isInstanceOf(PersistenceException.class) - .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); + .isInstanceOf(PersistenceException.class) + .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class); } private void executeDelayed(Runnable r) throws SQLException { From 4ff8df9538e6c6990e68f8e28d9d51f256c334f2 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 17:33:06 +1200 Subject: [PATCH 065/102] Tidy tests for ServerConfig -> DatabaseConfig --- ...nServerFactory_ServerConfigStart_Test.java | 2 +- .../config/ServerConfigSqlServerTest.java | 3 +- .../dbplatform/DatabasePlatformTest.java | 25 +++++----- .../server/cache/DefaultCacheHolderTest.java | 35 ++++++------- ...faultCacheHolder_getCacheOptions_Test.java | 8 +-- .../cache/DefaultServerCacheManagerTest.java | 14 +++--- .../server/core/InitDataSourceTest.java | 26 +++++----- .../deploy/parse/AnnotationClassTest.java | 12 ++--- .../server/text/json/DJsonScalarTest.java | 6 +-- .../server/type/TestTypeManager.java | 24 +++++---- .../java/org/tests/basic/MainDbBoolean.java | 49 +++++++------------ .../org/tests/unitinternal/HelloMain.java | 12 ++--- 12 files changed, 95 insertions(+), 121 deletions(-) diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java index 4e54932fa..3946de7dd 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java @@ -36,7 +36,7 @@ public class EbeanServerFactory_ServerConfigStart_Test { assertThat(db).isNotNull(); - // test server shutdown and restart using the same ServerConfig + // test server shutdown and restart using the same DatabaseConfig db.shutdown(true, false); Database restartedServer = DatabaseFactory.create(config); diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java index 0d8644d5d..4f3449df4 100644 --- a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java +++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java @@ -42,7 +42,7 @@ public class ServerConfigSqlServerTest { assertThat(sqlServer).isNotNull(); sqlServer.shutdown(); -// javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via ServerConfig.setDatabasePlatformName. Refer to issue #1340 for details +// javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details // // at io.ebeaninternal.server.core.DatabasePlatformFactory.create(DatabasePlatformFactory.java:62) // at io.ebeaninternal.server.core.DefaultContainer.setDatabasePlatform(DefaultContainer.java:266) @@ -50,7 +50,6 @@ public class ServerConfigSqlServerTest { // at io.ebeaninternal.server.core.DefaultContainer.createServer(DefaultContainer.java:45) // at io.ebean.EbeanServerFactory.createInternal(EbeanServerFactory.java:109) // at io.ebean.EbeanServerFactory.create(EbeanServerFactory.java:70) -// at io.ebean.config.ServerConfigSqlServerTest.need_explicitPlatform(ServerConfigSqlServerTest.java:35) } diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index b6cb188f4..5569064ba 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; import io.ebean.config.MatchingNamingConvention; import io.ebean.config.PlatformConfig; -import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; @@ -55,33 +55,32 @@ public class DatabasePlatformTest extends BaseTestCase { @Test public void convertQuotedIdentifiers_when_allQuotedIdentifier_sqlServer() { - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); config.setAllQuotedIdentifiers(true); config.setNamingConvention(new MatchingNamingConvention()); DatabasePlatform dbPlatform = new SqlServer17Platform(); dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers()); - assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"[order]"); - assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"),"[order]"); - assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"),"[firstName]"); + assertEquals(dbPlatform.convertQuotedIdentifiers("order"), "[order]"); + assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"), "[order]"); + assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"), "[firstName]"); } @Test public void convertQuotedIdentifiers() { - - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); DatabasePlatform dbPlatform = new SqlServer17Platform(); dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers()); - assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"order"); - assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"),"[order]"); - assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"),"firstName"); + assertEquals(dbPlatform.convertQuotedIdentifiers("order"), "order"); + assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"), "[order]"); + assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"), "firstName"); - assertEquals(dbPlatform.unQuote("order"),"order"); - assertEquals(dbPlatform.unQuote("[order]"),"order"); - assertEquals(dbPlatform.unQuote("[firstName]"),"firstName"); + assertEquals(dbPlatform.unQuote("order"), "order"); + assertEquals(dbPlatform.unQuote("[order]"), "order"); + assertEquals(dbPlatform.unQuote("[firstName]"), "firstName"); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java index 6b8580824..3a61f60ee 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.cache; import io.ebean.cache.ServerCacheFactory; import io.ebean.cache.ServerCacheOptions; import io.ebean.cache.ServerCacheType; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebeaninternal.server.transaction.TableModState; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; @@ -14,13 +14,13 @@ import static org.assertj.core.api.Assertions.assertThat; public class DefaultCacheHolderTest { - private ThreadLocal tenantId = new ThreadLocal<>(); + private final ThreadLocal tenantId = new ThreadLocal<>(); private final ServerCacheFactory cacheFactory = new DefaultServerCacheFactory(); private final ServerCacheOptions defaultOptions = new ServerCacheOptions(); private CacheManagerOptions options() { - return new CacheManagerOptions(null, new ServerConfig(), true) + return new CacheManagerOptions(null, new DatabaseConfig(), true) .with(defaultOptions, defaultOptions) .with(cacheFactory, new TableModState()); } @@ -82,25 +82,22 @@ public class DefaultCacheHolderTest { assertThat(cache.get("1")).isEqualTo("value-for-tenant1"); assertThat(cache.get("2")).isEqualTo("an other value-for-tenant1"); - Exception exInThread[] = new Exception[1]; - Thread t = new Thread() { - @Override - public void run() { - try { - assertThat(cache.get("1")).isNull(); - tenantId.set("ten_2"); + Exception[] exInThread = new Exception[1]; + Thread t = new Thread(() -> { + try { + assertThat(cache.get("1")).isNull(); + tenantId.set("ten_2"); - cache.put("1", "value-for-tenant2"); - cache.put("2", "an other value-for-tenant2"); + cache.put("1", "value-for-tenant2"); + cache.put("2", "an other value-for-tenant2"); - tenantId.set(null); + tenantId.set(null); - cache.clear(); - } catch (Exception e) { - exInThread[0] = e; - } - }; - }; + cache.clear(); + } catch (Exception e) { + exInThread[0] = e; + } + }); // do some async work t.start(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java index 056e6f79e..f67eef6e8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java @@ -2,17 +2,17 @@ package io.ebeaninternal.server.cache; import io.ebean.cache.ServerCacheOptions; import io.ebean.cache.ServerCacheType; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Order; import org.tests.model.basic.Product; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultCacheHolder_getCacheOptions_Test { - private DefaultCacheHolder cacheHolder; + private final DefaultCacheHolder cacheHolder; public DefaultCacheHolder_getCacheOptions_Test() { @@ -20,7 +20,7 @@ public class DefaultCacheHolder_getCacheOptions_Test { defaultOptions.setMaxSize(10000); defaultOptions.setMaxSecsToLive(120); - CacheManagerOptions builder = new CacheManagerOptions(null, new ServerConfig(), true) + CacheManagerOptions builder = new CacheManagerOptions(null, new DatabaseConfig(), true) .with(defaultOptions, defaultOptions); this.cacheHolder = new DefaultCacheHolder(builder); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java index d1639508c..b689d9e50 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.cache; import io.ebean.config.ContainerConfig; import io.ebean.config.CurrentTenantProvider; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebeaninternal.server.cluster.ClusterManager; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultServerCacheManagerTest { - private ThreadLocal tenantId = new ThreadLocal<>(); + private final ThreadLocal tenantId = new ThreadLocal<>(); class TdTenPro implements CurrentTenantProvider { @@ -23,17 +23,15 @@ public class DefaultServerCacheManagerTest { } } - private ClusterManager clusterManager = new ClusterManager(new ContainerConfig()); + private final ClusterManager clusterManager = new ClusterManager(new ContainerConfig()); - private DefaultServerCacheManager manager = new DefaultServerCacheManager(new CacheManagerOptions(clusterManager, new ServerConfig(), true)); + private final DefaultServerCacheManager manager = new DefaultServerCacheManager(new CacheManagerOptions(clusterManager, new DatabaseConfig(), true)); - private DefaultServerCacheManager multiTenantManager; + private final DefaultServerCacheManager multiTenantManager; public DefaultServerCacheManagerTest(){ - - CacheManagerOptions builder = new CacheManagerOptions(clusterManager, new ServerConfig(), true); + CacheManagerOptions builder = new CacheManagerOptions(clusterManager, new DatabaseConfig(), true); builder.with(new TdTenPro()); - this.multiTenantManager = new DefaultServerCacheManager(builder); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java index a6027c182..584a943be 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.datasource.DataSourceConfig; import org.junit.jupiter.api.Test; @@ -8,8 +8,8 @@ import static org.junit.jupiter.api.Assertions.*; public class InitDataSourceTest { - private ServerConfig newConfig(String readOnlyUrl) { - ServerConfig config = new ServerConfig(); + private DatabaseConfig newConfig(String readOnlyUrl) { + DatabaseConfig config = new DatabaseConfig(); DataSourceConfig roConfig = new DataSourceConfig(); roConfig.setUrl(readOnlyUrl); config.setReadOnlyDataSourceConfig(roConfig); @@ -18,13 +18,13 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_nullByDefault() { - InitDataSource init = new InitDataSource(new ServerConfig()); + InitDataSource init = new InitDataSource(new DatabaseConfig()); assertNull(init.readOnlyConfig()); } @Test public void readOnlyConfig_null_whenSetNullExplicitly() { - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); config.setReadOnlyDataSourceConfig(null); assertNull(new InitDataSource(config).readOnlyConfig()); @@ -46,7 +46,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_autoReadOnlyDataSource() { - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); config.setAutoReadOnlyDataSource(true); assertNotNull(new InitDataSource(config).readOnlyConfig()); @@ -54,7 +54,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_autoReadOnlyDataSource_expect_setToNull() { - ServerConfig config = newConfig("none"); + DatabaseConfig config = newConfig("none"); config.setAutoReadOnlyDataSource(true); final DataSourceConfig readOnlyConfig = new InitDataSource(config).readOnlyConfig(); @@ -63,7 +63,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_urlSet() { - ServerConfig config = newConfig("foo"); + DatabaseConfig config = newConfig("foo"); final DataSourceConfig roConfig = new InitDataSource(config).readOnlyConfig(); assertNotNull(roConfig); @@ -72,7 +72,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_readOnlyUrlSetOnMain() { - ServerConfig config = newConfig(null); + DatabaseConfig config = newConfig(null); // alternate location to set read-only url for developer convenience config.getDataSourceConfig().setReadOnlyUrl("bar"); @@ -83,7 +83,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_readOnlyUrlSetOnMain_withNone() { - ServerConfig config = newConfig("None"); + DatabaseConfig config = newConfig("None"); // alternate location to set read-only url for developer convenience config.getDataSourceConfig().setReadOnlyUrl("bar"); @@ -94,7 +94,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_bothReadOnlyUrlsSet() { - ServerConfig config = newConfig("one"); + DatabaseConfig config = newConfig("one"); config.getDataSourceConfig().setReadOnlyUrl("two"); final DataSourceConfig roConfig = new InitDataSource(config).readOnlyConfig(); @@ -104,7 +104,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_readOnlyUrlSetOnMain_withNoneNone() { - ServerConfig config = newConfig("none"); + DatabaseConfig config = newConfig("none"); // alternate location to set read-only url for developer convenience config.getDataSourceConfig().setReadOnlyUrl("none"); @@ -114,7 +114,7 @@ public class InitDataSourceTest { @Test public void readOnlyConfig_when_urlSet_2() { - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); config.getReadOnlyDataSourceConfig().setUrl("foo"); final DataSourceConfig roConfig = new InitDataSource(config).readOnlyConfig(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java index bd9139a6a..48d67baee 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.deploy.parse; import io.ebean.config.DatabaseConfig; -import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; @@ -12,7 +11,6 @@ import org.junit.jupiter.api.Test; import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; public class AnnotationClassTest { @@ -45,9 +43,8 @@ public class AnnotationClassTest { assertThat(columnNames[2]).isEqualTo("col3"); } - @SuppressWarnings("unchecked") - private AnnotationClass createAnnotationClass(ServerConfig config) { - + @SuppressWarnings({"unchecked", "rawtypes"}) + private AnnotationClass createAnnotationClass(DatabaseConfig config) { DeployUtil deployUtil = new DeployUtil(new DefaultTypeManager(config, new BootupClasses()), config); DeployBeanInfo deployBeanInfo = new DeployBeanInfo(deployUtil, new DeployBeanDescriptor<>(null, null, null)); @@ -55,10 +52,9 @@ public class AnnotationClassTest { return new AnnotationClass(deployBeanInfo, readAnnotationConfig); } - private ServerConfig sqlServerPlatform(boolean allQuotedIdentifiers) { - + private DatabaseConfig sqlServerPlatform(boolean allQuotedIdentifiers) { SqlServer17Platform sqlServer17Platform = new SqlServer17Platform(); - ServerConfig config = new ServerConfig(); + DatabaseConfig config = new DatabaseConfig(); config.setDatabasePlatform(sqlServer17Platform); config.setAllQuotedIdentifiers(allQuotedIdentifiers); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java index b3dc68dea..a7a24f512 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.type.DefaultTypeManager; @@ -22,8 +22,7 @@ public class DJsonScalarTest { private final DJsonScalar jsonScalar; public DJsonScalarTest() { - - ServerConfig serverConfig = new ServerConfig(); + DatabaseConfig serverConfig = new DatabaseConfig(); serverConfig.setDatabasePlatform(new H2Platform()); DefaultTypeManager typeManager = new DefaultTypeManager(serverConfig, new BootupClasses()); jsonScalar = new DJsonScalar(typeManager); @@ -31,7 +30,6 @@ public class DJsonScalarTest { @Test public void writeBasicTypes() throws IOException { - StringWriter writer = new StringWriter(); JsonGenerator generator = createGenerator(writer); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index d74a4fc2b..c28da92a7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.core.type.ScalarType; import io.ebean.server.type.MyDayOfWeek; @@ -99,38 +99,36 @@ public class TestTypeManager extends BaseTestCase { public void testWithConfig() { DefaultTypeManager typeManager1 = createTypeManager(); ScalarType type1 = typeManager1.createEnumScalarType(MySex.class, null); - assertThat(type1 instanceof ScalarTypeEnumStandard.OrdinalEnum); + assertThat(type1).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class); // DefaultTypeManager typeManager2 = createTypeManagerDefaultEnumTypeString(); ScalarType type2 = typeManager2.createEnumScalarType(MySex.class, null); - assertThat(type2 instanceof ScalarTypeEnumStandard.StringEnum); + assertThat(type2).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class); // DefaultTypeManager typeManager3 = createTypeManagerDefaultEnumTypeString(); ScalarType type3 = typeManager3.createEnumScalarType(MySex.class, EnumType.ORDINAL); - assertThat(type3 instanceof ScalarTypeEnumStandard.OrdinalEnum); + assertThat(type3).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class); } private DefaultTypeManager createTypeManager() { - - ServerConfig serverConfig = new ServerConfig(); - serverConfig.setDatabasePlatform(new H2Platform()); + DatabaseConfig config = new DatabaseConfig(); + config.setDatabasePlatform(new H2Platform()); BootupClasses bootupClasses = new BootupClasses(); bootupClasses.getAttributeConverters().add(MoneyTypeConverter.class); - return new DefaultTypeManager(serverConfig, bootupClasses); + return new DefaultTypeManager(config, bootupClasses); } private DefaultTypeManager createTypeManagerDefaultEnumTypeString() { - - ServerConfig serverConfig = new ServerConfig(); - serverConfig.setDatabasePlatform(new H2Platform()); - serverConfig.setDefaultEnumType(EnumType.STRING); + DatabaseConfig config = new DatabaseConfig(); + config.setDatabasePlatform(new H2Platform()); + config.setDefaultEnumType(EnumType.STRING); BootupClasses bootupClasses = new BootupClasses(); bootupClasses.getAttributeConverters().add(MoneyTypeConverter.class); - return new DefaultTypeManager(serverConfig, bootupClasses); + return new DefaultTypeManager(config, bootupClasses); } /** diff --git a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java index 90c3f4705..1a7f8375c 100644 --- a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java +++ b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java @@ -1,10 +1,10 @@ package org.tests.basic; -import io.ebean.EbeanServer; -import io.ebean.EbeanServerFactory; +import io.ebean.Database; +import io.ebean.DatabaseFactory; import io.ebean.Query; import io.ebean.SqlRow; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.datasource.DataSourceConfig; import org.tests.model.basic.TOne; @@ -13,8 +13,8 @@ import org.tests.model.basic.TSMaster; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; /** * Used to run some tests manually on a specific Database type. @@ -22,13 +22,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class MainDbBoolean { public static void main(String[] args) { - MainDbBoolean me = new MainDbBoolean(); - EbeanServer server = me.createEbeanServer(); + Database server = me.createEbeanServer(); me.simpleCheck(server); - EbeanServer oraServer = me.createOracleEbeanServer(); + Database oraServer = me.createOracleEbeanServer(); me.simpleCheck(oraServer); } @@ -36,9 +35,8 @@ public class MainDbBoolean { * Create a server for running small oracle specific tests manually. * DDL generation etc. */ - private EbeanServer createOracleEbeanServer() { - - ServerConfig c = new ServerConfig(); + private Database createOracleEbeanServer() { + DatabaseConfig c = new DatabaseConfig(); c.setName("ora"); c.setDdlExtra(false); @@ -67,13 +65,11 @@ public class MainDbBoolean { c.addClass(TSMaster.class); c.addClass(TSDetail.class); - return EbeanServerFactory.create(c); - + return DatabaseFactory.create(c); } - private EbeanServer createEbeanServer() { - - ServerConfig c = new ServerConfig(); + private Database createEbeanServer() { + DatabaseConfig c = new DatabaseConfig(); c.setName("pgtest"); c.setDdlExtra(false); @@ -98,15 +94,11 @@ public class MainDbBoolean { c.setDatabaseBooleanFalse("F"); c.setDatabasePlatform(new PostgresPlatform()); - c.addClass(TOne.class); - - return EbeanServerFactory.create(c); - + return DatabaseFactory.create(c); } - private void simpleCheck(EbeanServer server) { - + private void simpleCheck(Database server) { TOne o = new TOne(); o.setName("banan"); o.setDescription("this one is true"); @@ -127,27 +119,24 @@ public class MainDbBoolean { .order("id") .findList(); - assertTrue(list.size() == 2); + assertThat(list).hasSize(2); assertTrue(list.get(0).isActive()); - assertFalse(!list.get(0).isActive()); String sql = "select id, name, active from t_oneb order by id"; List sqlRows = server.sqlQuery(sql).findList(); - assertTrue(sqlRows.size() == 2); + assertThat(sqlRows).hasSize(2); Object active0 = sqlRows.get(0).get("active"); Object active1 = sqlRows.get(1).get("active"); - assertTrue("T".equals(active0)); - assertTrue("F".equals(active1)); - + assertEquals("T", active0); + assertEquals("F", active1); Query query = server.find(TOne.class) .setAutoTune(false) .order("id"); int rc = query.findCount(); - assertTrue(rc > 0); - + assertThat(rc).isGreaterThan(0); System.out.println("done"); } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java b/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java index 3ca929553..d679d31a6 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java @@ -1,8 +1,8 @@ package org.tests.unitinternal; -import io.ebean.EbeanServer; -import io.ebean.EbeanServerFactory; -import io.ebean.config.ServerConfig; +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.config.DatabaseConfig; import io.ebean.datasource.DataSourceConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +16,7 @@ public class HelloMain { public static void main(String[] args) { // ### Configuration Objects ### - ServerConfig serverConfig = new ServerConfig(); + DatabaseConfig serverConfig = new DatabaseConfig(); DataSourceConfig dataSourceConfig = new DataSourceConfig(); // ### Configuration Settings ### @@ -37,7 +37,7 @@ public class HelloMain { serverConfig.addClass(TOne.class); } - EbeanServer eServer = EbeanServerFactory.createWithContextClassLoader(serverConfig, HelloMain.class.getClassLoader()); + Database eServer = DatabaseFactory.createWithContextClassLoader(serverConfig, HelloMain.class.getClassLoader()); long id = 1; TOne data = eServer.find(TOne.class, id); @@ -49,7 +49,7 @@ public class HelloMain { System.out.println(String.format("############\n%s############", data.getName())); } - EbeanServerFactory.shutdown(); + DatabaseFactory.shutdown(); } } From 0887480865c019f7c9b6ae2706427d0bbb0096a2 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 18:10:36 +1200 Subject: [PATCH 066/102] #2357 - Update tests to use Database from EbeanServer --- ebean-api/src/main/java/io/ebean/DB.java | 10 +- .../src/test/java/io/ebean/BaseTestCase.java | 4 +- .../io/ebean/EbeanServer_deleteByIdTest.java | 16 +-- .../java/io/ebean/EbeanServer_deleteTest.java | 8 +- .../java/io/ebean/EbeanServer_eqlTest.java | 12 +- .../java/io/ebean/EbeanServer_refresh.java | 18 +-- .../io/ebean/EbeanServer_saveAllTest.java | 19 +-- .../java/io/ebean/ExtendedServerTest.java | 6 +- .../java/io/ebean/TestFilterWithEnum.java | 4 +- .../io/ebean/TestUnsetLoadedProperties.java | 12 +- .../java/io/ebean/TextExpressionListTest.java | 16 +-- .../test/java/io/ebean/UpdateQueryTest.java | 34 ++--- .../io/ebean/plugin/ExpressionPathTest.java | 6 +- .../java/io/ebean/plugin/PropertyTest.java | 6 +- .../java/io/ebean/plugin/SpiServerTest.java | 6 +- .../ebean/text/json/JsonBeanReaderTest.java | 4 +- .../cache/CachedBeanDataSerializeTest.java | 4 +- .../changelog/ChangeJsonBuilderTest.java | 2 +- .../DefaultChangeLogListenerTest.java | 6 +- .../BinaryTransactionEventReadWriteTest.java | 1 + ...faultServer_createOrmQueryRequestTest.java | 36 ++--- .../core/DefaultServer_getReferenceTest.java | 26 ++-- .../server/core/HelpCreateQueryRequest.java | 5 +- .../core/OrmQueryRequestTestHelper.java | 4 +- .../server/core/TestDiffHelpSimple.java | 10 +- .../server/core/TestDiffHelpWithEmbedded.java | 12 +- .../server/deploy/BeanDescriptorTest.java | 8 +- ...eanDescriptor_whenCreatedPropertyTest.java | 4 +- .../TestBeanDescriptorHasIdProperty.java | 6 +- .../deploy/TestCollectionLoadedStatus.java | 4 +- .../deploy/TestDiffHelpInsertSimple.java | 14 +- .../TestDiffHelpInsertWithEmbedded.java | 14 +- ...estReferenceWithConstructorProperties.java | 6 +- .../server/expression/BaseExpressionTest.java | 5 +- .../IsEmptyExpressionQueryTest.java | 18 +-- .../server/expression/NoopExpressionTest.java | 8 +- .../expression/PrepareDocNestedTest.java | 14 +- .../server/grammer/EqlParserTest.java | 4 +- .../server/querydefn/DefaultOrmQueryTest.java | 26 ++-- .../server/rawsql/TestRawSqlBuilder.java | 6 +- .../text/json/TestJsonWriteVisitor.java | 6 +- .../json/TestTextJsonBeanReadVisitor.java | 6 +- .../server/text/json/WriteJsonDirtyTest.java | 8 +- .../transaction/TransactionManagerTest.java | 4 +- .../server/type/ScalarTypeBooleanTest.java | 4 +- .../type/ScalarTypeJodaLocalTimeTest.java | 6 +- .../api/support/DocStoreDeleteEventTest.java | 6 +- .../api/support/DocStoreIndexEventTest.java | 6 +- ebean-core/src/test/java/org/Main.java | 7 +- .../TestAggregateFormula.java | 18 +-- .../tests/basic/TestAssocOneEqExpression.java | 6 +- .../java/org/tests/basic/TestBatchLazy.java | 8 +- .../org/tests/basic/TestBatchLazyMany.java | 6 +- .../tests/basic/TestBeanReferenceRefresh.java | 14 +- .../org/tests/basic/TestCreateEntityBean.java | 10 +- .../tests/basic/TestDeleteByIdCollection.java | 26 ++-- .../basic/TestDeleteImportedPartial.java | 12 +- .../org/tests/basic/TestDeleteOneToOne.java | 16 +-- .../basic/TestDeleteOneToOneMultiple.java | 10 +- .../basic/TestDeletePartialNoVersion.java | 18 +-- .../org/tests/basic/TestDynamicUpdate.java | 6 +- ...stEnhancementCollectionInitialisation.java | 4 +- .../org/tests/basic/TestErrorBindLog.java | 4 +- .../org/tests/basic/TestExplicitInsert.java | 10 +- .../java/org/tests/basic/TestFetchId.java | 8 +- .../java/org/tests/basic/TestInEmpty.java | 8 +- .../java/org/tests/basic/TestInheritRef.java | 14 +- .../java/org/tests/basic/TestJodaType.java | 8 +- .../org/tests/basic/TestJoinInheritance.java | 14 +- .../basic/TestLazyLoadEmptyOneToMany.java | 8 +- .../org/tests/basic/TestLazyLoadInCache.java | 10 +- .../java/org/tests/basic/TestLimitQuery.java | 12 +- .../org/tests/basic/TestLoadBeanCache.java | 6 +- .../tests/basic/TestLogTransLogOnError.java | 18 +-- .../org/tests/basic/TestM2MCascadeOne.java | 12 +- .../java/org/tests/basic/TestM2MVanilla.java | 4 +- .../org/tests/basic/TestManyLazyLoad.java | 10 +- .../org/tests/basic/TestManyOneInterface.java | 6 +- .../java/org/tests/basic/TestMappedSuper.java | 10 +- .../org/tests/basic/TestMetaAnnotation.java | 10 +- .../tests/basic/TestMultipleOneToOneIUD.java | 14 +- .../tests/basic/TestNonUpdateProperty.java | 8 +- .../tests/basic/TestOrderByAnnotation.java | 6 +- .../basic/TestOrderTotalAmountFormula.java | 4 +- .../basic/TestOrderTotalAmountReportBean.java | 8 +- .../tests/basic/TestPersistenceContext.java | 24 ++-- .../tests/basic/TestQueryWhereBetween.java | 6 +- .../org/tests/basic/TestQueryWithCache.java | 18 +-- .../tests/basic/TestReadOnlyPropagation.java | 2 +- .../tests/basic/TestSaveDeleteOneToOne.java | 12 +- .../basic/TestSaveDeleteOneToOneMultiple.java | 12 +- .../basic/TestSharedInstancePropagation.java | 16 +-- .../org/tests/basic/TestUpdateManyToOne.java | 10 +- .../java/org/tests/basic/TestUuidInsert.java | 10 +- .../basic/TestUuidInsertMasterDetail.java | 10 +- .../org/tests/basic/TestWhereAnnotation.java | 6 +- .../basic/delete/TestDeleteByIdList.java | 14 +- .../basic/delete/TestDeleteCascadeById.java | 12 +- .../delete/TestDeleteCascadeByQuery.java | 24 ++-- .../basic/encrypt/TestEncryptClientSide.java | 12 +- .../basic/event/TestPreInsertValidation.java | 12 +- .../tests/basic/event/TestQueryAdapter.java | 12 +- .../tests/basic/join/TestSecondaryJoin.java | 6 +- .../basic/lob/TestBasicClobFetchEager.java | 14 +- .../org/tests/basic/lob/TestByteOnly.java | 8 +- .../one2one/TestOne2OneBookingInvoice.java | 14 +- .../basic/one2one/TestOneToOneWheelTire.java | 6 +- .../basic/type/TestExtraScalarTypes.java | 8 +- .../basic/type/TestQueryBooleanProperty.java | 4 +- .../batchinsert/TestBatchInsertFlush.java | 30 ++-- .../batchinsert/TestBatchInsertOneToOne.java | 4 +- .../batchinsert/TestBatchInsertSimple.java | 16 +-- ...tBatchInsertWithInitialisedCollection.java | 6 +- .../TestBatchOnCascadeExceptionHandling.java | 4 +- .../TestBatchSaveWithGetBeanId.java | 8 +- .../org/tests/batchload/TestBasicLazy.java | 18 +-- .../tests/batchload/TestBasicNavOnEmpty.java | 8 +- .../batchload/TestBatchLazyWithDeleted.java | 22 +-- .../batchload/TestEmptyManyLazyLoad.java | 10 +- .../org/tests/batchload/TestLazyJoin.java | 4 +- .../org/tests/batchload/TestLazyJoin2.java | 8 +- .../TestLazyLoadEmptyCollection.java | 6 +- .../TestLazyLoadNonExistantBean.java | 4 +- .../TestLazyLoadNonExistentBean.java | 4 +- .../batchload/TestQueryDisableLazyLoad.java | 8 +- .../org/tests/batchload/TestQueryJoin.java | 10 +- .../batchload/TestQueryJoinToAssocOne.java | 26 ++-- .../batchload/TestSecondQueryNoRows.java | 8 +- .../tests/batchload/TestSecondaryQueries.java | 12 +- .../cache/TestBeanCacheWithDeleteQuery.java | 22 +-- .../java/org/tests/cache/TestCacheBasic.java | 42 +++--- .../tests/cache/TestCacheCollectionIds.java | 128 +++++++++--------- .../org/tests/cache/TestCacheCustomer.java | 12 +- .../java/org/tests/cache/TestCacheDelete.java | 16 +-- .../TestCacheInterceptSaveWhenLazyLoaded.java | 22 +-- .../org/tests/cache/TestCacheManyToOne.java | 8 +- .../org/tests/cache/TestCacheNaturalId.java | 14 +- .../tests/cache/TestExternalNotification.java | 17 ++- .../cache/TestL2CacheWithSharedBean.java | 14 +- .../cache/TestL2DirtyFlagOnLazyLoad.java | 22 +-- .../java/org/tests/cache/TestQueryCache.java | 4 +- .../tests/cache/TestQueryCacheCountry.java | 30 ++-- .../org/tests/cache/TestQueryCacheInsert.java | 14 +- .../tests/cache/TestQueryCacheReadOnly.java | 8 +- .../cache/TestQueryCacheTableDependency.java | 42 +++--- .../TestBeanCacheEmbeddedIdPrimitives.java | 10 +- .../org/tests/callable/TestMysqlCallable.java | 6 +- .../tests/cascade/TestMultiCascadeBatch.java | 8 +- .../org/tests/cascade/TestPrivateOwned.java | 20 +-- .../TestPrivateOwnedAddRemoveOrphan.java | 10 +- .../cascade/TestPrivateOwnedCascadeOrder.java | 20 +-- ...TestPrivateOwnedIgnoreTransientOrphan.java | 10 +- .../org/tests/changelog/TestChangeLogInt.java | 6 +- .../compositekeys/TestCKeyIdInExpression.java | 10 +- .../tests/compositekeys/TestCKeyLazyLoad.java | 22 +-- ...aoCompositeKeyWithAnnotationOverrides.java | 6 +- .../org/tests/compositekeys/TestCore.java | 10 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 26 ++-- .../contructor/TestProtectedConstructor.java | 8 +- .../org/tests/ddd/iud/TestDExhEntityEl.java | 2 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 6 +- .../org/tests/ddd/iud/TestDPersonIUD.java | 6 +- .../org/tests/ddl/TestForeignKeyModes.java | 40 +++--- .../org/tests/defaultvalues/TestDefaults.java | 4 +- .../TestDeleteByIdWithPersistenceContext.java | 14 +- .../org/tests/delete/TestDeleteByQuery.java | 2 +- .../delete/TestDeleteCascadeWithListener.java | 8 +- .../TestDeleteWithoutOptimisticLocking.java | 28 ++-- .../java/org/tests/draftable/DocLinkTest.java | 50 +++---- .../tests/draftable/LinkQueryPublishTest.java | 6 +- .../org/tests/draftable/OrganisationTest.java | 12 +- .../test/java/org/tests/el/TestELBasic.java | 4 +- .../java/org/tests/el/TestPathExpression.java | 4 +- .../org/tests/el/TestUnderscoreParam.java | 4 +- .../bitwise/TestBitwiseExpressions.java | 30 ++-- .../org/tests/family/TestInheritance.java | 14 +- .../generated/TestGeneratedProperties.java | 8 +- .../org/tests/generated/TestGeneratedWho.java | 24 ++-- .../org/tests/genkey/TestGeneratedKeys.java | 10 +- .../java/org/tests/idkeys/TestCustomId.java | 8 +- .../org/tests/idkeys/TestSimpleIdInsert.java | 8 +- .../TestDuplicateKeyException.java | 18 +-- .../tests/inheritance/TestInheritInsert.java | 30 ++-- .../TestInheritanceBatchLazyLoad.java | 8 +- ...estInheritanceDiscriminatorQueryCache.java | 6 +- .../inheritance/TestInheritanceJoins.java | 14 +- .../inheritance/TestInheritanceOnMany.java | 24 ++-- .../TestInheritanceOrderColumn.java | 10 +- .../inheritance/TestInheritanceQuery.java | 12 +- .../inheritance/TestInheritanceRawSql.java | 16 +-- .../org/tests/inheritance/TestIntInherit.java | 16 +-- .../inheritance/TestNpeOnDiscriminator.java | 8 +- .../org/tests/inheritance/TestSkippable.java | 18 +-- .../inheritance/TestTreeOrganisations.java | 6 +- .../abstrakt/TestInheritanceNum.java | 4 +- .../cache/TestInheritanceCache.java | 12 +- .../cache/TestInheritanceRefCache.java | 26 ++-- .../company/domain/TestInheritAbstract.java | 6 +- .../java/org/tests/insert/MainDbCopy.java | 11 +- .../tests/insert/TestInsertCollection.java | 28 ++-- .../TestInsertDataIntegrityException.java | 4 +- .../tests/insert/TestInsertDuplicateKey.java | 8 +- .../tests/insert/TestInsertOnStringKey.java | 4 +- .../insert/TestSaveWithDaylightSavings.java | 6 +- .../java/org/tests/iud/TestCarWheelIud.java | 8 +- .../java/org/tests/iud/TestInfoOneToOne.java | 4 +- .../org/tests/iud/TestInsertQueryUpdate.java | 12 +- .../org/tests/iud/TestInsertUpdateTrans.java | 10 +- .../org/tests/json/TestDbJson_Jackson.java | 14 +- .../org/tests/json/TestDbJson_Jackson2.java | 8 +- .../java/org/tests/json/TestJsonMapBlob.java | 8 +- .../java/org/tests/json/TestJsonMapClob.java | 8 +- .../java/org/tests/json/TestJsonMapJsonB.java | 8 +- .../org/tests/json/TestJsonMapVarchar.java | 8 +- .../org/tests/json/TestJsonNodeBasic.java | 26 ++-- .../java/org/tests/json/TestJsonNodeBlob.java | 12 +- .../org/tests/json/TestJsonNodeJsonb.java | 12 +- .../org/tests/json/TestJsonNodeVarchar.java | 12 +- .../tests/json/TestUnmappedProperties.java | 6 +- .../include/TestJsonExcludeEmptyList.java | 6 +- .../json/include/TestJsonExcludeEmptyMap.java | 6 +- .../json/include/TestJsonExcludeEmptySet.java | 6 +- .../json/include/TestJsonExcludeNull.java | 4 +- .../TestJsonExcludeTransientEmptyList.java | 8 +- .../TestJacksonIgnore.java | 8 +- .../transientproperties/TestModelAJson.java | 4 +- .../TestTransientListProperty.java | 6 +- .../TestTransientObjectProperty.java | 6 +- .../lazyforeignkeys/TestLazyForeignKeys.java | 4 +- .../org/tests/level/test/ManyToManyTest.java | 36 ++--- .../lifecycle/TestLifecycleAnnotatedBean.java | 36 ++--- .../TestM2MDeleteObjectWithCascadeToM2m.java | 32 ++--- .../tests/m2m/TestM2MDeleteWithCascade.java | 18 +-- .../org/tests/m2m/TestM2MMultipleLists.java | 6 +- .../tests/m2m/TestM2MSelfRelationship.java | 10 +- .../org/tests/m2m/TestM2mDeleteObject.java | 42 +++--- .../softdelete/TestM2MSoftDeleteExists.java | 34 ++--- .../java/org/tests/merge/TestMergeBasic.java | 12 +- .../org/tests/merge/TestMergeCustomer.java | 26 ++-- .../java/org/tests/merge/TestMergeM2M.java | 16 +-- .../model/aggregation/MachineUseData.java | 6 +- .../org/tests/model/basic/ResetBasicData.java | 44 +++--- .../cache/TestCacheViaComplexNaturalKey.java | 26 ++-- .../cache/TestCacheViaComplexNaturalKey3.java | 32 ++--- .../basic/cache/TestCacheWithSoftDelete.java | 2 +- .../model/basic/first/TestFirstSecond.java | 10 +- .../org/tests/model/basic/xtra/DummyDao.java | 8 +- .../xtra/TestDeleteUnloadedChildren.java | 28 ++-- .../TestInsertBatchThenFlushThenUpdate.java | 10 +- .../basic/xtra/TestInsertBatchThenUpdate.java | 18 +-- ...TestInsertBatchWithDifferentRootTypes.java | 10 +- .../bridge/TestExplicitM2MBridgeTable.java | 28 ++-- .../tests/model/bridge/TestIdClassScalar.java | 26 ++-- .../TestTruckCarWheelInhertiance.java | 6 +- .../composite/TestCompositeKeyUserClient.java | 12 +- .../model/ddd/TestScalarTypeConverter.java | 6 +- .../TestElementCollectionBasic.java | 42 +++--- .../TestElementCollectionBasicCache.java | 22 +-- .../TestElementCollectionBasicMapAsLob.java | 4 +- .../TestElementCollectionBasicMapCache.java | 22 +-- ...estElementCollectionEmbeddedListCache.java | 18 +-- ...TestElementCollectionEmbeddedMapCache.java | 18 +-- .../embedded/TestEmbeddedAttrOverride.java | 4 +- .../model/embedded/TestEmbeddedManyToOne.java | 12 +- .../model/history/TestHistoryExclude.java | 18 +-- .../model/history/TestHistoryInclude.java | 6 +- .../TestHistorySoftDeleteOneToOne.java | 8 +- .../test/TestInheritExposeDtype.java | 8 +- .../TestMediaInheritanceJoinToMany.java | 6 +- .../model/lazywithid/TestColumnIdName.java | 6 +- .../tests/model/m2m/TestM2MDoubleInsert.java | 4 +- .../tests/model/m2o/TestManyToOneAsOne.java | 12 +- .../java/org/tests/model/nofk/Test2NoFk.java | 28 ++-- .../java/org/tests/model/nofk/TestNoFk.java | 48 +++---- .../onetoone/TestOneToOneCascadeSave.java | 6 +- .../TestOneToOneImportedPkNative.java | 12 +- .../onetoone/TestOneToOneJoinColumn.java | 6 +- .../onetoone/TestOneToOneManyDelete.java | 6 +- .../onetoone/TestOneToOneOrphanRemove.java | 10 +- .../onetoone/TestOneToOneOrphanStringId.java | 20 +-- .../onetoone/TestOneToOnePrimaryKeyJoin.java | 16 +-- .../TestOneToOnePrimaryKeyJoinBidi.java | 16 +-- .../TestOneToOnePrimaryKeyJoinOptional.java | 20 +-- .../onetoone/TestOneToOneSoftDeleteChild.java | 6 +- .../orphanremoval/TestOrphanRemoveO2M.java | 24 ++-- .../TestOrphanRemoveO2MFlat.java | 16 +-- .../model/prnt/TestPrinterStateIssue.java | 22 +-- .../java/org/tests/model/pview/TestPview.java | 6 +- .../selfref/TestResourceFileSelfRef.java | 6 +- .../model/selfref/TestSelfRefExample.java | 24 ++-- .../model/selfref/TestTextJsonSelfRef.java | 18 +-- .../tests/model/survey/TestOrderByFetch.java | 6 +- .../tevent/TestAssocOneNullTraverse.java | 8 +- .../TestVersionHierarchyModification.java | 18 +-- .../tests/model/view/TestViewBaseEntity.java | 8 +- .../org/tests/model/zero/TestWithZero.java | 6 +- .../TestOneToManyJoinTableInheritance.java | 8 +- .../TestOneToManyJoinTableNoTableName.java | 10 +- .../o2o/TestOneToOneSaveWithoutChanges.java | 12 +- .../java/org/tests/o2o/TestReferenceSave.java | 8 +- .../java/org/tests/order/TestOrderColumn.java | 26 ++-- ...stPersistenceContextOnUpdateDuringTxn.java | 6 +- .../TestPersistenceContextQueryScope.java | 22 +-- ...estPersistenceContextScopeUsingOrders.java | 4 +- .../TestAddOrderByWithFirstRowsMaxRows.java | 18 +-- .../query/TestAutofetchTuneWithJoin.java | 6 +- .../query/TestConnectionCloseOnSqlerr.java | 14 +- .../org/tests/query/TestDefaultFetchLazy.java | 10 +- .../query/TestExprNestedDisjunction.java | 12 +- .../org/tests/query/TestFindOneOrEmpty.java | 6 +- .../java/org/tests/query/TestIContains.java | 14 +- .../TestImplicitJoinOnParentRelationship.java | 8 +- .../tests/query/TestJoinOptOneCascade.java | 6 +- .../tests/query/TestLimitAlterFetchMany.java | 4 +- .../java/org/tests/query/TestLimitQuery.java | 4 +- .../org/tests/query/TestManyWhereJoin.java | 16 +-- .../org/tests/query/TestManyWhereJoinM2M.java | 22 +-- .../org/tests/query/TestMyAdHocSqlSelect.java | 6 +- .../query/TestOneToManyCorrectGrouping.java | 4 +- .../java/org/tests/query/TestOuterJoin.java | 22 +-- .../org/tests/query/TestQueryBaseTable.java | 8 +- .../query/TestQueryFetchJoinWithOrder.java | 8 +- .../query/TestQueryFetchManyTwoDeep.java | 10 +- .../tests/query/TestQueryFetchSkipPath.java | 4 +- .../tests/query/TestQueryFilterManyOnM2M.java | 4 +- .../query/TestQueryFilterManyOnSecondary.java | 6 +- .../query/TestQueryFilterManySimple.java | 5 +- .../org/tests/query/TestQueryFindIterate.java | 4 +- .../tests/query/TestQueryFindMapTypedKey.java | 8 +- .../tests/query/TestQueryFindPagedList.java | 32 ++--- .../tests/query/TestQueryFindReadOnly.java | 18 +-- .../org/tests/query/TestQueryInAssocOne.java | 14 +- .../tests/query/TestQueryJoinBatchSize.java | 6 +- .../tests/query/TestQueryJoinMulipleMany.java | 4 +- .../tests/query/TestQueryMultiManyOrder.java | 4 +- .../tests/query/TestQueryNullAssocOne.java | 10 +- .../query/TestQueryPathJoinAndOrder.java | 4 +- .../query/TestQueryPlanCacheRowCount.java | 6 +- .../tests/query/TestRefToLazyLoadMany.java | 10 +- .../java/org/tests/query/TestRowCount.java | 8 +- .../java/org/tests/query/TestSubQuery.java | 4 +- .../tests/query/TestThreeLevelQueryJoin.java | 4 +- .../org/tests/query/TestWhereRawClause.java | 24 ++-- .../aggregation/TestAggregationCount.java | 62 ++++----- .../java/org/tests/query/cache/Main2.java | 4 +- .../org/tests/query/cache/TestDistinct.java | 14 +- .../TestFilteringByEmbeddedInJoinedTable.java | 12 +- .../embedded/TestMultipleEmbeddedLoading.java | 20 +-- .../joins/TestDisjunctWhereOuterJoin.java | 28 ++-- .../joins/TestDisjunctWhereOuterOnMany.java | 14 +- .../query/joins/TestQueryJoinManyNonRoot.java | 12 +- .../query/joins/TestQueryJoinOnFormula.java | 28 ++-- .../joins/TestQueryJoinQueryNonRoot.java | 8 +- .../TestQueryManyToOneWhereClauseJoin.java | 8 +- .../query/lazy/TestQueryDefaultBatchSize.java | 12 +- .../tests/query/orderby/TestOrderByClear.java | 4 +- .../query/orderby/TestOrderByOnComplex.java | 6 +- .../orderby/TestOrderByWithDistinct.java | 30 ++-- .../orderby/TestOrderByWithDistinctTake2.java | 6 +- .../orderby/TestOrderByWithFunction.java | 4 +- .../query/orderby/TestOrderByWithMany.java | 20 +-- .../query/other/TestFetchPreference.java | 10 +- .../other/TestFindIdsWithInheritance.java | 8 +- .../query/other/TestFindIterateHeapDump.java | 6 +- ...stFindPartialWithConstructorSetFields.java | 8 +- .../other/TestFindWhereUsingEnumerated.java | 6 +- .../query/other/TestFormulaWithFindCount.java | 6 +- .../query/other/TestManyLazyLoadingQuery.java | 16 +-- .../other/TestManyToManyLazyLoading.java | 10 +- .../other/TestQueryConversationRowCount.java | 4 +- .../tests/query/other/TestQueryDistinct.java | 10 +- .../other/TestQueryRawExpressionMany.java | 4 +- .../query/other/TestQuerySingleAttribute.java | 96 ++++++------- .../org/tests/query/other/TestSelfParent.java | 22 +-- .../query/other/TestSubQueryBinding.java | 6 +- .../query/other/TestWhereAnnotation.java | 8 +- .../query/other/TestWhereLikeWithSlash.java | 22 +-- .../softdelete/TestSoftDeletePagingList.java | 8 +- .../sqlquery/TestNativeILikeExpression.java | 4 +- .../TestQuotedIdentifierQuery.java | 8 +- .../tests/rawsql/TestOrderReportTotal.java | 10 +- .../org/tests/rawsql/TestRawSqlAsKeyword.java | 10 +- .../rawsql/TestRawSqlCustomerAggregate.java | 4 +- .../tests/rawsql/TestRawSqlMasterDetail.java | 26 ++-- .../tests/rawsql/TestRawSqlNamedParams.java | 16 +-- .../org/tests/rawsql/TestRawSqlOrmQuery.java | 20 +-- .../rawsql/TestRawSqlOrmQueryDistinct.java | 4 +- .../tests/rawsql/TestRawSqlOrmWrapper.java | 6 +- .../tests/rawsql/TestRawSqlOrmWrapper2.java | 4 +- .../tests/rawsql/TestRawSqlOrmWrapper3.java | 4 +- .../tests/rawsql/TestRawSqlWithResultSet.java | 6 +- .../tests/rawsql/inherit/ParentQueryTest.java | 10 +- .../rawsql/inherit/ParentRawSqlTest.java | 40 +++--- .../rawsql/nativesql/TestNativeSqlBasic.java | 34 ++--- .../tests/refresh/TestRefreshWithMany.java | 18 +-- .../tests/repository/CustomerRepository.java | 4 +- .../saveassociation/TestSaveAssociation.java | 8 +- .../TestInheritQuery.java | 48 +++---- .../tests/softdelete/TestSoftDeleteBook.java | 38 +++--- .../softdelete/TestSoftDeleteManyToMany.java | 10 +- .../TestSoftDeleteOptionalRelationship.java | 6 +- .../softdelete/TestSoftDeleteOtoCascade.java | 6 +- .../tests/softdelete/TestSoftDeleteTop.java | 36 ++--- .../org/tests/sp/TestManyToManySaveTwice.java | 10 +- .../org/tests/test/TestInheritWithMany.java | 8 +- .../json/TestJsonBeanDescriptorParse.java | 6 +- .../text/json/TestJsonBeanWithTimeZone.java | 8 +- .../TestJsonInheritanceDiscriminator.java | 10 +- .../java/org/tests/text/json/TestJsonMap.java | 14 +- .../org/tests/text/json/TestJsonSimple.java | 4 +- .../json/TestJsonSomeEnumWithToString.java | 4 +- .../json/TestTextJsonBeanReadVisitor.java | 6 +- .../text/json/TestTextJsonCompoundType.java | 2 +- .../text/json/TestTextJsonInsertUpdate.java | 12 +- .../text/json/TestTextJsonInvokeLazy.java | 6 +- .../json/TestTextJsonReadManyLazyLoad.java | 14 +- .../text/json/TestTextJsonReferenceBean.java | 14 +- .../tests/text/json/TestTextJsonSimple.java | 16 +-- .../text/json/TestTextJsonSuperSimple.java | 8 +- .../text/json/TestTextJsonUpdateCascade.java | 20 +-- .../org/tests/timezone/TimezoneTests.java | 6 +- .../java/org/tests/timezone/TzBeanTests.java | 6 +- .../transaction/TestBatchModelFlush.java | 4 +- .../transaction/TestBatchPersistCascade.java | 8 +- .../tests/transaction/TestBeanStateReset.java | 8 +- .../TestBeginTransactionWithExisting.java | 6 +- .../transaction/TestCommitAndContinue.java | 24 ++-- .../TestCreateTransactionWithIsolation.java | 2 +- .../TestDeleteFromPersistenceContext.java | 20 +-- .../transaction/TestInsertManyAndRef.java | 4 +- .../org/tests/transaction/TestNested.java | 10 +- .../transaction/TestNestedBeginRequired.java | 6 +- .../TestNestedBeginRequiredWithFailure.java | 6 +- .../TestNestedBeginRequiresNew.java | 6 +- ...TestNestedBeginRequiresNewWithFailure.java | 6 +- .../transaction/TestNestedMandatory.java | 6 +- .../transaction/TestNestedSubTransaction.java | 24 ++-- .../transaction/TestNestedTransaction.java | 78 +++++------ .../transaction/TestPersistContextClear.java | 8 +- .../org/tests/transaction/TestSavepoint.java | 18 +-- .../tests/transaction/TestSqlServerBatch.java | 10 +- .../TestStatelessUpdateClearPC.java | 14 +- .../TestTransactionRollbackOnly.java | 12 +- .../transaction/TestTransactionSkipCache.java | 6 +- .../TestTransactionTryResources.java | 12 +- .../transaction/TestTransactionalNever.java | 4 +- .../TestTransactionalNotSupports.java | 12 +- .../TestTransactionalRequired.java | 22 +-- .../TestTransactionalRequiresNew.java | 30 ++-- .../TestTransactionalSupports.java | 10 +- ...TransactionNotTerminatedAfterRollback.java | 8 +- .../org/tests/types/TestEncryptedString.java | 4 +- .../java/org/tests/types/TestFileType.java | 44 +++--- .../org/tests/types/TestFileTypeFetching.java | 14 +- .../java/org/tests/types/TestPeriodType.java | 20 +-- .../unidirectional/TestUniDirectional.java | 10 +- .../unitinternal/TestNullCollectionSet.java | 6 +- .../TestTxTypeOnTransactional.java | 4 +- .../TestVanillaCollectionSet.java | 6 +- .../update/TestEmbeddedRefreshUpdate.java | 16 +-- .../tests/update/TestJsonStatelessUpdate.java | 14 +- .../org/tests/update/TestMarkAsDirty.java | 8 +- .../tests/update/TestPostgresTruncate.java | 10 +- .../org/tests/update/TestSqlUpdateInTxn.java | 52 +++---- .../org/tests/update/TestSqlUpdateUpsert.java | 20 +-- .../update/TestUpdateAllLoadedProperties.java | 18 +-- .../tests/update/TestUpdateCircularSave.java | 22 +-- .../org/tests/update/TestUpdatePartial.java | 22 +-- .../tests/update/TestUpdatePartialNoVer.java | 8 +- .../src/test/resources/ebean.properties | 2 +- .../java/org/integration/ClusterTest.java | 4 +- .../java/org/integration/IntegrationTest.java | 2 +- 472 files changed, 3038 insertions(+), 3046 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index d5f281599..7c8523648 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1272,10 +1272,18 @@ public final class DB { return beanId(bean); } + /** + * Deprecated migrate to cacheManager(). + */ + @Deprecated + public static ServerCacheManager getServerCacheManager() { + return getDefault().cacheManager(); + } + /** * Return the manager of the level 2 cache ("L2" cache). */ - public static ServerCacheManager getServerCacheManager() { + public static ServerCacheManager cacheManager() { return getDefault().cacheManager(); } diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index eb100fc15..3960bdc42 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -254,8 +254,8 @@ public abstract class BaseTestCase { return (SpiEbeanServer) DB.getDefault(); } - protected EbeanServer server() { - return Ebean.getDefaultServer(); + protected Database server() { + return DB.getDefault(); } protected void loadCountryCache() { diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index 4478219ad..ffe1a743f 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -15,11 +15,11 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { public void deleteById() { EBasicVer someBean = bean("foo1"); - Ebean.save(someBean); + DB.save(someBean); // act LoggedSqlCollector.start(); - Ebean.delete(EBasicVer.class, someBean.getId()); + DB.delete(EBasicVer.class, someBean.getId()); List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(1); @@ -30,11 +30,11 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { public void deletePermanentById() { EBasicVer someBean = bean("foo1"); - Ebean.save(someBean); + DB.save(someBean); // act LoggedSqlCollector.start(); - Ebean.deletePermanent(EBasicVer.class, someBean.getId()); + DB.deletePermanent(EBasicVer.class, someBean.getId()); List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(1); @@ -46,9 +46,9 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { public void deleteById_withTransaction() { EBasicVer someBean = bean("foo1"); - Ebean.save(someBean); + DB.save(someBean); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); // act LoggedSqlCollector.start(); Transaction txn = server.beginTransaction(); @@ -67,9 +67,9 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { public void deletePermanentById_withTransaction() { EBasicVer someBean = bean("foo2"); - Ebean.save(someBean); + DB.save(someBean); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); // act LoggedSqlCollector.start(); Transaction txn = server.beginTransaction(); diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java index 747754faa..427d4a4d0 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -15,11 +15,11 @@ public class EbeanServer_deleteTest extends BaseTestCase { public void delete() { EBasicVer someBean = bean("foo1"); - Ebean.save(someBean); + DB.save(someBean); // act LoggedSqlCollector.start(); - Ebean.delete(someBean); + DB.delete(someBean); List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(1); @@ -30,9 +30,9 @@ public class EbeanServer_deleteTest extends BaseTestCase { public void delete_withTransaction() { EBasicVer someBean = bean("foo1"); - Ebean.save(someBean); + DB.save(someBean); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); // act LoggedSqlCollector.start(); Transaction txn = server.beginTransaction(); diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java index eafa16bf4..7aac81b95 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java @@ -38,7 +38,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class, "order by id limit 10"); + Query query = DB.createQuery(Customer.class, "order by id limit 10"); query.findList(); if (isSqlServer()) { @@ -56,7 +56,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class, "order by id limit 10 offset 3"); + Query query = DB.createQuery(Customer.class, "order by id limit 10 offset 3"); query.findList(); if (isSqlServer()) { @@ -74,7 +74,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class, "order by name"); + Query query = DB.createQuery(Customer.class, "order by name"); query.setMaxRows(10); query.setFirstRow(3); query.findList(); @@ -99,7 +99,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class, "order by name"); + Query query = DB.createQuery(Customer.class, "order by name"); query.setMaxRows(10); query.setFirstRow(3); query.orderById(true); @@ -126,7 +126,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class); + Query query = DB.createQuery(Customer.class); query.setMaxRows(10); query.setFirstRow(3); if (isSqlServer()) { @@ -148,7 +148,7 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(Customer.class); + Query query = DB.createQuery(Customer.class); query.setMaxRows(10); query.findList(); diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java index 393cb86dc..86c25de9b 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java @@ -21,7 +21,7 @@ public class EbeanServer_refresh { Map map = new HashMap<>(); map.put("tableName", "e_basic"); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); DB.script().run("/scripts/test-script.sql"); DB.script().run("/scripts/test-script-2.sql", map); server.script().run(this.getClass().getResource("/scripts/test-script.sql")); @@ -51,11 +51,11 @@ public class EbeanServer_refresh { ResetBasicData.reset(); - Order order = Ebean.find(Order.class, 1); + Order order = DB.find(Order.class, 1); order.getCustomer().getName(); order.getDetails().size(); - Ebean.refresh(order); + DB.refresh(order); } @Test @@ -63,11 +63,11 @@ public class EbeanServer_refresh { ResetBasicData.reset(); - Order order = Ebean.find(Order.class, 1); + Order order = DB.find(Order.class, 1); order.getCustomer().getName(); order.setDetails(new ArrayList<>()); - Ebean.refresh(order); + DB.refresh(order); } @Test @@ -75,11 +75,11 @@ public class EbeanServer_refresh { ResetBasicData.reset(); - Order order = Ebean.find(Order.class, 1); + Order order = DB.find(Order.class, 1); order.getCustomer().getName(); order.setDetails(null); - Ebean.refresh(order); + DB.refresh(order); } @@ -89,7 +89,7 @@ public class EbeanServer_refresh { ResetBasicData.reset(); - Order order = Ebean.find(Order.class, 1); + Order order = DB.find(Order.class, 1); DB.refresh(order); // call refresh BEFORE first access on "getDetail"; @@ -123,7 +123,7 @@ public class EbeanServer_refresh { ResetBasicData.reset(); - Order order = Ebean.find(Order.class, 1); + Order order = DB.find(Order.class, 1); DB.refresh(order); // call refresh BEFORE first access on "getDetail" // this changes the loader of the details-bean collection from DefaultServer to DLoadManyContext$LoadBuffer diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java index 54415ca4c..603a3befa 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -19,7 +20,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { // act LoggedSqlCollector.start(); - Ebean.saveAll(someBeans); + DB.saveAll(someBeans); // assert List loggedSql = LoggedSqlCollector.stop(); @@ -33,7 +34,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { // act LoggedSqlCollector.start(); - Ebean.updateAll(someBeans); + DB.updateAll(someBeans); loggedSql = LoggedSqlCollector.stop(); @@ -42,7 +43,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { // act LoggedSqlCollector.start(); - Ebean.deleteAll(someBeans); + DB.deleteAll(someBeans); loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(4); @@ -52,7 +53,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { @Test public void saveAll_withExistingBatch_doesNotTriggerFlush() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); try (Transaction transaction = server.beginTransaction()) { transaction.setBatchMode(true); @@ -87,29 +88,29 @@ public class EbeanServer_saveAllTest extends BaseTestCase { @Test public void deleteAll_withNull() { - Ebean.deleteAll(null); + DB.deleteAll(null); } @Test public void deleteAll_withEmpty() { - Ebean.saveAll(beans(0)); + DB.saveAll(beans(0)); } @Test public void saveAll_withNull() { - Ebean.saveAll(null); + DB.saveAll((Collection)null); } @Test public void saveAll_withEmpty() { - Ebean.saveAll(beans(0)); + DB.saveAll(beans(0)); } @Test public void saveAll_withTransaction() { List someBeans = beans(3); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); // act LoggedSqlCollector.start(); diff --git a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java index fee0fafa2..3f39680c8 100644 --- a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java @@ -17,7 +17,7 @@ public class ExtendedServerTest extends BaseTestCase { @AfterEach public void cleanup() { - Ebean.getDefaultServer() + DB.getDefault() .extended() .setClock(Clock.systemUTC()); } @@ -27,7 +27,7 @@ public class ExtendedServerTest extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.find(Customer.class) .where().startsWith("name", "Rob") @@ -53,7 +53,7 @@ public class ExtendedServerTest extends BaseTestCase { @Test public void mockClock() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); final Instant snapshot = Instant.now(); Instant backedSnapshot = snapshot.minus(1, ChronoUnit.DAYS); Clock snapshotClock = Clock.fixed(backedSnapshot, Clock.systemUTC().getZone()); diff --git a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java index 9627a7b2a..dfe3b8932 100644 --- a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java +++ b/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java @@ -15,9 +15,9 @@ public class TestFilterWithEnum extends BaseTestCase { ResetBasicData.reset(); - List allOrders = Ebean.find(Order.class).findList(); + List allOrders = DB.find(Order.class).findList(); - Filter filter = Ebean.filter(Order.class); + Filter filter = DB.filter(Order.class); List newOrders = filter.eq("status", Order.Status.NEW).filter(allOrders); assertNotNull(newOrders); diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index 57d959304..86f6af933 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -30,7 +30,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); - BeanState beanState = Ebean.getBeanState(user); + BeanState beanState = DB.getBeanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); @@ -54,7 +54,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = Ebean.getBeanState(user); + BeanState beanState = DB.getBeanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); // unset the loaded state for email @@ -72,7 +72,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = Ebean.getBeanState(user); + BeanState beanState = DB.getBeanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); @@ -89,10 +89,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = Ebean.getBeanState(user); + BeanState beanState = DB.getBeanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); - Ebean.getBeanState(user).setPropertyLoaded("email", false); + DB.getBeanState(user).setPropertyLoaded("email", false); assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); } @@ -110,7 +110,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { newUser.save(); - User updUser = Ebean.find(User.class, newUser.getId()); + User updUser = DB.find(User.class, newUser.getId()); updUser.setName("mod occ"); updUser.markPropertyUnset("version"); diff --git a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java index bc21bffed..63e380715 100644 --- a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java @@ -1,7 +1,7 @@ package io.ebean; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.search.Match; import io.ebean.search.MultiMatch; import org.tests.model.basic.Order; @@ -12,17 +12,17 @@ public class TextExpressionListTest { @Test public void syntax() { - Ebean.find(Order.class) + DB.find(Order.class) .text().match("name", "rob"); - Ebean.find(Order.class) + DB.find(Order.class) .text().should() .match("name", "rob") .match("note", "war and peace"); - Ebean.find(Order.class) + DB.find(Order.class) .text() .should() .match("title", "war and peace") @@ -32,7 +32,7 @@ public class TextExpressionListTest { .match("translator", "Louise Maude"); - Ebean.find(Order.class) + DB.find(Order.class) .text() .should() .match("title", "war and peace") @@ -44,7 +44,7 @@ public class TextExpressionListTest { .gt("reviewDate", 12345); - Ebean.find(Order.class) + DB.find(Order.class) .text() .must() .match("title", "quick") @@ -65,7 +65,7 @@ public class TextExpressionListTest { @Test public void syntax_multiMatch() { - Ebean.find(Order.class) + DB.find(Order.class) .text() .multiMatch("Will Smith", "title", "*name"); @@ -73,7 +73,7 @@ public class TextExpressionListTest { .opAnd() .type(MultiMatch.Type.PHRASE_PREFIX); - Ebean.find(Order.class) + DB.find(Order.class) .text() .multiMatch("Will Smith", match); diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java index 355bbca84..75555d6c7 100644 --- a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java @@ -25,7 +25,7 @@ public class UpdateQueryTest extends BaseTestCase { resetAllMetrics(); - EbeanServer server = server(); + Database server = server(); UpdateQuery update = server.update(Customer.class); Query query = update .set("status", Customer.Status.ACTIVE) @@ -127,7 +127,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void update_withTransactionBatch() { - EbeanServer server = server(); + Database server = server(); try (Transaction transaction = server.beginTransaction()) { transaction.setBatchMode(true); @@ -154,7 +154,7 @@ public class UpdateQueryTest extends BaseTestCase { @IgnorePlatform(Platform.SQLSERVER) public void withTableAlias() { - EbeanServer server = server(); + Database server = server(); UpdateQuery update = server.update(Customer.class); Query query = update .set("status", Customer.Status.ACTIVE) @@ -173,7 +173,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void withJoin() { - EbeanServer server = server(); + Database server = server(); Country nz = server.reference(Country.class, "NZ"); @@ -197,7 +197,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void withJoinAndLimit() { - EbeanServer server = server(); + Database server = server(); Country nz = server.reference(Country.class, "NZ"); @@ -219,7 +219,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void simpleWithLimit() { - EbeanServer server = server(); + Database server = server(); LoggedSqlCollector.start(); @@ -241,7 +241,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void whereIsEmpty() { - EbeanServer server = server(); + Database server = server(); Query updateQuery = server .update(Customer.class) @@ -259,7 +259,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void setNull() { - EbeanServer server = server(); + Database server = server(); Query updateQuery = server .update(Customer.class) @@ -276,7 +276,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void set_whenValueIsNull_expectNull() { - EbeanServer server = server(); + Database server = server(); Query updateQuery = server .update(Customer.class) @@ -293,7 +293,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void setExpression() { - EbeanServer server = server(); + Database server = server(); Query updateQuery = server .update(Customer.class) @@ -310,7 +310,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void setExpression_withBind() { - EbeanServer server = server(); + Database server = server(); Query updateQuery = server .update(Customer.class) @@ -327,7 +327,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void fluidSyntax() { - EbeanServer server = server(); + Database server = server(); int rows = server .update(Customer.class) @@ -342,7 +342,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void updateQuery_withExplicitTransaction() { - EbeanServer server = server(); + Database server = server(); int rowsExprList; int rowsQuery; @@ -374,7 +374,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void deleteQuery_withExplicitTransaction() { - EbeanServer server = server(); + Database server = server(); int rowsExprList; int rowsQuery; @@ -403,7 +403,7 @@ public class UpdateQueryTest extends BaseTestCase { @Test public void useViaEbean() { - int rows = Ebean.update(Customer.class) + int rows = DB.update(Customer.class) .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) .where() .gt("id", 10000) @@ -418,7 +418,7 @@ public class UpdateQueryTest extends BaseTestCase { Integer id = newEbasicWithUnique("o2", "other1_b"); assertThrows(DuplicateKeyException.class, () -> { - Ebean.update(EBasicWithUniqueCon.class) + DB.update(EBasicWithUniqueCon.class) .set("other", "other1_a") .set("otherOne", "other1_a") .where().idEq(id) @@ -431,7 +431,7 @@ public class UpdateQueryTest extends BaseTestCase { b0.setName(name); b0.setOther(other); b0.setOtherOne(other); - Ebean.save(b0); + DB.save(b0); return b0.getId(); } diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index 4c259285e..d5073bb98 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java @@ -1,7 +1,7 @@ package io.ebean.plugin; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ExpressionPathTest { - static EbeanServer server = Ebean.getDefaultServer(); + static Database server = DB.getDefault(); BeanType beanType(Class cls) { return server.pluginApi().beanType(cls); diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index 13fc2d92c..ca5ebecc1 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -1,7 +1,7 @@ package io.ebean.plugin; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class PropertyTest { - static EbeanServer server = Ebean.getDefaultServer(); + static Database server = DB.getDefault(); BeanType beanType(Class cls) { return server.pluginApi().beanType(cls); diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index ff84a576c..9426ed5d2 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -1,8 +1,8 @@ package io.ebean.plugin; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; import org.tests.model.basic.VwCustomer; @@ -22,7 +22,7 @@ public class SpiServerTest extends BaseTestCase { @Test public void test() { - EbeanServer defaultServer = Ebean.getDefaultServer(); + Database defaultServer = DB.getDefault(); SpiServer pluginApi = defaultServer.pluginApi(); BeanType beanType = pluginApi.beanType(Customer.class); diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index 4e83f909e..69d4ecb77 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java @@ -1,7 +1,7 @@ package io.ebean.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.PersistenceContext; import org.tests.model.basic.Customer; import com.fasterxml.jackson.core.JsonParser; @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class JsonBeanReaderTest extends BaseTestCase { - static JsonContext json = Ebean.json(); + static JsonContext json = DB.json(); @Test public void read() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 4e0353dc5..ecce75b0e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; @@ -64,7 +64,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { ResetBasicData.reset(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .order().asc("id") .setMaxRows(1).findList(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index aaceb6433..67b3b3664 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebean.text.json.JsonContext; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 60cdf037b..75d0a673f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.event.changelog.ChangeSet; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ public class DefaultChangeLogListenerTest extends BaseTestCase { DefaultChangeLogListener changeLogListener = new DefaultChangeLogListener(); - EbeanServer defaultServer = Ebean.getDefaultServer(); + Database defaultServer = DB.getDefault(); changeLogListener.configure(defaultServer.pluginApi()); ChangeSet changeSet = helper.createChangeSet("INT-001", 13); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index a8df99baa..c6bb66196 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.cluster.binarymessage; import io.ebean.BaseTestCase; +import io.ebean.Database; import io.ebean.EbeanServer; import io.ebeaninternal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 606e9533b..b600aefc9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; import io.ebeaninternal.server.querydefn.DefaultOrmQuery; @@ -97,13 +97,13 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void when_fetchConfig_then_differentPlan() throws Exception { - DefaultOrmQuery query1 = (DefaultOrmQuery) Ebean.find(Order.class) + DefaultOrmQuery query1 = (DefaultOrmQuery) DB.find(Order.class) .select("status, shipDate") .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name"); - DefaultOrmQuery query2 = (DefaultOrmQuery) Ebean.find(Order.class) + DefaultOrmQuery query2 = (DefaultOrmQuery) DB.find(Order.class) .select("status, shipDate") .fetch("details", "orderQty, unitPrice") .fetch("details.product", "sku, name"); @@ -114,7 +114,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_fetchJoins_expect_detailJoinsPreserveOrder() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetch("details"); @@ -128,7 +128,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_fetchJoinsAndWhere_expect_fetchJoinsOnlyInFetchPaths() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("details") .where().eq("customer.name", "rob").query(); @@ -142,7 +142,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQueryJoin() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetchQuery("details"); @@ -156,7 +156,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQueryJoin_via_fetchQuery() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetchQuery("details"); @@ -170,7 +170,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQueryJoin() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetch("details", FetchConfig.ofLazy()); @@ -184,7 +184,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQueryJoin_via_fetchLazy() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetchLazy("details"); @@ -198,7 +198,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_lazyFetchAndHasChildren_expect_getFetchPaths_doesNotIncludeJoinOrChild() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("customer", "name") .fetchLazy("details") @@ -213,7 +213,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_fetchMany_expect_getFetchPaths_containsAllInOrder() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetch("details") .fetch("details.product") @@ -228,7 +228,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void testJoinOrder_when_queryJoin_expect_getFetchPaths_excludesQueryJoinAndChildren() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status, orderDate") .fetchQuery("details") .fetch("details.product") @@ -243,7 +243,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_removeJoinToMany_when_multipleManyPaths() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("details") .fetch("details.product") .fetch("customer") @@ -258,7 +258,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_removeAllJoinToMany_when_firstRow() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setFirstRow(1) .fetch("details") // many path .fetch("details.product") @@ -274,7 +274,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_removeAllJoinToMany_when_maxRows() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setMaxRows(1) .fetch("details") // many path .fetch("details.product") @@ -290,7 +290,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_filterMany_included() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("details") .fetch("details.product") .fetch("customer") @@ -307,7 +307,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_filterMany_excludedByOrdering() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("customer") .fetch("customer.contacts") .fetch("details") @@ -324,7 +324,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { @Test public void test_filterMany_excludedExplicitly() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetchQuery("details") .fetch("details.product") .fetch("customer") diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index f578639e6..9978e816d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Customer; @@ -15,7 +15,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { @Test public void getReference_noPC() { - Ebean.getReference(Customer.class, 42); + DB.getReference(Customer.class, 42); } @Test @@ -23,9 +23,9 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { ResetBasicData.reset(); - Ebean.execute(() -> { - Customer loaded = Ebean.find(Customer.class, 1); - Customer reference = Ebean.getReference(Customer.class, 1); + DB.execute(() -> { + Customer loaded = DB.find(Customer.class, 1); + Customer reference = DB.getReference(Customer.class, 1); assertThat(loaded).isSameAs(reference); }); } @@ -36,14 +36,14 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { Car car = new Car(); car.setDriver("TestForRef"); - Ebean.save(car); + DB.save(car); - Vehicle reference = Ebean.getReference(Vehicle.class, car.getId()); + Vehicle reference = DB.getReference(Vehicle.class, car.getId()); assertThat(reference).isInstanceOf(Car.class); assertThat(reference.getId()).isSameAs(car.getId()); - Ebean.delete(car); + DB.delete(car); } @@ -52,14 +52,14 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { Car car = new Car(); car.setDriver("TestForRef"); - Ebean.save(car); + DB.save(car); - Ebean.execute(() -> { - Vehicle loaded = Ebean.find(Vehicle.class, car.getId()); - Vehicle reference = Ebean.getReference(Vehicle.class, car.getId()); + DB.execute(() -> { + Vehicle loaded = DB.find(Vehicle.class, car.getId()); + Vehicle reference = DB.getReference(Vehicle.class, car.getId()); assertThat(reference).isSameAs(loaded); } ); - Ebean.delete(car); + DB.delete(car); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java index 805ca2982..50863f117 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java @@ -1,14 +1,13 @@ package io.ebeaninternal.server.core; -import io.ebean.EbeanServer; +import io.ebean.Database; import io.ebean.Query; import io.ebean.Transaction; import io.ebeaninternal.api.SpiQuery; public class HelpCreateQueryRequest { - public static OrmQueryRequest create(EbeanServer server, SpiQuery.Type type, Query query, Transaction t) { - + public static OrmQueryRequest create(Database server, SpiQuery.Type type, Query query, Transaction t) { DefaultServer defaultServer = (DefaultServer) server; return (OrmQueryRequest)defaultServer.createQueryRequest(type, query, t); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java index 88d21ea38..e0ab5e746 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.core; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebeaninternal.api.SpiQuery; public class OrmQueryRequestTestHelper { - static DefaultServer defaultServer = (DefaultServer) Ebean.getDefaultServer(); + static DefaultServer defaultServer = (DefaultServer) DB.getDefault(); /** * Create and return a OrmQueryRequest for the given query. diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index cd135fe60..a380d2bb7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -23,16 +23,16 @@ public class TestDiffHelpSimple extends BaseTestCase { long firstTime = System.currentTimeMillis() - 10000; long secondTime = System.currentTimeMillis(); - EbeanServer server; + Database server; BeanDescriptor orderDesc; public TestDiffHelpSimple() { - server = Ebean.getServer(null); + server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; orderDesc = spiServer.getBeanDescriptor(Order.class); } - private Order createBaseOrder(EbeanServer server) { + private Order createBaseOrder(Database server) { Order order1 = new Order(); order1.setId(12); order1.setCretime(new Timestamp(firstTime)); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 19bd30108..308e0239c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -16,12 +16,12 @@ import static org.junit.jupiter.api.Assertions.*; public class TestDiffHelpWithEmbedded extends BaseTestCase { - EbeanServer server; + Database server; BeanDescriptor emainDesc; public TestDiffHelpWithEmbedded() { - server = Ebean.getServer(null); + server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; emainDesc = spiServer.getBeanDescriptor(EMain.class); } @@ -143,15 +143,13 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { } private EMain createEMain() { - EMain emain = new EMain(); emain.setName("foo"); - emain.setVersion(13l); + emain.setVersion(13L); Eembeddable embeddable = new Eembeddable(); embeddable.setDescription("bar"); emain.setEmbeddable(embeddable); - return emain; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index 94028e4fa..025b05c51 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.plugin.Property; import io.ebeaninternal.server.core.CacheOptions; @@ -61,18 +61,18 @@ public class BeanDescriptorTest extends BaseTestCase { public void createReference_with_inheritance() { Cat cat = new Cat(); cat.setName("Puss"); - Ebean.save(cat); + DB.save(cat); Dog dog = new Dog(); dog.setRegistrationNumber("DOGGIE"); - Ebean.save(dog); + DB.save(dog); AnimalShelter shelter = new AnimalShelter(); shelter.setName("My Animal Shelter"); shelter.getAnimals().add(cat); shelter.getAnimals().add(dog); - Ebean.save(shelter); + DB.save(shelter); BeanDescriptor animalDesc = spiEbeanServer().getBeanDescriptor(Animal.class); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 1ee4cf8f3..655e7f300 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -17,7 +17,7 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { @Test public void test() { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor desc = server.getBeanDescriptor(Customer.class); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index e614df5cf..a8ff657e3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiEbeanServer; @@ -24,7 +24,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { SpiEbeanServer spiServer; public TestBeanDescriptorHasIdProperty() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); spiServer = (SpiEbeanServer) server; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 5027e2332..b162952fa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; @@ -19,7 +19,7 @@ public class TestCollectionLoadedStatus extends BaseTestCase { @Test public void test() { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); Customer customer = new Customer(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 45e71f7ca..e6675b99e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; @@ -21,19 +21,19 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestDiffHelpInsertSimple extends BaseTestCase { - private long firstTime = System.currentTimeMillis() - 10000; + private final long firstTime = System.currentTimeMillis() - 10000; - private EbeanServer server; + private final Database server; - private BeanDescriptor orderDesc; + private final BeanDescriptor orderDesc; public TestDiffHelpInsertSimple() { - server = Ebean.getServer(null); + server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; orderDesc = spiServer.getBeanDescriptor(Order.class); } - private Order createBaseOrder(EbeanServer server) { + private Order createBaseOrder(Database server) { Order order1 = new Order(); order1.setId(12); order1.setCretime(new Timestamp(firstTime)); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index 85747f7e5..30154c184 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; @@ -17,12 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestDiffHelpInsertWithEmbedded extends BaseTestCase { - private EbeanServer server; - - private BeanDescriptor emainDesc; + private final BeanDescriptor emainDesc; public TestDiffHelpInsertWithEmbedded() { - server = Ebean.getServer(null); + Database server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; emainDesc = spiServer.getBeanDescriptor(EMain.class); } @@ -84,15 +82,13 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase { } private EMain createEMain() { - EMain emain = new EMain(); emain.setName("foo"); - emain.setVersion(13l); + emain.setVersion(13L); Eembeddable embeddable = new Eembeddable(); embeddable.setDescription("bar"); emain.setEmbeddable(embeddable); - return emain; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 94e83c958..8accecf82 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -23,9 +23,9 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { public void test() { ResetBasicData.reset(); - Order order = Ebean.getReference(Order.class, 1); + Order order = DB.getReference(Order.class, 1); - BeanState beanState = Ebean.getBeanState(order); + BeanState beanState = DB.getBeanState(order); Set loadedProps = beanState.getLoadedProps(); assertEquals(1, loadedProps.size()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index ef44734b8..b0693d3c9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,9 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; -import io.ebean.EbeanServer; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.event.BeanQueryRequest; import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index 81689c7f1..cdccac147 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().isEmpty("contacts") .query(); @@ -37,7 +37,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(EUserNoFk.class) + DB.find(EUserNoFk.class) .where().isEmpty("files") .delete(); @@ -58,7 +58,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().isNotEmpty("contacts") .query(); @@ -72,7 +72,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("id") .where().isEmpty("notes") .query(); @@ -86,7 +86,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("id") .where().isNotEmpty("notes") .query(); @@ -101,7 +101,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("id") .where().isEmpty("notes") .query(); @@ -115,7 +115,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().isEmpty("contacts.notes") .query(); @@ -134,7 +134,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().isNotEmpty("contacts.notes") .query(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index bede240f6..0583bdb35 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class NoopExpressionTest extends BaseExpressionTest { @Test public void test() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().add(NoopExpression.INSTANCE) .query(); @@ -31,7 +31,7 @@ public class NoopExpressionTest extends BaseExpressionTest { @Test public void test_withSoftDeleteBean() { - Query query = Ebean.find(Cover.class) + Query query = DB.find(Cover.class) .where().add(NoopExpression.INSTANCE) .query(); @@ -46,7 +46,7 @@ public class NoopExpressionTest extends BaseExpressionTest { @Test public void test_withPreAndPost() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().eq("name", null) .add(NoopExpression.INSTANCE) diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index 364e23ca3..e555a536e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; import org.tests.model.basic.Order; @@ -16,7 +16,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .gt("details.orderQty", 1) .query().where(); @@ -33,7 +33,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare_when_multipleOfSamePath() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .gt("details.orderQty", 1) .gt("details.unitPrice", 1) @@ -51,7 +51,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare_when_mixed() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .gt("customer.id", 1) .gt("details.orderQty", 1) @@ -73,7 +73,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare_when_nestedJunction() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .not() .gt("customer.id", 1) @@ -97,7 +97,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare_when_nestedMultiple() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .isNotNull("shipments.shipTime") .gt("details.orderQty", 1) @@ -122,7 +122,7 @@ public class PrepareDocNestedTest extends BaseTestCase { @Test public void prepare_when_manyMixed() throws Exception { - ExpressionList where = Ebean.find(Order.class) + ExpressionList where = DB.find(Order.class) .where() .gt("customer.id", 1) // 0 .isNotNull("shipments.shipTime") // shipments 0 diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 092578572..287ace7ed 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.grammer; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; @@ -695,7 +695,7 @@ public class EqlParserTest extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)"); + Query query = DB.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)"); List details = query.findList(); assertThat(details).isNotEmpty(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index 5c35154e6..305e7694b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.OrmQueryRequest; @@ -18,7 +18,7 @@ public class DefaultOrmQueryTest extends BaseTestCase { @Test public void when_forUpdate_then_excludeFromBeanCache() { - DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Customer.class) + DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Customer.class) .forUpdate().where().eq("id", 42).query(); assertThat(q1.getUseBeanCache()).isSameAs(CacheMode.OFF); @@ -27,7 +27,7 @@ public class DefaultOrmQueryTest extends BaseTestCase { @Test public void checkForId_when_eqId_then_translatedTo_setId() { - DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().eq("id", 42).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Order.class).where().eq("id", 42).query(); assertThat(q1.getWhereExpressions()).isNotNull(); assertThat(q1.getId()).isNull(); @@ -40,7 +40,7 @@ public class DefaultOrmQueryTest extends BaseTestCase { @Test public void checkForId_when_idEq_ok() { - DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().idEq(42).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Order.class).where().idEq(42).query(); assertThat(q1.getId()).isEqualTo(42); assertThat(q1.isFindById()).isTrue(); assertThat(q1.getId()).isEqualTo(42); @@ -49,7 +49,7 @@ public class DefaultOrmQueryTest extends BaseTestCase { @Test public void checkForId_when_setId_ok() { - DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).setId(42); + DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Order.class).setId(42); assertThat(q1.getId()).isEqualTo(42); assertThat(q1.isFindById()).isTrue(); assertThat(q1.getId()).isEqualTo(42); @@ -58,8 +58,8 @@ public class DefaultOrmQueryTest extends BaseTestCase { @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) DB.find(Order.class).where().in("name", "a", "b", "c").query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) DB.find(Order.class).where().in("id", 2, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey()); @@ -69,8 +69,8 @@ public class DefaultOrmQueryTest extends BaseTestCase { @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) DB.find(Order.class).where().in("id", 1, 2, 3).query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) DB.find(Order.class).where().in("id", 2, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey()); @@ -80,8 +80,8 @@ public class DefaultOrmQueryTest extends BaseTestCase { @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) DB.find(Order.class).where().in("id", 1, 2, 3).query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) DB.find(Order.class).where().in("id", 1, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey()); @@ -91,11 +91,11 @@ public class DefaultOrmQueryTest extends BaseTestCase { @Test public void when_diffFirstMaxRows_then_differentPlan() { - DefaultOrmQuery query1 = (DefaultOrmQuery) Ebean.find(Order.class) + DefaultOrmQuery query1 = (DefaultOrmQuery) DB.find(Order.class) .setFirstRow(0) .setMaxRows(31); - DefaultOrmQuery query2 = (DefaultOrmQuery) Ebean.find(Order.class) + DefaultOrmQuery query2 = (DefaultOrmQuery) DB.find(Order.class) .setFirstRow(1) .setMaxRows(0); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 5c1652684..cb3da9f2d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -74,7 +74,7 @@ public class TestRawSqlBuilder extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse("select\n id from\n o_customer").create(); - Ebean.find(Customer.class) + DB.find(Customer.class) .setRawSql(rawSql) .findList(); } @@ -242,7 +242,7 @@ public class TestRawSqlBuilder extends BaseTestCase { assertEquals(2, columnMapping.getIndexPosition("scheduled")); assertEquals(3, columnMapping.getIndexPosition("completed")); - Query query = Ebean.find(ERawSqlAggBean.class) + Query query = DB.find(ERawSqlAggBean.class) .setRawSql(rawSql) .having().gt("total", 2) .query(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index b451bff9b..a9759fa34 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteBeanVisitor; import io.ebean.text.json.JsonWriteOptions; @@ -25,7 +25,7 @@ public class TestJsonWriteVisitor extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .select("id, name, status") .fetch("billingAddress", "line1, city") .fetch("billingAddress.country", "*") @@ -33,7 +33,7 @@ public class TestJsonWriteVisitor extends BaseTestCase { .order().desc("id") .findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); JsonWriteOptions options = new JsonWriteOptions(); options.setRootPathVisitor(new CustomerVisitor()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index e9fde86c1..53c897057 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; import io.ebean.text.json.JsonReadOptions; @@ -25,7 +25,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .select("id, name, status, shippingAddress") .fetch("billingAddress", "line1, city") .fetch("billingAddress.country", "*") @@ -33,7 +33,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { .order().desc("id") .findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); JsonReadOptions options = new JsonReadOptions(); options.addRootVisitor(new CVisitor()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index a83cbfedc..a28ac7ca3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.text.json; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -23,13 +23,13 @@ public class WriteJsonDirtyTest { public void test() throws IOException { ResetBasicData.reset(); - List customers = Ebean.find(Customer.class).findList(); + List customers = DB.find(Customer.class).findList(); - Customer customer = Ebean.find(Customer.class).setId(customers.get(0).getId()) + Customer customer = DB.find(Customer.class).setId(customers.get(0).getId()) .setUseCache(false) .findOne(); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); customer.setName("dirtyCustName"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java index b5f6c0559..0410b6296 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TxScope; import io.ebeaninternal.api.ScopedTransaction; @@ -44,7 +44,7 @@ public class TransactionManagerTest extends BaseTestCase { Customer.find.byName("In external"); log.info("inner begin"); - Transaction inner = Ebean.beginTransaction(); + Transaction inner = DB.beginTransaction(); try { current = Transaction.current(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index 46569ed74..e2b80a668 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeBooleanTest { - JsonContext jsonContext = Ebean.getDefaultServer().json(); + JsonContext jsonContext = DB.getDefault().json(); @Test public void json_true() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 6fe49a87a..8b998ba37 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; @@ -55,8 +55,8 @@ public class ScalarTypeJodaLocalTimeTest { bean.setId(42); bean.setLocalTime(now); - String json = Ebean.json().toJson(bean); - TJodaEntity bean1 = Ebean.json().toBean(TJodaEntity.class, json); + String json = DB.json().toJson(bean); + TJodaEntity bean1 = DB.json().toBean(TJodaEntity.class, json); assertEquals(bean1.getLocalTime(), now); } diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 1f435c725..bc70bab28 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -1,8 +1,8 @@ package io.ebeanservice.docstore.api.support; import io.ebean.DocStoreQueueEntry; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; @@ -19,7 +19,7 @@ import static org.mockito.Mockito.when; public class DocStoreDeleteEventTest { - static EbeanServer server = Ebean.getDefaultServer(); + static Database server = DB.getDefault(); BeanType beanType(Class cls) { return server.pluginApi().beanType(cls); diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index 4efc3c97d..42832258a 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -1,8 +1,8 @@ package io.ebeanservice.docstore.api.support; import io.ebean.DocStoreQueueEntry; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; @@ -17,7 +17,7 @@ import static org.mockito.Mockito.*; public class DocStoreIndexEventTest { - static EbeanServer server = Ebean.getDefaultServer(); + static Database server = DB.getDefault(); BeanType beanType(Class cls) { return server.pluginApi().beanType(cls); diff --git a/ebean-core/src/test/java/org/Main.java b/ebean-core/src/test/java/org/Main.java index 7489f8056..e5bf2c2ef 100644 --- a/ebean-core/src/test/java/org/Main.java +++ b/ebean-core/src/test/java/org/Main.java @@ -1,7 +1,7 @@ package org; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import javax.sql.DataSource; import java.sql.Connection; @@ -13,8 +13,7 @@ public class Main { public static void main(String[] args) throws SQLException { - - EbeanServer ms = Ebean.getServer("ms"); + Database ms = DB.byName("ms"); DataSource dataSource = ms.dataSource(); Connection connection = dataSource.getConnection(); diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 188ab2dac..c986a7438 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -1,7 +1,7 @@ package org.tests.aggregateformula; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; @@ -27,7 +27,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .setDistinct(true) .select("lastName, min(customer)") .order("min(customer) asc nulls last") @@ -51,7 +51,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .select("lastName, min(customer)") .findList(); @@ -73,7 +73,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .select("lastName, min(customer)") .fetchQuery("customer", "name, status") .findList(); @@ -102,7 +102,7 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .select("lastName, min(customer)") .fetchQuery("customer", "name, status") .fetch("customer.billingAddress", "city, country") @@ -137,7 +137,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .select("status, sum(id)") .findList(); @@ -158,7 +158,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .select("status, sum(id) as id") .findList(); @@ -179,7 +179,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .select("customer, min(cretime)") .findList(); @@ -196,7 +196,7 @@ public class TestAggregateFormula extends BaseTestCase { LoggedSqlCollector.start(); - List contacts = Ebean.find(Contact.class) + List contacts = DB.find(Contact.class) .select("customer, min(cretime), max(updtime)") .findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index fa03ed9a2..219cdc63b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; @@ -21,7 +21,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { Customer c = new Customer(); c.setId(1); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().eq("customer", c) .query(); @@ -32,7 +32,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { Address b = new Address(); b.setId(1); - Query q2 = Ebean.find(Order.class) + Query q2 = DB.find(Order.class) .where().eq("customer.billingAddress", b) .query(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java index c3569e8e5..7a003e1eb 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -18,7 +18,7 @@ public class TestBatchLazy extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); List list = query.findList(); @@ -32,8 +32,8 @@ public class TestBatchLazy extends BaseTestCase { } } - Ebean.getDefaultServer().autoTune().collectProfiling(); - Ebean.getDefaultServer().autoTune().reportProfiling(); + DB.getDefault().autoTune().collectProfiling(); + DB.getDefault().autoTune().reportProfiling(); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java index f20a5e1a6..e89da100d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; @@ -13,10 +13,10 @@ public class TestBatchLazyMany extends BaseTestCase { ResetBasicData.reset(); - Order order2 = Ebean.getReference(Order.class, 1); + Order order2 = DB.getReference(Order.class, 1); order2.getOrderDate(); -// List list = Ebean.find(Order.class) +// List list = DB.find(Order.class) // //.join("details") // //.join("details", "+fetchquery") // .findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 465bd0450..778825a58 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -20,12 +20,12 @@ public class TestBeanReferenceRefresh extends BaseTestCase { ResetBasicData.reset(); - ServerCache beanCache = Ebean.getServerCacheManager().beanCache(Order.class); + ServerCache beanCache = DB.cacheManager().beanCache(Order.class); beanCache.clear(); - Order order = Ebean.getReference(Order.class, 1); + Order order = DB.getReference(Order.class, 1); - assertTrue(Ebean.getBeanState(order).isReference()); + assertTrue(DB.getBeanState(order).isReference()); // invoke lazy loading Date orderDate = order.getOrderDate(); @@ -34,15 +34,15 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Customer customer = order.getCustomer(); assertNotNull(customer); - assertFalse(Ebean.getBeanState(order).isReference()); + assertFalse(DB.getBeanState(order).isReference()); assertNotNull(order.getStatus()); assertNotNull(order.getDetails()); - assertNull(Ebean.getBeanState(order).getLoadedProps()); + assertNull(DB.getBeanState(order).getLoadedProps()); Status status = order.getStatus(); assertTrue(status != Order.Status.SHIPPED); order.setStatus(Order.Status.SHIPPED); - Ebean.refresh(order); + DB.refresh(order); Status statusRefresh = order.getStatus(); assertEquals(status, statusRefresh); diff --git a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java index 56f3eea3f..1d526b52e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -19,9 +19,9 @@ public class TestCreateEntityBean extends BaseTestCase { // Use `new` to construct EntityBean final EDefaultProp beanNew = new EDefaultProp(); - Ebean.save(beanNew); + DB.save(beanNew); - final EDefaultProp beanNewDb = Ebean.find(EDefaultProp.class, beanNew.getId()); + final EDefaultProp beanNewDb = DB.find(EDefaultProp.class, beanNew.getId()); assertNotNull(beanNewDb); assertEquals("defaultName", beanNew.getName()); assertNotNull(beanNewDb.geteSimple()); @@ -29,9 +29,9 @@ public class TestCreateEntityBean extends BaseTestCase { // Use `createEntityBean` to construct EntityBean and check if it behaves the same as `new` final EDefaultProp beanCreateEntityBean = DB.getDefault().createEntityBean(EDefaultProp.class); - Ebean.save(beanCreateEntityBean); + DB.save(beanCreateEntityBean); - final EDefaultProp beanCreateEntityBeanDb = Ebean.find(EDefaultProp.class, beanCreateEntityBean.getId()); + final EDefaultProp beanCreateEntityBeanDb = DB.find(EDefaultProp.class, beanCreateEntityBean.getId()); assertNotNull(beanCreateEntityBeanDb); assertEquals("defaultName", beanCreateEntityBeanDb.getName()); assertNotNull(beanCreateEntityBeanDb.geteSimple()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index 044ea4871..955b8b199 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; @@ -24,11 +24,11 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Customer c0 = ResetBasicData.createCustomer("del1", "del1 ship", "del1 bill", 1); Customer c1 = ResetBasicData.createCustomer("del2", "del2 ship", "del2 bill", 2); - Ebean.save(c0); - Ebean.save(c1); + DB.save(c0); + DB.save(c1); - Customer c0Back = Ebean.find(Customer.class, c0.getId()); - Customer c1Back = Ebean.find(Customer.class, "" + c1.getId()); + Customer c0Back = DB.find(Customer.class, c0.getId()); + Customer c1Back = DB.find(Customer.class, "" + c1.getId()); assertNotNull(c0Back); assertNotNull(c1Back); @@ -39,11 +39,11 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { ids.add("" + c1.getId()); - Ebean.deleteAll(Customer.class, ids); + DB.deleteAll(Customer.class, ids); awaitL2Cache(); - c0Back = Ebean.find(Customer.class, c0.getId()); - c1Back = Ebean.find(Customer.class, "" + c1.getId()); + c0Back = DB.find(Customer.class, c0.getId()); + c1Back = DB.find(Customer.class, "" + c1.getId()); assertNull(c0Back); assertNull(c1Back); @@ -57,8 +57,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Order order0 = ResetBasicData.createOrderCustAndOrder("delBySql 0"); Order order1 = ResetBasicData.createOrderCustAndOrder("delBySql 1"); - Order o0Back = Ebean.find(Order.class, order0.getId()); - Order o1Back = Ebean.find(Order.class, order1.getId()); + Order o0Back = DB.find(Order.class, order0.getId()); + Order o1Back = DB.find(Order.class, order1.getId()); assertNotNull(o0Back); assertNotNull(o1Back); @@ -69,11 +69,11 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { ids.add(order0.getId()); ids.add(order1.getId()); - Ebean.deleteAll(Order.class, ids); + DB.deleteAll(Order.class, ids); awaitL2Cache(); - o0Back = Ebean.find(Order.class, order0.getId()); - o1Back = Ebean.find(Order.class, order1.getId()); + o0Back = DB.find(Order.class, order0.getId()); + o1Back = DB.find(Order.class, order1.getId()); assertNull(o0Back); assertNull(o1Back); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index 74b88e648..ba2e50621 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; import org.junit.jupiter.api.Test; @@ -15,18 +15,18 @@ public class TestDeleteImportedPartial extends BaseTestCase { PFile persistentFile = new PFile("test.txt", new PFileContent("test".getBytes())); - Ebean.save(persistentFile); + DB.save(persistentFile); Integer id = persistentFile.getId(); Integer contentId = persistentFile.getFileContent().getId(); - PFile partialPfile = Ebean.find(PFile.class).select("id").where().idEq(persistentFile.getId()) + PFile partialPfile = DB.find(PFile.class).select("id").where().idEq(persistentFile.getId()) .findOne(); // should delete file and fileContent - Ebean.delete(partialPfile); + DB.delete(partialPfile); - PFile file1 = Ebean.find(PFile.class, id); - PFileContent content1 = Ebean.find(PFileContent.class, contentId); + PFile file1 = DB.find(PFile.class, id); + PFileContent content1 = DB.find(PFileContent.class, contentId); assertNull(file1); assertNull(content1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 77e3d4d7f..9db52ad7f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; import org.junit.jupiter.api.Test; @@ -16,15 +16,15 @@ public class TestDeleteOneToOne extends BaseTestCase { PersistentFile persistentFile = new PersistentFile("test.txt", new PersistentFileContent( "test".getBytes())); - Ebean.save(persistentFile); + DB.save(persistentFile); Integer id = persistentFile.getId(); Integer contentId = persistentFile.getPersistentFileContent().getId(); // should delete file and fileContent - Ebean.delete(PersistentFile.class, id); + DB.delete(PersistentFile.class, id); - PersistentFile file1 = Ebean.find(PersistentFile.class, id); - PersistentFileContent content1 = Ebean.find(PersistentFileContent.class, contentId); + PersistentFile file1 = DB.find(PersistentFile.class, id); + PersistentFileContent content1 = DB.find(PersistentFileContent.class, contentId); assertNull(file1); assertNull(content1); @@ -38,11 +38,11 @@ public class TestDeleteOneToOne extends BaseTestCase { // c.addContact(new Contact("Fiona", "Black")); // c.addContact(new Contact("Tracy", "Red")); // - // Ebean.save(c); + // DB.save(c); // - // Ebean.delete(Customer.class, c.getId()); + // DB.delete(Customer.class, c.getId()); // - // Customer deletedCustomer = Ebean.find(Customer.class, c.getId()); + // Customer deletedCustomer = DB.find(Customer.class, c.getId()); // // assertNull(deletedCustomer); // diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index 2ce2b3c5d..d130bf67d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; import org.junit.jupiter.api.Test; @@ -20,15 +20,15 @@ public class TestDeleteOneToOneMultiple extends BaseTestCase { // content.setContent("test".getBytes()); // persistentFile.setFileContent(content); - Ebean.save(persistentFile); + DB.save(persistentFile); Integer id = persistentFile.getId(); Integer contentId = persistentFile.getFileContent().getId(); // should delete file and fileContent - Ebean.delete(PFile.class, id); + DB.delete(PFile.class, id); - PFile file1 = Ebean.find(PFile.class, id); - PFileContent content1 = Ebean.find(PFileContent.class, contentId); + PFile file1 = DB.find(PFile.class, id); + PFileContent content1 = DB.find(PFileContent.class, contentId); assertNull(file1); assertNull(content1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index d5c69a2a1..6c86524c4 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; @@ -15,10 +15,10 @@ public class TestDeletePartialNoVersion extends BaseTestCase { TMapSuperEntity e = new TMapSuperEntity(); e.setName("babanaone"); - Ebean.save(e); + DB.save(e); // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + TMapSuperEntity e2 = DB.find(TMapSuperEntity.class) .where().idEq(e.getId()) .select("id, name") .findOne(); @@ -26,9 +26,9 @@ public class TestDeletePartialNoVersion extends BaseTestCase { assertNotNull(e2); e2.setName("banaban2"); - Ebean.save(e2); + DB.save(e2); - Ebean.delete(e2); + DB.delete(e2); } @@ -37,10 +37,10 @@ public class TestDeletePartialNoVersion extends BaseTestCase { TMapSuperEntity e = new TMapSuperEntity(); e.setName("babanatwo"); - Ebean.save(e); + DB.save(e); // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + TMapSuperEntity e2 = DB.find(TMapSuperEntity.class) .where().idEq(e.getId()) .select("id, name, version") .findOne(); @@ -48,8 +48,8 @@ public class TestDeletePartialNoVersion extends BaseTestCase { assertNotNull(e2); e2.setName("banaban2two"); - Ebean.save(e2); + DB.save(e2); - Ebean.delete(e2); + DB.delete(e2); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java index c0f31775f..8197c1bfc 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.embedded.EMain; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ public class TestDynamicUpdate extends BaseTestCase { b.setName("aaa"); b.getEmbeddable().setDescription("123"); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); server.save(b); diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index c1ef80247..109d4c5f8 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestEnhancementCollectionInitialisation extends BaseTestCase { @Test public void testListInitialisation() { Customer customer = new Customer(); - BeanState beanState = Ebean.getBeanState(customer); + BeanState beanState = DB.getBeanState(customer); if (beanState != null) { List orders = customer.getOrders(); assertNotNull(orders); diff --git a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java index 0147c0b25..97b057392 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -15,7 +15,7 @@ public class TestErrorBindLog extends BaseTestCase { public void test() { try { - Ebean.find(Order.class).where().gt("id", "JUNK").findList(); + DB.find(Order.class).where().gt("id", "JUNK").findList(); } catch (PersistenceException e) { String msg = e.getMessage(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java index baf77c061..80a2c24ca 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -1,8 +1,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.MyEBasicConfigStartup; @@ -18,7 +18,7 @@ public class TestExplicitInsert extends BaseTestCase { @Test public void setId_when_converted() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Customer cust = new Customer(); Object returnId = server.beanId(cust, "42"); @@ -30,7 +30,7 @@ public class TestExplicitInsert extends BaseTestCase { @Test public void setId_when_correctType() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Customer customer = new Customer(); Object returnId = server.beanId(customer, 42); @@ -51,7 +51,7 @@ public class TestExplicitInsert extends BaseTestCase { b.setDescription("explicit insert"); b.setStatus(EBasic.Status.ACTIVE); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.insert(b); assertNotNull(b.getId()); assertEquals(b.getId(), server.beanId(b)); diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java index cfc14dd36..8467abad1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; import io.ebeantest.LoggedSql; @@ -24,7 +24,7 @@ public class TestFetchId extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .where().gt("id", 1) @@ -46,10 +46,10 @@ public class TestFetchId extends BaseTestCase { ResetBasicData.reset(); - Query subQuery = Ebean.find(OrderDetail.class) + Query subQuery = DB.find(OrderDetail.class) .alias("sq") .where().raw("details.id = sq.id").query(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().exists(subQuery) .orderBy("orderDate").query(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java index e7dd22ce3..f80c513c7 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestInEmpty extends BaseTestCase { @Test public void test_in_empty() { - Query query = Ebean.find(Order.class).where().in("id", new Object[0]).gt("id", 0) + Query query = DB.find(Order.class).where().in("id", new Object[0]).gt("id", 0) .query(); List list = query.findList(); @@ -27,7 +27,7 @@ public class TestInEmpty extends BaseTestCase { @Test public void test_isIn_empty() { - Query query = Ebean.find(Order.class).where().isIn("id", new Object[0]).gt("id", 0) + Query query = DB.find(Order.class).where().isIn("id", new Object[0]).gt("id", 0) .query(); List list = query.findList(); @@ -38,7 +38,7 @@ public class TestInEmpty extends BaseTestCase { @Test public void test_notIn_empty() { - Query query = Ebean.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0) + Query query = DB.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0) .query(); query.findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java index f8515ee6d..2df6b2667 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; @@ -17,21 +17,21 @@ public class TestInheritRef extends BaseTestCase { @Test public void testAssocOne() { - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Ebean.createUpdate(Vehicle.class, "delete from vehicle"); + DB.createUpdate(Vehicle.class, "delete from vehicle"); Car c = new Car(); c.setLicenseNumber("C6788"); c.setDriver("CarDriver"); - Ebean.save(c); + DB.save(c); Truck t = new Truck(); t.setLicenseNumber("T1098BBX"); t.setCapacity(20D); - Ebean.save(t); + DB.save(t); - List list = Ebean.find(Vehicle.class) + List list = DB.find(Vehicle.class) .setAutoTune(false) .findList(); @@ -54,7 +54,7 @@ public class TestInheritRef extends BaseTestCase { assertTrue(foundTruck.getCapacity() == 20D); } finally { - Ebean.rollbackTransaction(); + DB.rollbackTransaction(); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index 0fff445fd..56ffb4c38 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -18,7 +18,7 @@ public class TestJodaType extends BaseTestCase { @Test public void test() { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); ScalarType scalarType = beanProperty.getScalarType(); @@ -33,9 +33,9 @@ public class TestJodaType extends BaseTestCase { TJodaEntity bean = new TJodaEntity(); bean.setLocalTime(now); - Ebean.save(bean); + DB.save(bean); - TJodaEntity foundBean = Ebean.find(TJodaEntity.class, bean.getId()); + TJodaEntity foundBean = DB.find(TJodaEntity.class, bean.getId()); assertThat(foundBean.getLocalTime()).isEqualTo(bean.getLocalTime()); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java index 9d5282c42..f9548cc36 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Address; import org.tests.model.basic.Car; import org.tests.model.basic.Trip; @@ -32,7 +32,7 @@ public class TestJoinInheritance extends BaseTestCase { @Test public void testJoinHierarchyAssocOne() { - Ebean.createUpdate(Vehicle.class, "delete from vehicle"); + DB.createUpdate(Vehicle.class, "delete from vehicle"); Address address = new Address(); @@ -42,20 +42,20 @@ public class TestJoinInheritance extends BaseTestCase { address.setCretime(new Timestamp(new Date().getTime())); - Ebean.save(address); + DB.save(address); Car c = new Car(); c.setLicenseNumber("C6788"); c.setDriver("CarDriver"); c.setRegistrationDate(new Date()); - Ebean.save(c); + DB.save(c); VehicleDriver driver = new VehicleDriver(); driver.setVehicle(c); driver.setAddress(address); driver.setLicenseIssuedOn(new Date()); - Ebean.save(driver); + DB.save(driver); final String line1 = "Street1"; final String line2 = "Street2"; @@ -67,13 +67,13 @@ public class TestJoinInheritance extends BaseTestCase { address1.setLine1(line1); address1.setLine2(line2); address1.setCity(city); - Ebean.save(address1); + DB.save(address1); Trip trip = new Trip(); trip.setVehicleDriver(driver); trip.setAddress(address1); trip.setCretime(new Timestamp(new Date().getTime())); - Ebean.save(trip); + DB.save(trip); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index dd3d69ff6..2bf0d083a 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -21,9 +21,9 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { Customer c = new Customer(); c.setName("testll"); - Ebean.save(c); + DB.save(c); - Customer c1 = Ebean.find(Customer.class) + Customer c1 = DB.find(Customer.class) .setAutoTune(false) .select("id") .fetch("contacts", "id") @@ -36,6 +36,6 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { assertTrue(sz == 0); // cleanup - Ebean.delete(c1); + DB.delete(c1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 87c1affee..2ebcd02e6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; @@ -22,7 +22,7 @@ public class TestLazyLoadInCache extends BaseTestCase { ResetBasicData.reset(); - Map map = Ebean.find(Customer.class) + Map map = DB.find(Customer.class) .select("id, name") .setBeanCacheMode(CacheMode.PUT) .setReadOnly(true) @@ -35,14 +35,14 @@ public class TestLazyLoadInCache extends BaseTestCase { Customer cust1 = map.get(id); - Customer cust1B = Ebean.find(Customer.class) + Customer cust1B = DB.find(Customer.class) .setReadOnly(true) .setId(id) .findOne(); assertTrue(cust1 != cust1B); - Set loadedProps = Ebean.getBeanState(cust1).getLoadedProps(); + Set loadedProps = DB.getBeanState(cust1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("status")); @@ -51,7 +51,7 @@ public class TestLazyLoadInCache extends BaseTestCase { // a readOnly reference Address billingAddress = cust1.getBillingAddress(); - BeanState billAddrState = Ebean.getBeanState(billingAddress); + BeanState billAddrState = DB.beanState(billingAddress); assertTrue(billAddrState.isReference()); assertTrue(billAddrState.isReadOnly()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java index b499d207b..8d7eb92f0 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -27,7 +27,7 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) @@ -49,7 +49,7 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) @@ -72,7 +72,7 @@ public class TestLimitQuery extends BaseTestCase { public void testDefaults() { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) @@ -93,7 +93,7 @@ public class TestLimitQuery extends BaseTestCase { private void rob() { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) @@ -117,7 +117,7 @@ public class TestLimitQuery extends BaseTestCase { assertTrue(hasLimit); } - query = Ebean.find(Order.class) + query = DB.find(Order.class) .setAutoTune(false) .fetch("details") .setMaxRows(10); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java index cca4587c5..beb486ed9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestLoadBeanCache extends BaseTestCase { ResetBasicData.reset(); - Map map = Ebean.find(Country.class) + Map map = DB.find(Country.class) .setLoadBeanCache(true) .setUseQueryCache(true) .setReadOnly(true) @@ -27,7 +27,7 @@ public class TestLoadBeanCache extends BaseTestCase { Country loadedNz = map.get("NZ"); // this will hit the cache - Country nz = Ebean.find(Country.class, "NZ"); + Country nz = DB.find(Country.class, "NZ"); assertTrue(loadedNz == nz); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java index 08ea3ec65..884571f8e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -21,18 +21,18 @@ public class TestLogTransLogOnError extends BaseTestCase { ResetBasicData.reset(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { - Ebean.find(Customer.class).findList(); - Ebean.find(Order.class).where().gt("id", 1).findList(); + DB.find(Customer.class).findList(); + DB.find(Order.class).where().gt("id", 1).findList(); EBasicVer newBean = new EBasicVer("aName"); newBean.setDescription("something"); - // Ebean.save(newBean); + // DB.save(newBean); // t.log("--- next query should error"); - List list = Ebean.find(Customer.class).where().eq("id", "NotAnInt!!").findList(); + List list = DB.find(Customer.class).where().eq("id", "NotAnInt!!").findList(); assertEquals(0, list.size()); // Get here with mysql? @@ -49,8 +49,8 @@ public class TestLogTransLogOnError extends BaseTestCase { ResetBasicData.reset(); - try (Transaction txn = Ebean.beginTransaction()) { - Ebean.find(Customer.class).findList(); + try (Transaction txn = DB.beginTransaction()) { + DB.find(Customer.class).findList(); EBasicVer newBean = new EBasicVer("aName"); newBean @@ -60,7 +60,7 @@ public class TestLogTransLogOnError extends BaseTestCase { + "dfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs "); // t.log("--- next insert should error"); - Ebean.save(newBean); + DB.save(newBean); // never get here assertTrue(false); diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java index 4e23d4904..fce2ed0ba 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; @@ -16,28 +16,28 @@ public class TestM2MCascadeOne extends BaseTestCase { u.setUserName("testM2M"); u.getRoles(); - Ebean.save(u); + DB.save(u); MRole r0 = new MRole(); r0.setRoleName("rol_0"); - Ebean.save(r0); + DB.save(r0); MRole r1 = new MRole(); r1.setRoleName("rol_1"); - MUser u1 = Ebean.find(MUser.class, u.getUserid()); + MUser u1 = DB.find(MUser.class, u.getUserid()); u1.addRole(r0); u1.addRole(r1); - Ebean.save(u1); + DB.save(u1); } @Test public void testRawPredicate_with_ManyToManyPath() { - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .select("userid") .where().raw("roles.roleid in (?)", 24) .query(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java index 76393ea15..8137cf2fa 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -47,7 +47,7 @@ public class TestM2MVanilla extends BaseTestCase { user.setRoles(roleList); DB.save(user); - // Ebean.saveManyToManyAssociations(user, "roles"); + // DB.saveManyToManyAssociations(user, "roles"); MUser checkUser = DB.find(MUser.class, u0.getUserid()); List checkRoles = checkUser.getRoles(); @@ -57,7 +57,7 @@ public class TestM2MVanilla extends BaseTestCase { checkRoles.add(r3); DB.save(checkUser); - // Ebean.saveManyToManyAssociations(checkUser, "roles"); + // DB.saveManyToManyAssociations(checkUser, "roles"); MUser checkUser2 = DB.find(MUser.class, u0.getUserid()); List checkRoles2 = checkUser2.getRoles(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java index 36948823b..ca55ea535 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; @@ -21,14 +21,14 @@ public class TestManyLazyLoad extends BaseTestCase { awaitL2Cache(); - List list = Ebean.find(Order.class).order().asc("id").findList(); + List list = DB.find(Order.class).order().asc("id").findList(); assertFalse(list.isEmpty()); // just use the first one Order order = list.get(0); // get it as a reference - Order order1 = Ebean.getReference(Order.class, order.getId()); + Order order1 = DB.getReference(Order.class, order.getId()); assertNotNull(order1); Date orderDate = order1.getOrderDate(); @@ -45,10 +45,10 @@ public class TestManyLazyLoad extends BaseTestCase { assertSame(o, order1); // load detail into cache - Ebean.find(OrderDetail.class, orderDetail.getId()); + DB.find(OrderDetail.class, orderDetail.getId()); // change order... list before a scalar property - Order order2 = Ebean.getReference(Order.class, order.getId()); + Order order2 = DB.getReference(Order.class, order.getId()); assertNotNull(order2); List details2 = order2.getDetails(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java index a291c97fe..eab068fec 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.ResetBasicData; import org.tests.model.interfaces.Address; import org.tests.model.interfaces.IAddress; @@ -22,8 +22,8 @@ public class TestManyOneInterface extends BaseTestCase { p.setDefaultAddress(a); - Ebean.save(a); - Ebean.save(p); + DB.save(a); + DB.save(p); //Assert.assertTrue(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java index 41e1598b6..a43efaccf 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; @@ -15,10 +15,10 @@ public class TestMappedSuper extends BaseTestCase { TMapSuperEntity e = new TMapSuperEntity(); e.setName("babana"); - Ebean.save(e); + DB.save(e); // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + TMapSuperEntity e2 = DB.find(TMapSuperEntity.class) .where().idEq(e.getId()) .select("id, name, myint, someObject, bananan") .findOne(); @@ -28,9 +28,9 @@ public class TestMappedSuper extends BaseTestCase { TMapSuperEntity eSaveDelete = new TMapSuperEntity(); eSaveDelete.setName("babana"); - Ebean.save(eSaveDelete); + DB.save(eSaveDelete); - Ebean.delete(eSaveDelete); + DB.delete(eSaveDelete); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java index d8f74ee54..1aef8eb4f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.Platform; import io.ebean.annotation.IgnorePlatform; import org.tests.model.basic.Address; @@ -31,7 +31,7 @@ public class TestMetaAnnotation extends BaseTestCase { Address address = new Address(); address.setLine1(spaces100); - Ebean.save(address); + DB.save(address); } /** @@ -42,7 +42,7 @@ public class TestMetaAnnotation extends BaseTestCase { Address address = new Address(); address.setLine2(spaces100); - Ebean.save(address); + DB.save(address); } /** @@ -55,7 +55,7 @@ public class TestMetaAnnotation extends BaseTestCase { Address address = new Address(); address.setLine1(spaces101); try { - Ebean.save(address); + DB.save(address); fail("Test failed, Could insert a too long string"); } catch (PersistenceException e) { assertTrue(true); @@ -72,7 +72,7 @@ public class TestMetaAnnotation extends BaseTestCase { Address address = new Address(); address.setLine2(spaces101); try { - Ebean.save(address); + DB.save(address); fail("Test failed, Could insert a too long string"); } catch (PersistenceException e) { assertTrue(true); diff --git a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index 8d501bfb0..3a9079788 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCar; @@ -28,9 +28,9 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { car.setName("test car"); car.setEngine(engine); - try (Transaction txn = Ebean.beginTransaction()) { - Ebean.save(gearBox); - Ebean.save(car); + try (Transaction txn = DB.beginTransaction()) { + DB.save(gearBox); + DB.save(car); assertNotNull(car.getId()); assertNotNull(engine.getEngineId()); @@ -38,7 +38,7 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { txn.commit(); } - OCar c2 = Ebean.find(OCar.class, car.getId()); + OCar c2 = DB.find(OCar.class, car.getId()); assertNotNull(c2); assertNotNull(c2.getEngine()); // gearBox not assigned yet @@ -46,10 +46,10 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { // ok, assign gearBox c2.setGearBox(gearBox); - Ebean.save(c2); + DB.save(c2); // now all should be there... - OCar c3 = Ebean.find(OCar.class, car.getId()); + OCar c3 = DB.find(OCar.class, car.getId()); assertNotNull(c3); assertNotNull(c3.getEngine()); assertNotNull(c3.getGearBox()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java index 567b30482..ea0fb44b7 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.MNonUpdPropEntity; import org.junit.jupiter.api.Test; @@ -14,12 +14,12 @@ public class TestNonUpdateProperty extends BaseTestCase { e.setName("name"); e.setNote("note"); - Ebean.save(e); + DB.save(e); - MNonUpdPropEntity e2 = Ebean.find(MNonUpdPropEntity.class, e.getId()); + MNonUpdPropEntity e2 = DB.find(MNonUpdPropEntity.class, e.getId()); e2.setName("mod"); - Ebean.update(e2); + DB.update(e2); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java index 9559f6ca8..848a9dde7 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; @@ -20,12 +20,12 @@ public class TestOrderByAnnotation extends TransactionalTestCase { Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn"); - Customer customer = Ebean.find(Customer.class, custTest.getId()); + Customer customer = DB.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); assertTrue(!orders.isEmpty()); - Query q1 = Ebean.find(Order.class) + Query q1 = DB.find(Order.class) .fetch("details"); q1.findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 1362b7fdf..6c1fdb0c4 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -16,7 +16,7 @@ public class TestOrderTotalAmountFormula extends BaseTestCase { ResetBasicData.reset(); - List l0 = Ebean.find(Customer.class) + List l0 = DB.find(Customer.class) .select("id, name") .fetch("orders", "status, totalAmount") .where() diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 66c58b6c2..4de0887c7 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -24,7 +24,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create(); List l0 = - Ebean.find(OrderAggregate.class) + DB.find(OrderAggregate.class) .setRawSql(rawSql) .findList(); @@ -32,7 +32,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { r0.toString(); } - List l2 = Ebean.createQuery(OrderAggregate.class) + List l2 = DB.createQuery(OrderAggregate.class) .setRawSql(rawSql) .where().gt("order.id", 0) .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); @@ -57,7 +57,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { .columnMapping("order_id", "order.id") .create(); - Query query = Ebean.find(OrderAggregate.class) + Query query = DB.find(OrderAggregate.class) .setRawSql(rawSql); query.findList(); @@ -79,7 +79,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { .columnMapping("order_id", "order.id") .create(); - Query query = Ebean.find(OrderAggregate.class) + Query query = DB.find(OrderAggregate.class) .setRawSql(rawSql); query.findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java index 07310f349..c9c282ec3 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -19,15 +19,15 @@ public class TestPersistenceContext extends BaseTestCase { // implicit transaction with its own // persistence context - Order oBefore = Ebean.find(Order.class, 1); + Order oBefore = DB.find(Order.class, 1); Order order = null; // start a persistence context - Ebean.beginTransaction(); + DB.beginTransaction(); try { - order = Ebean.find(Order.class, 1); + order = DB.find(Order.class, 1); // not the same instance ...as a different // persistence context @@ -36,45 +36,45 @@ public class TestPersistenceContext extends BaseTestCase { // 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); + Order o2 = DB.find(Order.class, 1); + Order o3 = DB.getReference(Order.class, 1); // all the same instance assertTrue(order == o2); assertTrue(order == o3); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } // implicit transaction with its own // persistence context - Order oAfter = Ebean.find(Order.class, 1); + Order oAfter = DB.find(Order.class, 1); assertTrue(oAfter != oBefore); assertTrue(oAfter != order); // start a persistence context - Ebean.beginTransaction(); + DB.beginTransaction(); try { Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC"); Integer id = testOrder.getCustomer().getId(); Integer orderId = testOrder.getId(); - Customer customer = Ebean.find(Customer.class) + Customer customer = DB.find(Customer.class) .setUseCache(false) .setId(id) .findOne(); System.gc(); - Order order2 = Ebean.find(Order.class, orderId); + Order order2 = DB.find(Order.class, orderId); Customer customer2 = order2.getCustomer(); assertEquals(customer.getId(), customer2.getId()); assertTrue(customer == customer2); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java index 3ba345b9d..ef755a30d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ public class TestQueryWhereBetween extends BaseTestCase { Timestamp t = new Timestamp(System.currentTimeMillis()); - Query query = Ebean.find(Order.class).setAutoTune(false).where() + Query query = DB.find(Order.class).setAutoTune(false).where() .betweenProperties("cretime", "updtime", t).order().asc("orderDate").order().desc("id"); query.findList(); @@ -88,7 +88,7 @@ public class TestQueryWhereBetween extends BaseTestCase { Timestamp t = new Timestamp(System.currentTimeMillis()); - Query query = Ebean.find(Order.class).setAutoTune(false) + Query query = DB.find(Order.class).setAutoTune(false) .where() .le("cretime", t) .order().asc("orderDate") diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 8ff0561ae..078c2eb43 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; @@ -22,7 +22,7 @@ public class TestQueryWithCache extends BaseTestCase { ResetBasicData.reset(); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(Country.class); CacheOptions cacheOptions = beanDescriptor.getCacheOptions(); @@ -36,19 +36,19 @@ public class TestQueryWithCache extends BaseTestCase { ServerCache beanCache = serverCacheManager.beanCache(Country.class); assertEquals(0, beanCache.size()); - Country nz1 = Ebean.getReference(Country.class, "NZ"); + Country nz1 = DB.getReference(Country.class, "NZ"); assertEquals(0, beanCache.size()); // has the effect of loading the cache via lazy loading nz1.getName(); assertEquals(1, beanCache.size()); - Country nz2 = Ebean.getReference(Country.class, "NZ"); - Country nz2b = Ebean.getReference(Country.class, "NZ"); + Country nz2 = DB.getReference(Country.class, "NZ"); + Country nz2b = DB.getReference(Country.class, "NZ"); - Country nz3 = Ebean.find(Country.class, "NZ"); + Country nz3 = DB.find(Country.class, "NZ"); - Country nz4 = Ebean.find(Country.class).setId("NZ").setAutoTune(false).setUseCache(false) + Country nz4 = DB.find(Country.class).setId("NZ").setAutoTune(false).setUseCache(false) .findOne(); assertTrue(nz2 == nz2b); @@ -62,9 +62,9 @@ public class TestQueryWithCache extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(Country.class, "NZ"); + DB.find(Country.class, "NZ"); - Query query = Ebean.find(Country.class).setId("NZ").setUseCache(false); + Query query = DB.find(Country.class).setId("NZ").setUseCache(false); query.findOne(); assertSql(query).isNotNull(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 6e150e80e..f7cb9eadd 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -23,7 +23,7 @@ public class TestReadOnlyPropagation extends BaseTestCase { public void testReadOnly() { ResetBasicData.reset(); - DB.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); Order order = DB.find(Order.class) .setReadOnly(true) diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index e4aa4d488..320f16ea0 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; import org.junit.jupiter.api.Test; @@ -15,8 +15,8 @@ public class TestSaveDeleteOneToOne extends BaseTestCase { PersistentFile persistentFile = new PersistentFile("test.txt", new PersistentFileContent("test".getBytes())); - Ebean.save(persistentFile); - Ebean.delete(persistentFile); + DB.save(persistentFile); + DB.delete(persistentFile); } @Test @@ -24,15 +24,15 @@ public class TestSaveDeleteOneToOne extends BaseTestCase { PersistentFile persistentFile = new PersistentFile("test.txt", new PersistentFileContent("test".getBytes())); - Ebean.save(persistentFile); + DB.save(persistentFile); - persistentFile = Ebean.find(PersistentFile.class, persistentFile.getId()); + persistentFile = DB.find(PersistentFile.class, persistentFile.getId()); PersistentFileContent persistentFileContent = persistentFile.getPersistentFileContent(); assertNotNull(persistentFileContent); assertNotNull(persistentFileContent.getContent()); - Ebean.delete(persistentFile); + DB.delete(persistentFile); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 96b0b8536..660366c12 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; import org.junit.jupiter.api.Test; @@ -14,8 +14,8 @@ public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { // PFile persistentFile = new PFile("test.txt", // new PFileContent("test".getBytes())); // -// Ebean.save(persistentFile); -// Ebean.delete(persistentFile); +// DB.save(persistentFile); +// DB.delete(persistentFile); // } @Test @@ -23,14 +23,14 @@ public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { PFile persistentFile = new PFile("test.txt", new PFileContent("test".getBytes())); - Ebean.save(persistentFile); + DB.save(persistentFile); - persistentFile = Ebean.find(PFile.class, persistentFile.getId()); + persistentFile = DB.find(PFile.class, persistentFile.getId()); PFileContent persistentFileContent = persistentFile.getFileContent(); assertNotNull(persistentFileContent); assertNotNull(persistentFileContent.getContent()); - Ebean.delete(persistentFile); + DB.delete(persistentFile); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index af865e1ac..246dbed07 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -24,9 +24,9 @@ public class TestSharedInstancePropagation extends BaseTestCase { ResetBasicData.reset(); - Ebean.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); - Order order = Ebean.find(Order.class) + Order order = DB.find(Order.class) .setAutoTune(false) .setReadOnly(true) .setId(1) @@ -34,7 +34,7 @@ public class TestSharedInstancePropagation extends BaseTestCase { assertNotNull(order); - assertTrue(Ebean.getBeanState(order).isReadOnly()); + assertTrue(DB.getBeanState(order).isReadOnly()); List details = order.getDetails(); BeanCollection bc = (BeanCollection) details; @@ -48,16 +48,16 @@ public class TestSharedInstancePropagation extends BaseTestCase { assertTrue(!bc.isEmpty()); OrderDetail detail = details.get(0); - assertTrue(Ebean.getBeanState(detail).isReadOnly()); - assertFalse(Ebean.getBeanState(detail).isReference()); + assertTrue(DB.getBeanState(detail).isReadOnly()); + assertFalse(DB.getBeanState(detail).isReference()); Product product = detail.getProduct(); - assertTrue(Ebean.getBeanState(product).isReadOnly()); + assertTrue(DB.getBeanState(product).isReadOnly()); // lazy load product.getName(); - assertFalse(Ebean.getBeanState(product).isReference()); + assertFalse(DB.getBeanState(product).isReference()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java index 8e7f4a0c3..cf40d4890 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -16,9 +16,9 @@ public class TestUpdateManyToOne extends BaseTestCase { ResetBasicData.reset(); - List custs = Ebean.find(Customer.class).findList(); + List custs = DB.find(Customer.class).findList(); - List orders = Ebean.find(Order.class).setMaxRows(1).findList(); + List orders = DB.find(Order.class).setMaxRows(1).findList(); Order order = orders.get(0); Customer customer = order.getCustomer(); @@ -31,10 +31,10 @@ public class TestUpdateManyToOne extends BaseTestCase { } } order.setCustomer(changeCust); - Ebean.save(order); + DB.save(order); order.setCustomer(customer); - Ebean.save(order); + DB.save(order); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java index bf28864c6..cf0c7ade7 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TUuidEntity; import org.junit.jupiter.api.Test; @@ -13,13 +13,13 @@ public class TestUuidInsert extends BaseTestCase { TUuidEntity e = new TUuidEntity(); e.setName("bana"); - Ebean.save(e); + DB.save(e); - TUuidEntity e2 = Ebean.find(TUuidEntity.class, e.getId()); + TUuidEntity e2 = DB.find(TUuidEntity.class, e.getId()); e2.setName("apple"); - Ebean.save(e2); + DB.save(e2); - Ebean.delete(e2); + DB.delete(e2); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 0b224683d..9a4b48729 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; import org.junit.jupiter.api.Test; @@ -23,22 +23,22 @@ public class TestUuidInsertMasterDetail extends BaseTestCase { one.setName("some one"); one.setComments(list); - Ebean.save(one); + DB.save(one); - UUOne oneB = Ebean.find(UUOne.class, one.getId()); + UUOne oneB = DB.find(UUOne.class, one.getId()); UUTwo twoB = new UUTwo(); twoB.setName("another something"); oneB.getComments().add(twoB); - Ebean.save(oneB); + DB.save(oneB); } public void testNullFK() { UUTwo two = new UUTwo(); two.setName("something"); - Ebean.save(two); + DB.save(two); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java index 01877eca9..ad2f35453 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; @@ -21,12 +21,12 @@ public class TestWhereAnnotation extends TransactionalTestCase { Customer custTest = ResetBasicData.createCustAndOrder("testWhereAnn"); - Customer customer = Ebean.find(Customer.class, custTest.getId()); + Customer customer = DB.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); assertTrue(!orders.isEmpty()); - Query q1 = Ebean.find(Customer.class).setUseCache(false).fetch("orders").where() + Query q1 = DB.find(Customer.class).setUseCache(false).fetch("orders").where() .idEq(1).query(); q1.findOne(); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 940af23ad..bb8c0c554 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -1,7 +1,7 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -21,8 +21,8 @@ public class TestDeleteByIdList extends BaseTestCase { ResetBasicData.reset(); - OrderDetail dummy = Ebean.getReference(OrderDetail.class, 1); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + OrderDetail dummy = DB.getReference(OrderDetail.class, 1); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer c0 = ResetBasicData.createCustAndOrder("DelIdList-0"); @@ -30,13 +30,13 @@ public class TestDeleteByIdList extends BaseTestCase { Customer c1 = ResetBasicData.createCustAndOrder("DelIdList-1"); - List orderIds = Ebean.find(Order.class).where().in("customer", c0, c1).findIds(); + List orderIds = DB.find(Order.class).where().in("customer", c0, c1).findIds(); assertEquals(2, orderIds.size()); - Ebean.deleteAll(Order.class, orderIds); - Ebean.delete(c0); - Ebean.delete(c1); + DB.deleteAll(Order.class, orderIds); + DB.delete(c0); + DB.delete(c1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index f0881d9db..2b7129050 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -1,7 +1,7 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -21,22 +21,22 @@ public class TestDeleteCascadeById extends BaseTestCase { ResetBasicData.reset(); - OrderDetail dummy = Ebean.getReference(OrderDetail.class, 1); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + OrderDetail dummy = DB.getReference(OrderDetail.class, 1); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer cust = ResetBasicData.createCustAndOrder("DelCas"); assertNotNull(cust); - List orders = Ebean.find(Order.class).where().eq("customer", cust).findList(); + List orders = DB.find(Order.class).where().eq("customer", cust).findList(); assertEquals(1, orders.size()); Order o = orders.get(0); assertNotNull(o); // cleanup - Ebean.delete(o); - Ebean.delete(cust); + DB.delete(o); + DB.delete(cust); } } diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java index f42b1a8f2..5a101c208 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java @@ -1,7 +1,7 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -15,35 +15,35 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { private OtoUser testUser; private OtoUserOptional userOptional; - private Query userOptionalQuery = Ebean.find(OtoUserOptional.class); - private Query userQuery = Ebean.find(OtoUser.class); + private Query userOptionalQuery = DB.find(OtoUserOptional.class); + private Query userQuery = DB.find(OtoUser.class); /** * Init each test. Delete all existing beans. Then create OtoUser, add OtoUserOptional and save. */ @BeforeEach public void init() { - Ebean.deleteAll(userQuery.findList()); - Ebean.deleteAll(userOptionalQuery.findList()); + DB.deleteAll(userQuery.findList()); + DB.deleteAll(userOptionalQuery.findList()); userOptional = new OtoUserOptional(); - Ebean.save(userOptional); + DB.save(userOptional); testUser = new OtoUser(); testUser.setOptional(userOptional); - Ebean.save(testUser); + DB.save(testUser); } /** - * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE + * Test that validates deleting a bean using DB.delete() respects the CascadeType.DELETE * setting. */ @Test public void testDeleteCascadeByEbeanDelete() { - assertThat(Ebean.delete(testUser)).isTrue(); + assertThat(DB.delete(testUser)).isTrue(); assertThat(userOptionalQuery.findCount()) - .overridingErrorMessage("Entity OtoUserOptional found. Ebean.delete() on the user " + .overridingErrorMessage("Entity OtoUserOptional found. DB.delete() on the user " + "did not delete the OneToOne mapped entity as set with CascadeType.ALL") .isEqualTo(0); } @@ -68,7 +68,7 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { */ @AfterEach public void cleanup() { - Ebean.deleteAll(userQuery.findList()); - Ebean.deleteAll(userOptionalQuery.findList()); + DB.deleteAll(userQuery.findList()); + DB.deleteAll(userOptionalQuery.findList()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java index 90eef2c71..ff941438b 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java @@ -1,7 +1,7 @@ package org.tests.basic.encrypt; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptClient; @@ -21,9 +21,9 @@ public class TestEncryptClientSide extends BaseTestCase { bean.setStatus(EBasicEncryptClient.Status.ONE); bean.setDob(today); - Ebean.save(bean); + DB.save(bean); - EBasicEncryptClient found = Ebean.find(EBasicEncryptClient.class) + EBasicEncryptClient found = DB.find(EBasicEncryptClient.class) .where() .eq("description", "hello") .eq("status", EBasicEncryptClient.Status.ONE) @@ -38,9 +38,9 @@ public class TestEncryptClientSide extends BaseTestCase { found.setDescription("goodbye"); found.setStatus(EBasicEncryptClient.Status.TWO); - Ebean.save(found); + DB.save(found); - found = Ebean.find(EBasicEncryptClient.class) + found = DB.find(EBasicEncryptClient.class) .where() .eq("description", "goodbye") .eq("status", EBasicEncryptClient.Status.TWO) @@ -50,6 +50,6 @@ public class TestEncryptClientSide extends BaseTestCase { assertThat(found).isNotNull(); assertThat(found.getDescription()).isEqualTo("goodbye"); - Ebean.delete(found); + DB.delete(found); } } diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index c05c5fcd7..b4ed0fb0a 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -2,7 +2,7 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TWithPreInsert; import org.junit.jupiter.api.Test; @@ -17,16 +17,16 @@ public class TestPreInsertValidation extends BaseTestCase { e.setTitle("Mister"); // the perInsert should populate the // name with should not be null - Ebean.save(e); + DB.save(e); // the save worked and name set in preInsert assertNotNull(e.getId()); assertNotNull(e.getName()); - TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId()); + TWithPreInsert e1 = DB.find(TWithPreInsert.class, e.getId()); e1.setTitle("Missus"); - Ebean.save(e1); + DB.save(e1); } @Test @@ -34,14 +34,14 @@ public class TestPreInsertValidation extends BaseTestCase { TWithPreInsert e = new TWithPreInsert(); e.setName("BeanForUpdateTest"); - Ebean.save(e); + DB.save(e); TWithPreInsert bean2 = new TWithPreInsert(); bean2.setId(e.getId()); bean2.setName("stateless-update-name"); bean2.setTitle(null); - Ebean.update(bean2); + DB.update(bean2); // title set on preUpdate assertNotNull(bean2.getTitle()); diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java index 84f369cf5..0b106baad 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -1,7 +1,7 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryType; import org.ebeantest.LoggedSqlCollector; @@ -23,21 +23,21 @@ public class TestQueryAdapter extends BaseTestCase { TOne o = new TOne(); o.setName("something"); - Ebean.save(o); + DB.save(o); - Query queryFindId = Ebean.find(TOne.class).setId(o.getId()); + Query queryFindId = DB.find(TOne.class).setId(o.getId()); TOne one = queryFindId.findOne(); assertThat(one.getId()).isEqualTo(o.getId()); assertThat(sqlOf(queryFindId)).contains(" 1=1"); - Query notUsedQuery = Ebean.find(TOne.class); + Query notUsedQuery = DB.find(TOne.class); assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND); LoggedSqlCollector.start(); - Ebean.update(TOne.class) + DB.update(TOne.class) .set("name", "mod") .where().idEq(o.getId()) .update(); @@ -45,7 +45,7 @@ public class TestQueryAdapter extends BaseTestCase { List sql = LoggedSqlCollector.current(); assertSql(sql.get(0)).contains(" 2=2"); - Ebean.find(TOne.class) + DB.find(TOne.class) .where().idEq(o.getId()) .delete(); diff --git a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index c46dd323a..b8376087a 100644 --- a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -1,6 +1,6 @@ package org.tests.basic.join; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.TransactionalTestCase; import org.tests.model.basic.Order; @@ -17,7 +17,7 @@ public class TestSecondaryJoin extends TransactionalTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) // .select("*") // .join("customer") .findList(); @@ -26,7 +26,7 @@ public class TestSecondaryJoin extends TransactionalTestCase { o0.setCustomerName("Banan"); o0.setStatus(Status.APPROVED); - Ebean.save(o0); + DB.save(o0); } } diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 408234021..7dbc62c5e 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -1,8 +1,8 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; import org.ebeantest.LoggedSqlCollector; @@ -21,14 +21,14 @@ public class TestBasicClobFetchEager extends BaseTestCase { EBasicClobFetchEager entity = new EBasicClobFetchEager(); entity.setName("test"); entity.setDescription("initialClobValue"); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); 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()); + Query defaultQuery = DB.find(EBasicClobFetchEager.class).setId(entity.getId()); defaultQuery.findOne(); String sql = trimSql(defaultQuery.getGeneratedSql(), 6); @@ -38,7 +38,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { LoggedSqlCollector.start(); // Same as previous query - clob included by default based on annotation - Ebean.find(EBasicClobFetchEager.class, entity.getId()); + DB.find(EBasicClobFetchEager.class, entity.getId()); // Assert query same as previous ... List loggedSql = LoggedSqlCollector.stop(); @@ -47,7 +47,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Explicitly select * including Clob - Query explicitQuery = Ebean.find(EBasicClobFetchEager.class).setId(entity.getId()).select("*"); + Query explicitQuery = DB.find(EBasicClobFetchEager.class).setId(entity.getId()).select("*"); explicitQuery.findOne(); sql = sqlOf(explicitQuery, 6); @@ -59,7 +59,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { EBasicClobFetchEager updateBean = new EBasicClobFetchEager(); updateBean.setId(entity.getId()); updateBean.setDescription("modified"); - Ebean.update(updateBean); + DB.update(updateBean); // Test refresh function diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java index f5bb0cd0e..1bba53a87 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -1,7 +1,7 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TBytesOnly; import org.junit.jupiter.api.Test; @@ -14,14 +14,14 @@ public class TestByteOnly extends BaseTestCase { TBytesOnly e = new TBytesOnly(); e.setContent(content); - Ebean.save(e); + DB.save(e); byte[] content2 = new byte[]{1, 1}; - TBytesOnly e2 = Ebean.find(TBytesOnly.class, e.getId()); + TBytesOnly e2 = DB.find(TBytesOnly.class, e.getId()); e2.setContent(content2); - Ebean.save(e2); + DB.save(e2); } } diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 9232a878c..8a26d64de 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,7 +1,7 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,12 +23,12 @@ public class TestOne2OneBookingInvoice extends BaseTestCase { b.setAgentInvoice(ai); b.setClientInvoice(ci); - Ebean.save(b); + DB.save(b); - Invoice invoice = Ebean.find(Invoice.class, ai.getId()); + Invoice invoice = DB.find(Invoice.class, ai.getId()); assertEquals(b.getId(), invoice.getBooking().getId()); - Booking b1 = Ebean.find(Booking.class, b.getId()); + Booking b1 = DB.find(Booking.class, b.getId()); Invoice ai1 = b1.getAgentInvoice(); assertNotNull(ai1); @@ -47,8 +47,8 @@ public class TestOne2OneBookingInvoice extends BaseTestCase { // cleanup ai.setBooking(null); ci.setBooking(null); - Ebean.save(ai); - Ebean.save(ci); - Ebean.delete(b); + DB.save(ai); + DB.save(ci); + DB.delete(b); } } diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index 5105cb2b3..2ec4a3d96 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -1,7 +1,7 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestOneToOneWheelTire extends BaseTestCase { @@ -14,9 +14,9 @@ public class TestOneToOneWheelTire extends BaseTestCase { t.setWheel(w); w.setTire(t); - Ebean.save(t); + DB.save(t); - Ebean.delete(t); + DB.delete(t); } } diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index d65a823fb..854f0a574 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -1,7 +1,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.ESomeType; import org.junit.jupiter.api.Test; @@ -27,15 +27,15 @@ public class TestExtraScalarTypes extends BaseTestCase { e.setTimeZone(tz); e.setCurrency(currency); - Ebean.save(e); + DB.save(e); - ESomeType e2 = Ebean.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne(); + ESomeType e2 = DB.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne(); assertNotNull(e2.getCurrency()); assertNotNull(e2.getLocale()); assertNotNull(e2.getTimeZone()); - List list = Ebean.find(ESomeType.class) + List list = DB.find(ESomeType.class) .setAutoTune(false).where() .eq("locale", locale) .eq("timeZone", tz.getID()) diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 0c700c8ef..d70bdd3b1 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -1,7 +1,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; @@ -11,6 +11,6 @@ public class TestQueryBooleanProperty extends BaseTestCase { public void test() { // when run in MySql is test for BUG 323 - Ebean.find(TOne.class).where().eq("active", true).findList(); + DB.find(TOne.class).where().eq("active", true).findList(); } } diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index aa1482cbf..cbefd7a68 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -3,8 +3,8 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery2Test; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; @@ -31,7 +31,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Test public void no_cascade() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); resetAllMetrics(); @@ -97,11 +97,11 @@ public class TestBatchInsertFlush extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.save(new EBasicVer("b1")); - Ebean.save(new EBasicVer("b2")); + DB.save(new EBasicVer("b1")); + DB.save(new EBasicVer("b2")); // does not trigger JDBC batch with flushOnQuery = false - Ebean.find(Customer.class).findCount(); + DB.find(Customer.class).findCount(); List sql = LoggedSqlCollector.stop(); assertSql(sql.get(0)).contains("select count(*)"); @@ -148,11 +148,11 @@ public class TestBatchInsertFlush extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.save(new EBasicVer("b1")); - Ebean.save(new EBasicVer("b2")); + DB.save(new EBasicVer("b1")); + DB.save(new EBasicVer("b2")); // by default triggers flush of JDBC batch - Ebean.find(Customer.class).findCount(); + DB.find(Customer.class).findCount(); List sql = LoggedSqlCollector.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); @@ -163,7 +163,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs public void transactional_flushOnGetId() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); LoggedSqlCollector.start(); EBasicVer b1 = new EBasicVer("b1"); @@ -186,7 +186,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) public void testFlushOnGetId() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { LoggedSqlCollector.start(); @@ -218,7 +218,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batch = PersistBatch.ALL) public void transactional_noflushWhenIdIsLoaded() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); LoggedSqlCollector.start(); @@ -245,7 +245,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @IgnorePlatform({Platform.SQLSERVER, Platform.ORACLE}) public void noflushWhenIdIsLoaded() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { LoggedSqlCollector.start(); @@ -279,7 +279,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Test public void testFlushOnGetProperty() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { txn.setBatchMode(true); @@ -307,7 +307,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Test public void testFlushOnSetProperty() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { txn.setBatchMode(true); diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java index 92101e4b4..cc89ca3d4 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java @@ -1,6 +1,6 @@ package org.tests.batchinsert; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; @@ -35,6 +35,6 @@ public class TestBatchInsertOneToOne { public void test() { MeterVersion meterVersion = build(); - Ebean.save(meterVersion); + DB.save(meterVersion); } } diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 253ac5f52..61a405681 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -2,7 +2,7 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; @@ -28,7 +28,7 @@ public class TestBatchInsertSimple extends BaseTestCase { int numOfMasters = 4;// 2 + random.nextInt(8); - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { transaction.setBatchMode(false); transaction.setBatchOnCascade(true); @@ -102,7 +102,7 @@ public class TestBatchInsertSimple extends BaseTestCase { int numOfMasters = 4; - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { transaction.setBatchMode(false); transaction.setBatchOnCascade(true); @@ -112,7 +112,7 @@ public class TestBatchInsertSimple extends BaseTestCase { for (int i = 0; i < numOfMasters; i++) { UTMaster master = createMaster(i); - Ebean.save(master); + DB.save(master); } transaction.commit(); @@ -132,14 +132,14 @@ public class TestBatchInsertSimple extends BaseTestCase { masters.add(createMasterAndDetails(i, 7)); } - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { transaction.setBatchMode(true); transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade())); transaction.setBatchSize(20); // escalate based on batchOnCascade value - Ebean.saveAll(masters); + DB.saveAll(masters); transaction.commit(); @@ -159,7 +159,7 @@ public class TestBatchInsertSimple extends BaseTestCase { } // escalate based on batchOnCascade value - Ebean.saveAll(masters); + DB.saveAll(masters); for (int i = 0; i < masters.size(); i++) { UTMaster utMaster = masters.get(i); @@ -170,7 +170,7 @@ public class TestBatchInsertSimple extends BaseTestCase { } } - Ebean.saveAll(masters); + DB.saveAll(masters); } private UTMaster createMasterAndDetails(int masterPos, int size) { diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 84fc0837a..3a8e70543 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -1,7 +1,7 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -28,11 +28,11 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { LoggedSqlCollector.start(); - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { txn.setBatchMode(true); - Ebean.saveAll(list); + DB.saveAll(list); txn.commit(); } finally { diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index edba34622..f19c9ad52 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -1,7 +1,7 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; -import io.ebean.EbeanServer; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; @@ -86,7 +86,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { }); } - protected void testBatchOnCascadeIsExceptionSafe(EbeanServer server, Runnable failingOperation) { + protected void testBatchOnCascadeIsExceptionSafe(Database server, Runnable failingOperation) { Transaction txn = server.beginTransaction(); try { assertThat(txn.isBatchMode()).isFalse(); diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index 6a86d8a2f..7239731d5 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -1,8 +1,8 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; @@ -23,7 +23,7 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase { @IgnorePlatform(Platform.HANA) // HANA doesn't support insert batching public void test() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Customer model = new Customer(); model.setName("foo"); @@ -34,6 +34,6 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase { Object beanId = server.beanId(model); assertNotNull(beanId); - Ebean.delete(Customer.class, beanId); + DB.delete(Customer.class, beanId); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java index 15e198d6d..a0540b63a 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Expr; import io.ebean.FetchConfig; import io.ebean.Transaction; @@ -27,7 +27,7 @@ public class TestBasicLazy extends BaseTestCase { ResetBasicData.reset(); - Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") + Order order = DB.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); assertNotNull(order); @@ -46,14 +46,14 @@ public class TestBasicLazy extends BaseTestCase { // safety check to see if our customer we are going to use for the test has // some contacts - Customer c = Ebean.find(Customer.class).setId(1).findOne(); + Customer c = DB.find(Customer.class).setId(1).findOne(); assertNotNull(c.getContacts()); assertTrue(!c.getContacts().isEmpty()); // start transaction so we have a "long running" persistence context - Transaction tx = Ebean.beginTransaction(); + Transaction tx = DB.beginTransaction(); try { - List order = Ebean.find(Order.class).where(Expr.eq("customer.id", 1)).findList(); + List order = DB.find(Order.class).where(Expr.eq("customer.id", 1)).findList(); assertNotNull(order); assertTrue(!order.isEmpty()); @@ -75,7 +75,7 @@ public class TestBasicLazy extends BaseTestCase { public void testRaceCondition_Simple() throws Throwable { ResetBasicData.reset(); - Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") + Order order = DB.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); assertNotNull(order); @@ -83,7 +83,7 @@ public class TestBasicLazy extends BaseTestCase { final Customer customer = order.getCustomer(); assertNotNull(customer); - assertTrue(Ebean.getBeanState(customer).isReference()); + assertTrue(DB.getBeanState(customer).isReference()); final Throwable throwables[] = new Throwable[2]; Thread t1 = new Thread() { @@ -120,7 +120,7 @@ public class TestBasicLazy extends BaseTestCase { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0; } - assertFalse(Ebean.getBeanState(customer).isReference()); + assertFalse(DB.getBeanState(customer).isReference()); if (throwables[0] != null) { throw throwables[0]; @@ -178,7 +178,7 @@ public class TestBasicLazy extends BaseTestCase { new FetchThread(tg, 2).start(); new FetchThread(tg, 3).start(); - orders = Ebean.find(Order.class).fetchLazy("customer").findList(); + orders = DB.find(Order.class).fetchLazy("customer").findList(); assertTrue(orders.size() >= 4); try { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index 1b884bac2..f017ae3ee 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -21,15 +21,15 @@ public class TestBasicNavOnEmpty extends BaseTestCase { Customer c = new Customer(); c.setName("HelloRob"); - Ebean.save(c); + DB.save(c); - c = Ebean.find(Customer.class, c.getId()); + c = DB.find(Customer.class, c.getId()); List contacts = c.getContacts(); assertEquals(0, contacts.size()); // cleanup - Ebean.delete(c); + DB.delete(c); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 55cd76eae..46614dac7 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; @@ -17,8 +17,8 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { @Test public void testOnDeleted() { - Ebean.deleteAll(Ebean.find(UUTwo.class).findList()); - Ebean.deleteAll(Ebean.find(UUOne.class).findList()); + DB.deleteAll(DB.find(UUTwo.class).findList()); + DB.deleteAll(DB.find(UUOne.class).findList()); UUOne oneA = new UUOne(); oneA.setName("oneA"); @@ -38,13 +38,13 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { twoC.setName("two-bld-C"); twoC.setMaster(oneB); - Ebean.save(oneA); - Ebean.save(oneB); - Ebean.save(two); - Ebean.save(twoB); - Ebean.save(twoC); + DB.save(oneA); + DB.save(oneB); + DB.save(two); + DB.save(twoB); + DB.save(twoC); - List list = Ebean.find(UUTwo.class) + List list = DB.find(UUTwo.class) .fetchLazy("master") .where().startsWith("name", "two-bld-") .order("name") @@ -53,12 +53,12 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { // delete a bean that will be batch lazy loaded but // is NOT the bean that will invoke the lazy loading // (in this case it is the second bean in the list). - int deletedCount = Ebean.delete(UUOne.class, oneB.getId()); + int deletedCount = DB.delete(UUOne.class, oneB.getId()); assertEquals(1, deletedCount); for (UUTwo u : list) { u.getMaster(); - //BeanState beanState = Ebean.getBeanState(master); + //BeanState beanState = DB.getBeanState(master); //assertTrue(beanState.isReference()); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index 8be7c68a8..c2b797bb7 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -15,19 +15,19 @@ public class TestEmptyManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); - Customer c = Ebean.find(Customer.class).findList().get(0); + Customer c = DB.find(Customer.class).findList().get(0); Order o = new Order(); o.setCustomer(c); o.setStatus(Status.NEW); - Ebean.save(o); + DB.save(o); - Order o2 = Ebean.find(Order.class, o.getId()); + Order o2 = DB.find(Order.class, o.getId()); o2.getDetails().size(); // cleanup - Ebean.delete(o2); + DB.delete(o2); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java index 2ca9de453..d0179d210 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; @@ -20,7 +20,7 @@ public class TestLazyJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status") .fetchLazy("customer", "name, status") .fetch("customer.contacts") diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java index 4576adbc3..79a1daaf7 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; @@ -18,7 +18,7 @@ public class TestLazyJoin2 extends BaseTestCase { ResetBasicData.reset(); // This will use 3 SQL queries to build this object graph - List l0 = Ebean.find(Order.class).select("status, shipDate") + List l0 = DB.find(Order.class).select("status, shipDate") .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") @@ -38,7 +38,7 @@ public class TestLazyJoin2 extends BaseTestCase { // query 3) find customer (name) join contacts (*) join shippingAddress (*) // where id in (?,?,?,?,?) - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) // .select("status") .fetchQuery("customer").order().asc("id").findList(); // .join("customer.contacts"); @@ -56,7 +56,7 @@ public class TestLazyJoin2 extends BaseTestCase { assertNotNull(billingAddress); - List list = Ebean.find(Order.class).fetchLazy("customer", "name") + List list = DB.find(Order.class).fetchLazy("customer", "name") .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") .where().eq("status", Order.Status.NEW).order().asc("id").findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 81e7ec0ae..8381f78f4 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.TransactionalTestCase; @@ -21,9 +21,9 @@ public class TestLazyLoadEmptyCollection extends TransactionalTestCase { Contact con = new Contact("jim", "slim"); c.addContact(con); - Ebean.save(c); + DB.save(c); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .fetchQuery("contacts") .fetchQuery("contacts.notes") .findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 4e948723b..31e399015 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestLazyLoadNonExistantBean extends BaseTestCase { public void testSimple() { UUID uuid = UUID.randomUUID(); - UUOne one = Ebean.getReference(UUOne.class, uuid); + UUOne one = DB.getReference(UUOne.class, uuid); try { // invoke lazy loading diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index f52c01ae6..43b12bee9 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestLazyLoadNonExistentBean extends BaseTestCase { public void testSimple() { UUID uuid = UUID.randomUUID(); - UUOne one = Ebean.getReference(UUOne.class, uuid); + UUOne one = DB.getReference(UUOne.class, uuid); try { // invoke lazy loading diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 97e7f7011..359ca48e8 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; @@ -23,7 +23,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .order().asc("id") .findList(); @@ -49,7 +49,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .order().asc("id") .findList(); @@ -72,7 +72,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .fetch("customer", "smallnote") .order().asc("id") diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 90c32ad90..73f51607e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -2,7 +2,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; import org.tests.model.basic.Address; @@ -24,10 +24,10 @@ public class TestQueryJoin extends BaseTestCase { // Need to make sure the customer cache is cleared for the later // asserts on the lazy loading - ServerCache custCache = Ebean.getServerCacheManager().beanCache(Customer.class); + ServerCache custCache = DB.cacheManager().beanCache(Customer.class); custCache.clear(); - Query query = Ebean.find(Order.class).select("status") + Query query = DB.find(Order.class).select("status") .fetchLazy("customer", "name, status") .fetch("customer.contacts").order().asc("id"); @@ -36,7 +36,7 @@ public class TestQueryJoin extends BaseTestCase { // list.get(0).getShipDate(); Order order = list.get(0); - BeanState beanStateOrder = Ebean.getBeanState(order); + BeanState beanStateOrder = DB.getBeanState(order); assertNotNull(beanStateOrder.getLoadedProps()); // assertTrue(beanStateOrder.getLoadedProps().contains("id")); assertTrue(beanStateOrder.getLoadedProps().contains("status")); @@ -44,7 +44,7 @@ public class TestQueryJoin extends BaseTestCase { assertTrue(beanStateOrder.getLoadedProps().contains("customer")); Customer customer = order.getCustomer(); - BeanState beanStateCustomer = Ebean.getBeanState(customer); + BeanState beanStateCustomer = DB.getBeanState(customer); assertTrue(beanStateCustomer.isReference()); customer.getName(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 480f799be..c1b5526e8 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { LoggedSqlCollector.start(); // This will use 2 SQL queries to build this object graph - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") .findList(); @@ -54,7 +54,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { LoggedSqlCollector.start(); // This will use 2 SQL queries to build this object graph - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .select("status, shipDate") .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") @@ -80,7 +80,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { LoggedSqlCollector.start(); // This will use 2 SQL queries to build this object graph - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .select("status, shipDate") .fetchQuery("details", "orderQty, unitPrice") @@ -120,7 +120,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { LoggedSqlCollector.start(); // This will use 2 SQL queries to build this object graph - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .select("status, shipDate") .order().asc("id") @@ -147,18 +147,18 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { Role role0 = new Role("r0"); Role role1 = new Role("r1"); - Ebean.save(role0); - Ebean.save(role1); + DB.save(role0); + DB.save(role1); Tenant tenant = new Tenant("t0"); tenant.getRoles().add(role0); tenant.getRoles().add(role1); - Ebean.save(tenant); + DB.save(tenant); LoggedSqlCollector.start(); - Tenant found = Ebean.find(Tenant.class) + Tenant found = DB.find(Tenant.class) .setDisableLazyLoading(true) .select("name") .setId(tenant.getId()) @@ -179,11 +179,11 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { MpUser u = new MpUser(); u.setName("disableLazy"); u.getRoles().put("disableLazyLoading", r0); - Ebean.save(u); + DB.save(u); LoggedSqlCollector.start(); - MpUser found = Ebean.find(MpUser.class) + MpUser found = DB.find(MpUser.class) .setDisableLazyLoading(true) .select("name") .setId(u.getId()) @@ -196,7 +196,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - Ebean.deleteAll(Arrays.asList(found, r0)); + DB.deleteAll(Arrays.asList(found, r0)); } @Test @@ -207,7 +207,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { LoggedSqlCollector.start(); // This will use 2 SQL queries to build this object graph - List l0 = Ebean.find(Order.class) + List l0 = DB.find(Order.class) .setDisableLazyLoading(true) .select("status, shipDate") .fetch("details", "orderQty, unitPrice")//, new FetchConfig().query()) diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index df54a6ef9..d632e1039 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -20,9 +20,9 @@ public class TestSecondQueryNoRows extends BaseTestCase { Customer cnew = new Customer(); cnew.setName("testSecQueryNoRows"); - Ebean.save(cnew); + DB.save(cnew); - Customer c = Ebean.find(Customer.class) + Customer c = DB.find(Customer.class) .setAutoTune(false) .setId(cnew.getId()) .fetchQuery("contacts") @@ -31,6 +31,6 @@ public class TestSecondQueryNoRows extends BaseTestCase { assertNotNull(c); assertEquals(0, c.getContacts().size()); - Ebean.delete(c); + DB.delete(c); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java index a55361bd7..3887aecc0 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -21,7 +21,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .select("status") .fetchQuery("customer", "name") .findList(); @@ -38,9 +38,9 @@ public class TestSecondaryQueries extends TransactionalTestCase { public void fetchLazy() { LoggedSqlCollector.start(); - DB.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .select("status") .fetchLazy("customer", "name") .setMaxRows(10) @@ -75,7 +75,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { LoggedSqlCollector.start(); try (QueryIterator orders = - Ebean.find(Order.class).select("status") + DB.find(Order.class).select("status") .setMaxRows(10) .setUseCache(false) .findIterate()) { @@ -100,7 +100,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { Order testOrder = ResetBasicData.createOrderCustAndOrder("testSecQry10"); Integer custId = testOrder.getCustomer().getId(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("name") .fetchQuery("contacts") .setId(custId); @@ -124,7 +124,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void testManyToOneWithManyPlusOneToMany() { - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .select("status") .fetchQuery("customer", "name, status") .fetch("customer.contacts") diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 908dae151..6d7226323 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; @@ -23,26 +23,26 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { OCachedBean bean = new OCachedBean(); bean.setName("cache-invalidation"); - Ebean.save(bean); + DB.save(bean); - OCachedBean bean0 = Ebean.find(OCachedBean.class, bean.getId()); + OCachedBean bean0 = DB.find(OCachedBean.class, bean.getId()); assertNotNull(bean0); // expect to hit the cache, no SQL LoggedSqlCollector.start(); - OCachedBean bean1 = Ebean.find(OCachedBean.class, bean.getId()); + OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); List sql = LoggedSqlCollector.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); // delete the bean - int deleted = Ebean.createQuery(OCachedBean.class).where().eq("name", "cache-invalidation").delete(); + int deleted = DB.createQuery(OCachedBean.class).where().eq("name", "cache-invalidation").delete(); assertEquals(deleted, 1); // expect not to hit the cache, expect SQL LoggedSqlCollector.start(); - OCachedBean bean2 = Ebean.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); + OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); sql = LoggedSqlCollector.stop(); assertNull(bean2); assertThat(sql).isNotEmpty(); @@ -53,26 +53,26 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { OCachedBean bean = new OCachedBean(); bean.setName("cache-invalidation-upd"); - Ebean.save(bean); + DB.save(bean); - OCachedBean bean0 = Ebean.find(OCachedBean.class, bean.getId()); + OCachedBean bean0 = DB.find(OCachedBean.class, bean.getId()); assertNotNull(bean0); // expect to hit the cache, no SQL LoggedSqlCollector.start(); - OCachedBean bean1 = Ebean.find(OCachedBean.class, bean.getId()); + OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); List sql = LoggedSqlCollector.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); // update the bean - int updated = Ebean.update(OCachedBean.class).set("name", "updatedName").where().eq("name","cache-invalidation-upd").update(); + int updated = DB.update(OCachedBean.class).set("name", "updatedName").where().eq("name","cache-invalidation-upd").update(); assertEquals(updated, 1); // expect not to hit the cache, expect SQL LoggedSqlCollector.start(); - OCachedBean bean2 = Ebean.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); + OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); sql = LoggedSqlCollector.stop(); assertNotNull(bean2); assertThat(sql).isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 7131d0f97..46e3be975 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.Country; @@ -17,8 +17,8 @@ public class TestCacheBasic extends BaseTestCase { ResetBasicData.reset(); - Ebean.getServerCacheManager().clear(Country.class); - ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); + DB.cacheManager().clear(Country.class); + ServerCache countryCache = DB.cacheManager().beanCache(Country.class); loadCountryCache(); assertTrue(countryCache.size() > 0); @@ -26,13 +26,13 @@ public class TestCacheBasic extends BaseTestCase { // reset the statistics countryCache.statistics(true); - Country c0 = Ebean.getReference(Country.class, "NZ"); + Country c0 = DB.getReference(Country.class, "NZ"); ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); assertEquals(1, hc); assertNotNull(c0); - // Country c1 = Ebean.getReference(Country.class, "NZ"); + // Country c1 = DB.getReference(Country.class, "NZ"); // assertEquals(2, countryCache.getStatistics(false).getHitCount()); // //assertEquals(100, // countryCache.getStatistics(false).getHitRatio()); @@ -54,7 +54,7 @@ public class TestCacheBasic extends BaseTestCase { // // Customer custTest = ResetBasicData.createCustAndOrder("cacheBasic"); // Integer id = custTest.getId(); - // Customer customer = Ebean.find(Customer.class, id); + // Customer customer = DB.find(Customer.class, id); // // Address billingAddress = customer.getBillingAddress(); // Country c2 = billingAddress.getCountry(); @@ -62,17 +62,17 @@ public class TestCacheBasic extends BaseTestCase { // // assertTrue(countryCache.getStatistics(false).getHitCount() > 0); // - // //Country c3 = Ebean.getReference(Country.class, "NZ"); - // //Country c4 = Ebean.find(Country.class, "NZ"); + // //Country c3 = DB.getReference(Country.class, "NZ"); + // //Country c4 = DB.find(Country.class, "NZ"); // // // // clear the cache - // Ebean.getServerCacheManager().clear(Country.class); + // DB.cacheManager().clear(Country.class); // // reset statistics // countryCache.getStatistics(true); // // // try to hit the country cache automatically via join - // customer = Ebean.find(Customer.class, id); + // customer = DB.find(Customer.class, id); // billingAddress = customer.getBillingAddress(); // Country c5 = billingAddress.getCountry(); // // but cache is empty so c5 is reference that will load cache @@ -85,13 +85,13 @@ public class TestCacheBasic extends BaseTestCase { // assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize()); // // // now these get hits in the cache - // Country c6 = Ebean.find(Country.class, "NZ"); + // Country c6 = DB.find(Country.class, "NZ"); // // assertTrue("different instance as cache cleared",c2 != c5); // assertTrue("these 2 are different",c5 != c6); // // // by default readOnly based on deployment annotation - // assertTrue("read only",Ebean.getBeanState(c6).isReadOnly()); + // assertTrue("read only",DB.getBeanState(c6).isReadOnly()); // // try { // // can't modify a readOnly bean @@ -101,40 +101,40 @@ public class TestCacheBasic extends BaseTestCase { // assertTrue("This is readOnly",true); // } // - // Country c8 = Ebean.find(Country.class) + // Country c8 = DB.find(Country.class) // .setId("NZ") // .setReadOnly(false) // .findOne(); // // // Explicitly NOT readOnly - // assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly()); + // assertFalse("NOT read only",DB.getBeanState(c8).isReadOnly()); // // assertEquals("1 countries in cache", 1, countryCache.size()); // c8.setName("Nu Zilund"); // // the update will remove the entry from the cache - // Ebean.save(c8); + // DB.save(c8); // // assertEquals("1 country in cache", 1, countryCache.size()); // - // Country c9 = Ebean.find(Country.class) + // Country c9 = DB.find(Country.class) // .setReadOnly(false) // .setId("NZ") // .findOne(); // // // Find loads cache ... - // assertFalse(Ebean.getBeanState(c9).isReadOnly()); + // assertFalse(DB.getBeanState(c9).isReadOnly()); // assertTrue(countryCache.size() > 0); // - // Country c10 = Ebean.find(Country.class,"NZ"); + // Country c10 = DB.find(Country.class,"NZ"); // - // assertTrue(Ebean.getBeanState(c10).isReadOnly()); + // assertTrue(DB.getBeanState(c10).isReadOnly()); // assertTrue(countryCache.size() > 0); // - // Ebean.getServerCacheManager().clear(Country.class); + // DB.cacheManager().clear(Country.class); // assertEquals("0 country in cache", 0, countryCache.size()); // // // reference doesn't load cache yet - // Country c11 = Ebean.getReference(Country.class, "NZ"); + // Country c11 = DB.getReference(Country.class, "NZ"); // // // still 0 in cache // assertEquals("0 country in cache", 0, countryCache.size()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java index f72510f95..575d9f3b6 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.Update; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheCollectionIds extends BaseTestCase { - private ServerCacheManager cacheManager = Ebean.getServerCacheManager(); + private ServerCacheManager cacheManager = DB.cacheManager(); @Test public void test() { @@ -48,7 +48,7 @@ public class TestCacheCollectionIds extends BaseTestCase { custCache.clear(); custManyIdsCache.clear(); - List list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) + List list = DB.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) .order().asc("id").findList(); assertTrue(list.size() > 1); @@ -79,19 +79,19 @@ public class TestCacheCollectionIds extends BaseTestCase { Contact newContact = ResetBasicData.createContact("Check", "CollIds"); newContact.setCustomer(customer); - Ebean.save(newContact); + DB.save(newContact); awaitL2Cache(); int currentNumContacts2 = fetchCustomer(customer.getId()); assertEquals(currentNumContacts + 1, currentNumContacts2); // cleanup - Ebean.delete(newContact); + DB.delete(newContact); } private int fetchCustomer(Integer id) { - Customer customer2 = Ebean.find(Customer.class, id); + Customer customer2 = DB.find(Customer.class, id); List contacts2 = customer2.getContacts(); @@ -112,13 +112,13 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("hello"); - cachedBean.getCountries().add(Ebean.find(Country.class, "NZ")); - cachedBean.getCountries().add(Ebean.find(Country.class, "AU")); + cachedBean.getCountries().add(DB.find(Country.class, "NZ")); + cachedBean.getCountries().add(DB.find(Country.class, "AU")); - Ebean.save(cachedBean); + DB.save(cachedBean); // used to just load the cache - trigger loading - OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); @@ -130,15 +130,15 @@ public class TestCacheCollectionIds extends BaseTestCase { // act - OCachedBean loadedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean loadedBean = DB.find(OCachedBean.class, cachedBean.getId()); loadedBean.getCountries().clear(); - loadedBean.getCountries().add(Ebean.find(Country.class, "AU")); + loadedBean.getCountries().add(DB.find(Country.class, "AU")); - Ebean.save(loadedBean); + DB.save(loadedBean); awaitL2Cache(); // Get the data to assert/check against - OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean result = DB.find(OCachedBean.class, cachedBean.getId()); cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId()); // assert that data and cache both show correct data @@ -155,37 +155,37 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("hello1"); - Ebean.save(cachedBean); + DB.save(cachedBean); awaitL2Cache(); - OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(0, dummyToLoad.getChildren().size()); OCachedBeanChild child1=new OCachedBeanChild(); child1.setCachedBean(cachedBean); - Ebean.insert(child1); + DB.insert(child1); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(1, dummyToLoad.getChildren().size()); OCachedBeanChild child2=new OCachedBeanChild(); child2.setCachedBean(cachedBean); - Ebean.insert(child2); + DB.insert(child2); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(2, dummyToLoad.getChildren().size()); - Ebean.delete(child2); + DB.delete(child2); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(1, dummyToLoad.getChildren().size()); - Ebean.delete(child1); + DB.delete(child1); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(0, dummyToLoad.getChildren().size()); - Ebean.delete(cachedBean); + DB.delete(cachedBean); } @Test @@ -195,37 +195,37 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("hello2"); - Ebean.save(cachedBean); + DB.save(cachedBean); awaitL2Cache(); - OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(0, dummyToLoad.getNotCachedChildren().size()); OBeanChild child1=new OBeanChild(); child1.setCachedBean(cachedBean); - Ebean.insert(child1); + DB.insert(child1); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(1, dummyToLoad.getNotCachedChildren().size()); OBeanChild child2=new OBeanChild(); child2.setCachedBean(cachedBean); - Ebean.insert(child2); + DB.insert(child2); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(2, dummyToLoad.getNotCachedChildren().size()); - Ebean.delete(child2); + DB.delete(child2); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(1, dummyToLoad.getNotCachedChildren().size()); - Ebean.delete(child1); + DB.delete(child1); awaitL2Cache(); - dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(0, dummyToLoad.getNotCachedChildren().size()); - Ebean.delete(cachedBean); + DB.delete(cachedBean); } @@ -240,13 +240,13 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("hello"); - cachedBean.getCountries().add(Ebean.find(Country.class, "NZ")); - cachedBean.getCountries().add(Ebean.find(Country.class, "AU")); + cachedBean.getCountries().add(DB.find(Country.class, "NZ")); + cachedBean.getCountries().add(DB.find(Country.class, "AU")); - Ebean.save(cachedBean); + DB.save(cachedBean); // used to just load the cache - trigger loading - OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean dummyToLoad = DB.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); @@ -258,16 +258,16 @@ public class TestCacheCollectionIds extends BaseTestCase { // act - this time update the name property so the bean is dirty - OCachedBean loadedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean loadedBean = DB.find(OCachedBean.class, cachedBean.getId()); loadedBean.setName("goodbye"); loadedBean.getCountries().clear(); - loadedBean.getCountries().add(Ebean.find(Country.class, "AU")); + loadedBean.getCountries().add(DB.find(Country.class, "AU")); - Ebean.save(loadedBean); + DB.save(loadedBean); awaitL2Cache(); // Get the data to assert/check against - OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean result = DB.find(OCachedBean.class, cachedBean.getId()); cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId()); // assert that data and cache both show correct data @@ -287,10 +287,10 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("cachedBeanTest"); - cachedBean.getCountries().add(Ebean.find(Country.class, "NZ")); - cachedBean.getCountries().add(Ebean.find(Country.class, "AU")); + cachedBean.getCountries().add(DB.find(Country.class, "NZ")); + cachedBean.getCountries().add(DB.find(Country.class, "AU")); - Ebean.save(cachedBean); + DB.save(cachedBean); // clear the cache ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); @@ -298,7 +298,7 @@ public class TestCacheCollectionIds extends BaseTestCase { assertEquals(0, cachedBeanCountriesCache.size()); // load the cache - OCachedBean dummyLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean dummyLoad = DB.find(OCachedBean.class, cachedBean.getId()); List dummyCountries = dummyLoad.getCountries(); assertEquals(2, dummyCountries.size()); @@ -315,9 +315,9 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean update = new OCachedBean(); update.setId(cachedBean.getId()); update.setName("modified"); - update.getCountries().add(Ebean.find(Country.class, "AU")); + update.getCountries().add(DB.find(Country.class, "AU")); - Ebean.update(update); + DB.update(update); awaitL2Cache(); assertEquals(1, cachedBeanCountriesCache.size()); @@ -330,7 +330,7 @@ public class TestCacheCollectionIds extends BaseTestCase { assertTrue(cachedManyIds.getIdList().contains("AU")); // assert countries good - OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId()); + OCachedBean result = DB.find(OCachedBean.class, cachedBean.getId()); assertEquals(1, result.getCountries().size()); } @@ -340,23 +340,23 @@ public class TestCacheCollectionIds extends BaseTestCase { ResetBasicData.reset(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { OCachedBean cachedBean = new OCachedBean(); cachedBean.setName("helloForUpdate"); - Ebean.save(cachedBean); + DB.save(cachedBean); - cachedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); + cachedBean = DB.find(OCachedBean.class, cachedBean.getId()); cachedBean.setName("mod"); ArrayList list = new ArrayList<>(); - list.add(Ebean.find(Country.class, "NZ")); + list.add(DB.find(Country.class, "NZ")); cachedBean.setCountries(list); - Ebean.save(cachedBean); + DB.save(cachedBean); cachedBean.setName("mod2"); - Ebean.save(cachedBean); + DB.save(cachedBean); txn.commit(); } @@ -375,7 +375,7 @@ public class TestCacheCollectionIds extends BaseTestCase { ResetBasicData.reset(); // load the cache with the order - Order order1 = Ebean.find(Order.class, 1L); + Order order1 = DB.find(Order.class, 1L); // load the Collection IDs (order.orderDetail) cache OrderDetail orderDetail1 = order1.getDetails().get(0); @@ -383,13 +383,13 @@ public class TestCacheCollectionIds extends BaseTestCase { // delete one order detail from DB. This triggers clearing of OrderDetail caches // and should also clear any Collection IDs caches targeting OrderDetail bean String updStatement = "delete from orderDetail where id = :id"; - Update update = Ebean.createUpdate(OrderDetail.class, updStatement); + Update update = DB.createUpdate(OrderDetail.class, updStatement); update.set("id", orderDetail1.getId()); int rows = update.execute(); assertEquals(1, rows); // read the order from cache - Order orderFromCache = Ebean.find(Order.class, 1L); + Order orderFromCache = DB.find(Order.class, 1L); OrderDetail orderDetailFromCache = orderFromCache.getDetails().get(0); // trigger reading from the DB @@ -410,7 +410,7 @@ public class TestCacheCollectionIds extends BaseTestCase { ResetBasicData.reset(); // load the cache with the order - Order order1 = Ebean.find(Order.class, 1L); + Order order1 = DB.find(Order.class, 1L); // load the Collection IDs (order.orderDetail) cache OrderDetail orderDetail1 = order1.getDetails().get(0); @@ -418,16 +418,16 @@ public class TestCacheCollectionIds extends BaseTestCase { // delete one order detail from DB using native SQL. This triggers clearing of OrderDetail caches // and should also clear any Collection IDs caches targeting OrderDetail bean String updStatement = "delete from o_order_detail where id = :id"; - SqlUpdate update = Ebean.createSqlUpdate(updStatement); + SqlUpdate update = DB.sqlUpdate(updStatement); update.setParameter("id", orderDetail1.getId()); int rows = update.execute(); assertEquals(1, rows); // We need to notify the cache manually - Ebean.externalModification("o_order_detail", false, false, true); + DB.externalModification("o_order_detail", false, false, true); // read the order from cache - Order orderFromCache = Ebean.find(Order.class, 1L); + Order orderFromCache = DB.find(Order.class, 1L); OrderDetail orderDetailFromCache = orderFromCache.getDetails().get(0); // trigger reading the whole bean diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java index 74f7cc3b5..32f2a3c40 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -21,18 +21,18 @@ public class TestCacheCustomer extends BaseTestCase { ResetBasicData.reset(); - Country nz = Ebean.getReference(Country.class, "NZ"); + Country nz = DB.getReference(Country.class, "NZ"); Address address = new Address(); address.setLine1("Some Place"); address.setCity("Auckland"); address.setCountry(nz); - Ebean.save(address); + DB.save(address); address.setLine2("Else"); - Ebean.save(address); + DB.save(address); - Ebean.delete(address); + DB.delete(address); } @Test @@ -40,7 +40,7 @@ public class TestCacheCustomer extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) + List list = DB.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) .findList(); assertTrue(list.size() > 1); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java index c73954ff9..02c220f3b 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import org.tests.model.basic.OCachedBeanChild; @@ -25,21 +25,21 @@ public class TestCacheDelete extends BaseTestCase { OCachedBean parentBean = new OCachedBean(); parentBean.getChildren().add(child); parentBean.getChildren().add(child2); - Ebean.save(parentBean); + DB.save(parentBean); // confirm there are 2 children loaded from the parent - assertEquals(2, Ebean.find(OCachedBean.class, parentBean.getId()).getChildren().size()); + assertEquals(2, DB.find(OCachedBean.class, parentBean.getId()).getChildren().size()); // ensure cache has been populated - Ebean.find(OCachedBeanChild.class, child.getId()); - child2 = Ebean.find(OCachedBeanChild.class, child2.getId()); - parentBean = Ebean.find(OCachedBean.class, parentBean.getId()); + DB.find(OCachedBeanChild.class, child.getId()); + child2 = DB.find(OCachedBeanChild.class, child2.getId()); + parentBean = DB.find(OCachedBean.class, parentBean.getId()); // act - Ebean.delete(child2); + DB.delete(child2); awaitL2Cache(); - OCachedBean beanFromCache = Ebean.find(OCachedBean.class, parentBean.getId()); + OCachedBean beanFromCache = DB.find(OCachedBean.class, parentBean.getId()); assertEquals(1, beanFromCache.getChildren().size()); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index 95fc22d92..1ac26bf40 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -19,24 +19,24 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { Customer customer = new Customer(); customer.setName("daCustomer"); - Ebean.save(customer); + DB.save(customer); Order order = new Order(); order.setStatus(Order.Status.NEW); order.setCustomer(customer); - Ebean.save(order); + DB.save(order); - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Order foundOrder = Ebean.find(Order.class) + Order foundOrder = DB.find(Order.class) .where().eq("id", order.getId()) .findOne(); foundOrder.setStatus(Order.Status.APPROVED); - assertTrue(Ebean.getBeanState(foundOrder).isDirty()); + assertTrue(DB.getBeanState(foundOrder).isDirty()); - Customer foundCustomer = Ebean.find(Customer.class) + Customer foundCustomer = DB.find(Customer.class) .where().eq("id", customer.getId()) .findOne(); @@ -46,14 +46,14 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { Order order1 = foundCustomer.getOrders().get(0); assertSame(foundOrder, order1); - assertTrue(Ebean.getBeanState(foundOrder).isDirty()); + assertTrue(DB.getBeanState(foundOrder).isDirty()); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } // cleanup - Ebean.delete(order); - Ebean.delete(customer); + DB.delete(order); + DB.delete(customer); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java index c54202896..415591b14 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.OCachedInhChildA; import org.tests.model.basic.OCachedInhRoot; import org.junit.jupiter.api.Test; @@ -20,15 +20,15 @@ public class TestCacheManyToOne extends BaseTestCase { OCachedInhChildA bean = new OCachedInhChildA(); bean.setName("Roland"); bean.setChildAData("ChildData"); - Ebean.save(bean); + DB.save(bean); - Ebean.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean0 -> { + DB.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean0 -> { assertNotNull(bean0); assertThat(bean0.getName()).isEqualTo("Roland"); assertThat(((OCachedInhChildA)bean0).getChildAData()).isEqualTo("ChildData"); }); - Ebean.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean1 -> { + DB.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean1 -> { assertNotNull(bean1); assertThat(bean1.getName()).isEqualTo("Roland"); // this will fail if the bean is loaded from cache and the wrong discriminator is used. diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java index 412010235..48baaaadb 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.junit.jupiter.api.Test; @@ -22,9 +22,9 @@ public class TestCacheNaturalId extends BaseTestCase { ResetBasicData.reset(); - ServerCache contactCache = Ebean.getServerCacheManager().beanCache(Contact.class); + ServerCache contactCache = DB.cacheManager().beanCache(Contact.class); - List list = Ebean.find(Contact.class).setBeanCacheMode(CacheMode.PUT).findList(); + List list = DB.find(Contact.class).setBeanCacheMode(CacheMode.PUT).findList(); assertTrue(contactCache.size() > 0); @@ -38,11 +38,11 @@ public class TestCacheNaturalId extends BaseTestCase { contactCache.statistics(true); - Contact c0 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); + Contact c0 = DB.find(Contact.class).where().eq("email", emailToSearch).findOne(); ServerCacheStatistics stats0 = contactCache.statistics(false); - Contact c1 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); + Contact c1 = DB.find(Contact.class).where().eq("email", emailToSearch).findOne(); ServerCacheStatistics stats1 = contactCache.statistics(false); @@ -53,10 +53,10 @@ public class TestCacheNaturalId extends BaseTestCase { assertEquals(2, stats1.getHitCount()); c1.setEmail("mychangedemail@what.com"); - Ebean.save(c1); + DB.save(c1); awaitL2Cache(); - Contact c2 = Ebean.find(Contact.class).where().eq("email", "mychangedemail@what.com") + Contact c2 = DB.find(Contact.class).where().eq("email", "mychangedemail@what.com") .findOne(); ServerCacheStatistics stats2 = contactCache.statistics(false); diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java index dddb4f7d8..83686b795 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; @@ -21,44 +21,43 @@ public class TestExternalNotification extends BaseTestCase { loadCountryCache(); - ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); + ServerCache countryCache = DB.cacheManager().beanCache(Country.class); assertTrue(countryCache.size() > 0); // inserts don't remove from bean cache - Ebean.externalModification("o_country", true, false, false); + DB.externalModification("o_country", true, false, false); assertTrue(countryCache.size() > 0); // updates flush cache - Ebean.externalModification("o_country", false, true, false); + DB.externalModification("o_country", false, true, false); assertEquals(0, countryCache.size()); loadCountryCache(); assertTrue(countryCache.size() > 0); // deletes flush cache - Ebean.externalModification("o_country", false, false, true); + DB.externalModification("o_country", false, false, true); assertEquals(0, countryCache.size()); loadCountryCache(); assertTrue(countryCache.size() > 0); - ServerCacheManager serverCacheManager = Ebean.getServerCacheManager(); + ServerCacheManager serverCacheManager = DB.cacheManager(); serverCacheManager.clearAll(); assertEquals(0, countryCache.size()); loadCountryCache(); assertTrue(countryCache.size() > 0); - Ebean.getServerCacheManager().clear(Country.class); + DB.cacheManager().clear(Country.class); assertEquals(0, countryCache.size()); loadCountryCache(); int cacheSize = countryCache.size(); assertTrue(cacheSize > 0); - SqlUpdate sqlUpdate = Ebean - .createSqlUpdate("update o_country set name = :name where code = :code"); + SqlUpdate sqlUpdate = DB.sqlUpdate("update o_country set name = :name where code = :code"); sqlUpdate.setParameter("name", "Aotearoa"); sqlUpdate.setParameter("code", "NZ"); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 044c1f932..0655ae4c4 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -1,7 +1,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; import io.ebeaninternal.server.querydefn.OrmQueryDetail; @@ -25,16 +25,16 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { f1.setName("one"); f1.setDescription("helloOne"); - Ebean.save(f1); + DB.save(f1); - ServerCache beanCache = Ebean.getServerCacheManager().beanCache(FeatureDescription.class); + ServerCache beanCache = DB.cacheManager().beanCache(FeatureDescription.class); beanCache.statistics(true); OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("name"); // TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); - Query query = Ebean.find(FeatureDescription.class).setId(f1.getId()); + Query query = DB.find(FeatureDescription.class).setId(f1.getId()); // tunedInfo.tuneQuery((SpiQuery) query); @@ -46,12 +46,12 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { assertEquals("helloOne", description0); // load the cache - FeatureDescription fetchOne = Ebean.find(FeatureDescription.class, f1.getId()); + FeatureDescription fetchOne = DB.find(FeatureDescription.class, f1.getId()); assertNotNull(fetchOne); assertEquals(1, beanCache.statistics(false).getSize()); - FeatureDescription fetchTwo = Ebean.find(FeatureDescription.class, f1.getId()); - FeatureDescription fetchThree = Ebean.find(FeatureDescription.class, f1.getId()); + FeatureDescription fetchTwo = DB.find(FeatureDescription.class, f1.getId()); + FeatureDescription fetchThree = DB.find(FeatureDescription.class, f1.getId()); assertSame(fetchTwo, fetchThree); String description1 = fetchThree.getDescription(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index ea50565d8..fceb16e79 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; @@ -18,9 +18,9 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { public void dirtyFlag_reset_after_lazy() { L2CachedLazyDirtFlagResetBean bean = new L2CachedLazyDirtFlagResetBean(); //PREPARE - try (Transaction tx0 = Ebean.beginTransaction()) { + try (Transaction tx0 = DB.beginTransaction()) { bean.setName("findById"); - Ebean.save(bean); + DB.save(bean); //bean.save(); tx0.commit(); } @@ -30,34 +30,34 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { server().cacheManager().clearAll(); //TEST - try (Transaction tx1 = Ebean.beginTransaction()) { + try (Transaction tx1 = DB.beginTransaction()) { // load (and dont touch any related entity) - L2CachedLazyDirtFlagResetBean bean1 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); + L2CachedLazyDirtFlagResetBean bean1 = DB.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); assertThat(bean1).isNotNull(); tx1.commit(); } - try (Transaction tx2 = Ebean.beginTransaction()) { + try (Transaction tx2 = DB.beginTransaction()) { // load (and modify) - L2CachedLazyDirtFlagResetBean bean2 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); + L2CachedLazyDirtFlagResetBean bean2 = DB.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); assertNotNull(bean2); assertEquals("findById", bean2.getName()); bean2.setName("something"); - BeanState beanState = Ebean.getBeanState(bean2); + BeanState beanState = DB.getBeanState(bean2); assertTrue(beanState.isDirty()); //bean2.getChildren().size(); bean2.someRichObjectMethod(); assertTrue(beanState.isDirty()); - Ebean.update(bean2); + DB.update(bean2); tx2.commit(); } - try(Transaction tx3 = Ebean.beginTransaction()) { + try(Transaction tx3 = DB.beginTransaction()) { // validation - L2CachedLazyDirtFlagResetBean bean3 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); + L2CachedLazyDirtFlagResetBean bean3 = DB.find(L2CachedLazyDirtFlagResetBean.class, bean.getId()); assertEquals("something", bean3.getName()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index b9db72a07..4c84f6f22 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -217,7 +217,7 @@ public class TestQueryCache extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = DB.getServerCacheManager().queryCache(Customer.class); + ServerCache customerCache = DB.cacheManager().queryCache(Customer.class); customerCache.clear(); List list = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() @@ -251,7 +251,7 @@ public class TestQueryCache extends BaseTestCase { assertTrue(list3.size() > 0); // TODO: At this stage setReadOnly(false) does create a shallow copy of the List/Set/Map, but does not // change the read only state in the entities. - // assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly()); + // assertFalse(DB.getBeanState(list3.get(0)).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 54e94fce9..890a70b0b 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.*; public class TestQueryCacheCountry extends BaseTestCase { - private final ServerCacheManager cacheManager = DB.getServerCacheManager(); + private final ServerCacheManager cacheManager = DB.cacheManager(); private final ServerCache queryCache = cacheManager.queryCache(Country.class); private final ServerCache beanCache = cacheManager.beanCache(Country.class); @@ -33,7 +33,7 @@ public class TestQueryCacheCountry extends BaseTestCase { ResetBasicData.reset(); clearCache(); - List countryList0 = Ebean.find(Country.class) + List countryList0 = DB.find(Country.class) .setUseQueryCache(true) .where().startsWith("name", "XLKMG") .order().asc("name") @@ -45,7 +45,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertEquals(1, queryStats.getMissCount()); assertEquals(1, queryStats.getSize()); - List countryList1 = Ebean.find(Country.class) + List countryList1 = DB.find(Country.class) .setUseQueryCache(true) .where().startsWith("name", "XLKMG") .order().asc("name") @@ -66,14 +66,14 @@ public class TestQueryCacheCountry extends BaseTestCase { awaitL2Cache(); clearCache(); - List countryList0 = Ebean.find(Country.class) + List countryList0 = DB.find(Country.class) .setUseQueryCache(true) .where().raw("code = ?", "NZ") .findList(); assertThat(countryList0.get(0).getName()).isEqualTo("New Zealand"); - List countryList1 = Ebean.find(Country.class) + List countryList1 = DB.find(Country.class) .setUseQueryCache(true) .where().raw("code = ?", "AU") .findList(); @@ -87,7 +87,7 @@ public class TestQueryCacheCountry extends BaseTestCase { // we get a hit this time - List countryList2 = Ebean.find(Country.class) + List countryList2 = DB.find(Country.class) .setUseQueryCache(true) .where().raw("code = ?", "NZ") .findList(); @@ -100,7 +100,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertEquals(1, queryStats2.getHitCount()); // got a hit // we get a hit on AU - List countryList3 = Ebean.find(Country.class) + List countryList3 = DB.find(Country.class) .setUseQueryCache(true) .where().raw("code = ?", "AU") .findList(); @@ -123,7 +123,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertEquals(0, queryCache.statistics(false).getSize()); - List countryList0 = Ebean.find(Country.class) + List countryList0 = DB.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); @@ -131,7 +131,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertEquals(1, queryCache.statistics(false).getSize()); assertTrue(!countryList0.isEmpty()); - List countryList1 = Ebean.find(Country.class) + List countryList1 = DB.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); @@ -141,24 +141,24 @@ public class TestQueryCacheCountry extends BaseTestCase { assertEquals(1, statistics.getHitCount()); assertSame(countryList1, countryList0); - Country nz = Ebean.find(Country.class, "NZ"); + Country nz = DB.find(Country.class, "NZ"); nz.setName("New Zealandia"); - Ebean.save(nz); + DB.save(nz); awaitL2Cache(); statistics = queryCache.statistics(false); assertEquals(0, statistics.getSize()); - List countryList2 = Ebean.find(Country.class) + List countryList2 = DB.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); assertNotSame(countryList2, countryList0); - nz = Ebean.find(Country.class, "NZ"); + nz = DB.find(Country.class, "NZ"); nz.setName("New Zealand"); - Ebean.save(nz); + DB.save(nz); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 88cdd7d06..677baec98 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -1,8 +1,8 @@ package org.tests.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ public class TestQueryCacheInsert extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); EBasicVer account = new EBasicVer("junk"); server.save(account); @@ -42,12 +42,12 @@ public class TestQueryCacheInsert extends BaseTestCase { EBasicVer doda = new EBasicVer("doda"); doda.setDescription("OddButUniqueSillyExample"); - Ebean.save(doda); + DB.save(doda); - ServerCache queryCache = Ebean.getServerCacheManager().queryCache(EBasicVer.class); + ServerCache queryCache = DB.cacheManager().queryCache(EBasicVer.class); queryCache.statistics(true); - Optional found0 = Ebean.find(EBasicVer.class) + Optional found0 = DB.find(EBasicVer.class) .where().eq("description", "OddButUniqueSillyExample") .setUseQueryCache(true) .findOneOrEmpty(); @@ -55,7 +55,7 @@ public class TestQueryCacheInsert extends BaseTestCase { assertTrue(found0.isPresent()); assertHitMiss(0, 1, queryCache); - EBasicVer found1 = Ebean.find(EBasicVer.class) + EBasicVer found1 = DB.find(EBasicVer.class) .where().eq("description", "OddButUniqueSillyExample") .setUseQueryCache(true) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index 73123adde..602809718 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -2,8 +2,8 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Query; import org.tests.model.basic.EBasicVer; @@ -20,7 +20,7 @@ public class TestQueryCacheReadOnly extends BaseTestCase { @Test public void testReadOnly() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); EBasicVer account = new EBasicVer("an other junk"); server.save(account); @@ -67,7 +67,7 @@ public class TestQueryCacheReadOnly extends BaseTestCase { @Test public void testNotReadOnly() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); EBasicVer account = new EBasicVer("an other junk"); server.save(account); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 97511cef9..2fce790b7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -2,10 +2,8 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import io.ebean.Query; import io.ebean.cache.ServerCache; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -25,20 +23,20 @@ public class TestQueryCacheTableDependency extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = Ebean.getServerCacheManager().queryCache(Customer.class); + ServerCache customerCache = DB.cacheManager().queryCache(Customer.class); customerCache.clear(); - List
    addrs = Ebean.find(Address.class) + List
    addrs = DB.find(Address.class) .where().eq("line2", "St Lukes") .findList(); - int custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + int custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lukes") .findCount(); assertThat(custs).isEqualTo(3); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lukes") .findCount(); @@ -46,33 +44,33 @@ public class TestQueryCacheTableDependency extends BaseTestCase { Address a1 = addrs.get(0); a1.setLine2("St Lucky"); - Ebean.save(a1); + DB.save(a1); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lukes") .findCount(); assertThat(custs).isEqualTo(2); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lucky") .findCount(); assertThat(custs).isEqualTo(1); - Ebean.update(Address.class) + DB.update(Address.class) .set("line2", "St Lucky2") .where().eq("line2", "St Lucky") .update(); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lucky") .findCount(); assertThat(custs).isEqualTo(0); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lucky2") .findCount(); assertThat(custs).isEqualTo(1); @@ -81,12 +79,12 @@ public class TestQueryCacheTableDependency extends BaseTestCase { .setParameters("St Lucky3", "St Lucky2") .execute(); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lucky2") .findCount(); assertThat(custs).isEqualTo(0); - custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + custs = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where().eq("billingAddress.line2", "St Lucky3") .findCount(); @@ -99,9 +97,9 @@ public class TestQueryCacheTableDependency extends BaseTestCase { ResetBasicData.reset(); - Customer fi = Ebean.find(Customer.class).where().eq("name", "Fiona").findOne(); + Customer fi = DB.find(Customer.class).where().eq("name", "Fiona").findOne(); - int custCount0 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + int custCount0 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where() .eq("name", "Fiona") .isNull("contacts.phone") @@ -109,7 +107,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase { assertThat(custCount0).isEqualTo(1); - int updateRows = Ebean.update(Contact.class) + int updateRows = DB.update(Contact.class) .set("phone", "1234") .where() .eq("customer.id", fi.getId()) @@ -117,7 +115,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase { assertThat(updateRows).isGreaterThan(0); - int custCount1 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true) + int custCount1 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true) .where() .eq("name", "Fiona") .isNull("contacts.phone") @@ -138,8 +136,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("bobby"); child.setBillingAddress(root); DB.save(child); - DB.getServerCacheManager().queryCache(Address.class).clear(); - DB.getServerCacheManager().queryCache(Customer.class).clear(); + DB.cacheManager().queryCache(Address.class).clear(); + DB.cacheManager().queryCache(Customer.class).clear(); // Test preparation finished, start the test Thread.sleep(10); @@ -169,8 +167,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("testChild"); child.setRoot(root); DB.save(child); - DB.getServerCacheManager().queryCache(ECacheChild.class).clear(); - DB.getServerCacheManager().queryCache(ECacheRoot.class).clear(); + DB.cacheManager().queryCache(ECacheChild.class).clear(); + DB.cacheManager().queryCache(ECacheRoot.class).clear(); // Test preparation finished, start the test Thread.sleep(10); // we need this thread.sleep here, because on a fast machine, DB.save(child) and computing the diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java index 49649482c..1c6151f1d 100644 --- a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java +++ b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -12,16 +12,16 @@ public class TestBeanCacheEmbeddedIdPrimitives { public void findById() { CEPProduct product1a = new CEPProduct("Product 01"); - Ebean.save(product1a); + DB.save(product1a); assertNotNull(product1a.getId()); CEPCategory category1a = new CEPCategory("Category 01"); - Ebean.save(category1a); + DB.save(category1a); assertNotNull(category1a.getId()); - CEPProduct product1 = Ebean.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne(); + CEPProduct product1 = DB.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne(); assertNotNull(product1); @@ -30,7 +30,7 @@ public class TestBeanCacheEmbeddedIdPrimitives { }); assertThat(product1.getProductCategories()).isEmpty(); - CEPProduct product2 = Ebean.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne(); + CEPProduct product2 = DB.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne(); assertNotNull(product2); // fail here on null -> long conversion in embedded id diff --git a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java index 70caa7d29..933bb076f 100644 --- a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -2,8 +2,8 @@ package org.tests.callable; import io.ebean.BaseTestCase; import io.ebean.CallableSql; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class TestMysqlCallable extends BaseTestCase { public void test() { // mysql specific test - EbeanServer server = Ebean.getServer("mysql"); + Database server = DB.byName("mysql"); EBasic basic = new EBasic(); basic.setName("calling"); diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index e98e21878..8cf1bafee 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.AfterEach; @@ -23,7 +23,7 @@ public class TestMultiCascadeBatch extends BaseTestCase { @BeforeEach public void before() { - txn = Ebean.beginTransaction(); + txn = DB.beginTransaction(); } @AfterEach @@ -69,7 +69,7 @@ public class TestMultiCascadeBatch extends BaseTestCase { final Site mainSite = new Site(); mainSite.setName("mainSite"); - Ebean.save(mainSite); + DB.save(mainSite); // create child including data final Site childSite = new Site(); @@ -88,7 +88,7 @@ public class TestMultiCascadeBatch extends BaseTestCase { mainSite.getChildren().add(childSite); mainSite.setName("a different name"); - Ebean.save(mainSite); + DB.save(mainSite); } } diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java index 4965fa834..e2c8ff81f 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; @@ -26,9 +26,9 @@ public class TestPrivateOwned extends BaseTestCase { m0.addDetail(new TSDetail("m1 detail 1")); m0.addDetail(new TSDetail("m1 detail 2")); - Ebean.save(m0); + DB.save(m0); - TSMaster master = Ebean.find(TSMaster.class, m0.getId()); + TSMaster master = DB.find(TSMaster.class, m0.getId()); List details = master.getDetails(); TSDetail removedDetail = details.remove(1); @@ -40,15 +40,15 @@ public class TestPrivateOwned extends BaseTestCase { assertTrue(modifyRemovals.size() == 1); assertTrue(modifyRemovals.contains(removedDetail)); - Ebean.save(master); + DB.save(master); - TSMaster masterReload = Ebean.find(TSMaster.class, m0.getId()); + TSMaster masterReload = DB.find(TSMaster.class, m0.getId()); List detailsReload = masterReload.getDetails(); // the removed bean has really been removed assertTrue(detailsReload.size() == 1); - TSMaster master3 = Ebean.find(TSMaster.class, m0.getId()); + TSMaster master3 = DB.find(TSMaster.class, m0.getId()); List details3 = master3.getDetails(); details3.clear(); } @@ -63,23 +63,23 @@ public class TestPrivateOwned extends BaseTestCase { m0.addDetail(new TSDetail("m2 detail 1")); m0.addDetail(new TSDetail("m2 detail 2")); - Ebean.save(m0); + DB.save(m0); assertThat(m0.getDetails()).hasSize(2); LoggedSqlCollector.start(); m0.getDetails().remove(0); - Ebean.save(m0); + DB.save(m0); List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?"); assertSqlBind(loggedSql.get(1)); - TSMaster masterReload = Ebean.find(TSMaster.class, m0.getId()); + TSMaster masterReload = DB.find(TSMaster.class, m0.getId()); assertThat(masterReload.getDetails()).hasSize(1); LoggedSqlCollector.start(); - Ebean.save(m0); + DB.save(m0); loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(0); diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 7c7bf8c67..5924c9d4f 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import org.junit.jupiter.api.Test; @@ -15,19 +15,19 @@ public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { // setup TSMaster master0 = new TSMaster(); - Ebean.save(master0); + DB.save(master0); // act - TSMaster master1 = Ebean.find(master0.getClass(), master0.getId()); + TSMaster master1 = DB.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); + DB.save(master1); - TSMaster master2 = Ebean.find(master1.getClass(), master1.getId()); + TSMaster master2 = DB.find(master1.getClass(), master1.getId()); assertTrue(master2.getDetails().isEmpty()); } diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java index 3ce671419..ebc6fe9bc 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; @@ -17,16 +17,16 @@ public class TestPrivateOwnedCascadeOrder extends BaseTestCase { master.getDetails().add(new TSDetail("c97", "ONE")); master.getDetails().add(new TSDetail("c96", "TWO")); - Ebean.save(master); + DB.save(master); // act - TSMaster master1 = Ebean.find(master.getClass(), master.getId()); + TSMaster master1 = DB.find(master.getClass(), master.getId()); // Check Ebean deletes the existing c97 first as the unique values clash master1.getDetails().clear(); master1.getDetails().add(new TSDetail("c98", "TWO")); - Ebean.save(master1); + DB.save(master1); } @Test @@ -37,25 +37,25 @@ public class TestPrivateOwnedCascadeOrder extends BaseTestCase { master.getDetails().add(new TSDetail("d97", "ONE2")); master.getDetails().add(new TSDetail("d96", "TWO2")); - Ebean.save(master); + DB.save(master); // act - TSMaster master1 = Ebean.find(master.getClass(), master.getId()); + TSMaster master1 = DB.find(master.getClass(), master.getId()); // Check Ebean deletes the existing d96 first as the unique values clash - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { master1.getDetails().clear(); master1.getDetails().add(new TSDetail("d98", "TWO2")); - Ebean.save(master1); + DB.save(master1); transaction.commit(); } finally { transaction.end(); } // Cleanup - Ebean.find(TSDetail.class).where().or().eq("name", "d97").eq("name", "d98").delete(); - Ebean.delete(master1); + DB.find(TSDetail.class).where().or().eq("name", "d97").eq("name", "d98").delete(); + DB.delete(master1); } } diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index 50cf83a9d..0fe581597 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import org.junit.jupiter.api.Test; @@ -25,23 +25,23 @@ public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { /** recovered after transient child ignored **/ TSMaster master2 = null; - Ebean.save(master0); + DB.save(master0); - master1 = Ebean.find(master0.getClass(), master0.getId()); + master1 = DB.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); + DB.save(master1); } catch (OptimisticLockException exception) { // Occured when the "unsaved" bean was wrongly being deleted fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); return; } - master2 = master1 = Ebean.find(master1.getClass(), master1.getId()); + master2 = master1 = DB.find(master1.getClass(), master1.getId()); assertTrue(master2.getDetails().isEmpty()); } diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java index fe42c14cb..48d855918 100644 --- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java +++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java @@ -1,7 +1,7 @@ package org.tests.changelog; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; @@ -13,10 +13,10 @@ public class TestChangeLogInt extends BaseTestCase { EBasicChangeLog bean3 = new EBasicChangeLog(); bean3.setName("bean3"); bean3.setShortDescription("bean3 hi"); - Ebean.save(bean3); + DB.save(bean3); bean3.setName("mod bean3"); bean3.setShortDescription("update bean3"); - Ebean.save(bean3); + DB.save(bean3); } } diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index aefb28085..b796d5c05 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -1,8 +1,8 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Query; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; @@ -30,7 +30,7 @@ public class TestCKeyIdInExpression extends BaseTestCase { rCustomer.setKey(customerKey); rCustomer.setDescription("some foo for ms sql server"); - Ebean.save(rCustomer); + DB.save(rCustomer); ROrderPK k0 = new ROrderPK("compa", 100); ROrder rOrder = new ROrder(); @@ -38,14 +38,14 @@ public class TestCKeyIdInExpression extends BaseTestCase { rOrder.setOrderPK(k0); rOrder.setItem("Chair"); - Ebean.save(rOrder); + DB.save(rOrder); } //@Test public void notRanAutomatically() { //EbeanServer server = CreateIdExpandedFormServer.create(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); ROrderPK k0 = new ROrderPK("compa", 100); ROrderPK k1 = new ROrderPK("compa", 101); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index f58453e3f..7c0f3c955 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -1,7 +1,7 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.PagedList; import io.ebean.Query; import org.tests.model.basic.CKeyAssoc; @@ -22,9 +22,9 @@ public class TestCKeyLazyLoad extends BaseTestCase { @Test public void test() { - Ebean.find(CKeyDetail.class).delete(); - Ebean.find(CKeyParent.class).delete(); - Ebean.find(CKeyAssoc.class).delete(); + DB.find(CKeyDetail.class).delete(); + DB.find(CKeyParent.class).delete(); + DB.find(CKeyAssoc.class).delete(); CKeyParentId id = new CKeyParentId(1, "one"); @@ -38,7 +38,7 @@ public class TestCKeyLazyLoad extends BaseTestCase { p.add(new CKeyDetail("somethine one")); p.add(new CKeyDetail("somethine two")); - Ebean.save(p); + DB.save(p); CKeyAssoc assoc2 = new CKeyAssoc(); assoc2.setAssocOne("assocTwo"); @@ -52,18 +52,18 @@ public class TestCKeyLazyLoad extends BaseTestCase { p2.add(new CKeyDetail("somethine one")); p2.add(new CKeyDetail("somethine two")); - Ebean.save(p2); + DB.save(p2); exerciseMaxRowsQuery_with_embeddedId(); CKeyParentId searchId = new CKeyParentId(1, "one"); - CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne(); + CKeyParent found = DB.find(CKeyParent.class).where().idEq(searchId).findOne(); assertNotNull(found); assertEquals(2, found.getDetails().size()); - List list = Ebean.find(CKeyParent.class).findList(); + List list = DB.find(CKeyParent.class).findList(); assertThat(list.size()).isGreaterThan(1); @@ -77,13 +77,13 @@ public class TestCKeyLazyLoad extends BaseTestCase { idList.add(id); idList.add(id2); - Query queryIdIn = Ebean.find(CKeyParent.class).where().idIn(idList).query(); + Query queryIdIn = DB.find(CKeyParent.class).where().idIn(idList).query(); List idInTestList = queryIdIn.findList(); assertThat(idInTestList.size()).isEqualTo(2); - List idInTestList2 = Ebean.find(CKeyParent.class).where().idIn(id, id2).findList(); + List idInTestList2 = DB.find(CKeyParent.class).where().idIn(id, id2).findList(); assertThat(idInTestList2).hasSameSizeAs(idInTestList); } @@ -92,7 +92,7 @@ public class TestCKeyLazyLoad extends BaseTestCase { */ private void exerciseMaxRowsQuery_with_embeddedId() { - PagedList siteUserPage = Ebean.find(CKeyParent.class).where() + PagedList siteUserPage = DB.find(CKeyParent.class).where() .order("name asc") .setMaxRows(10) .findPagedList(); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index 0cea9e28f..77344808f 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -1,7 +1,7 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.compositekeys.db.CaoBean; import org.tests.compositekeys.db.CaoKey; import org.junit.jupiter.api.Test; @@ -11,7 +11,7 @@ public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { @Test public void test() { - Ebean.deleteAll(Ebean.find(CaoBean.class).findList()); + DB.deleteAll(DB.find(CaoBean.class).findList()); CaoKey key = new CaoKey(); key.setCustomer(123); @@ -21,7 +21,7 @@ public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { bean.setKey(key); bean.setDescription("some desc"); - Ebean.save(bean); + DB.save(bean); } } diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java index 2db126951..6004c8762 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java @@ -1,7 +1,7 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; import org.junit.jupiter.api.BeforeEach; @@ -24,10 +24,10 @@ public class TestCore extends BaseTestCase { @BeforeEach public void setUp() throws Exception { - Ebean.createUpdate(Item.class, "delete from Item").execute(); - Ebean.createUpdate(Region.class, "delete from Region").execute(); - Ebean.createUpdate(Type.class, "delete from Type").execute(); - Ebean.createUpdate(SubType.class, "delete from SubType").execute(); + DB.createUpdate(Item.class, "delete from Item").execute(); + DB.createUpdate(Region.class, "delete from Region").execute(); + DB.createUpdate(Type.class, "delete from Type").execute(); + DB.createUpdate(SubType.class, "delete from SubType").execute(); try (Transaction tx = server().beginTransaction()) { SubType subType = new SubType(); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index a632649ef..a01e301d1 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -1,7 +1,7 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.Identity; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -36,11 +36,11 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { public void before() { // remove all the User records first - Ebean.deleteAll(Ebean.find(User.class).findList()); + DB.deleteAll(DB.find(User.class).findList()); // insert 2 User records - Ebean.save(new User(1L, "one")); - Ebean.save(new User(2L, "two")); + DB.save(new User(1L, "one")); + DB.save(new User(2L, "two")); } /** @@ -49,10 +49,10 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { @Test public void testDeleteById() { - assertEquals(2, Ebean.find(User.class).findList().size()); - Ebean.delete(User.class, 1L); - Ebean.delete(User.class, 2L); - assertEquals(0, Ebean.find(User.class).findList().size()); + assertEquals(2, DB.find(User.class).findList().size()); + DB.delete(User.class, 1L); + DB.delete(User.class, 2L); + assertEquals(0, DB.find(User.class).findList().size()); } /** @@ -62,21 +62,21 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { @Test public void testDeleteByIdList() { - assertEquals(2, Ebean.find(User.class).findList().size()); + assertEquals(2, DB.find(User.class).findList().size()); List ids = new ArrayList<>(); ids.add(1L); ids.add(2L); - Ebean.deleteAll(User.class, ids); // PersistenceException would be thrown here - assertEquals(0, Ebean.find(User.class).findList().size()); + DB.deleteAll(User.class, ids); // PersistenceException would be thrown here + assertEquals(0, DB.find(User.class).findList().size()); } @Test public void testFindByParentIdList() { - assertEquals(2, Ebean.find(User.class).findList().size()); + assertEquals(2, DB.find(User.class).findList().size()); - SpiEbeanServer spiServer = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer spiServer = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 6715efb5c..cbd70ce07 100644 --- a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -2,8 +2,8 @@ package org.tests.contructor; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.bean.EntityBean; import org.tests.model.basic.MProtectedConstructBean; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ public class TestProtectedConstructor extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); // check that we can construc a bean with a protected constructor MProtectedConstructBean bean = server.createEntityBean(MProtectedConstructBean.class); @@ -29,7 +29,7 @@ public class TestProtectedConstructor extends BaseTestCase { Object newBeanInstance = entityBean._ebean_newInstance(); assertNotNull(newBeanInstance); - BeanState beanState = Ebean.getBeanState(newBeanInstance); + BeanState beanState = DB.getBeanState(newBeanInstance); assertTrue(beanState.isNew()); assertNotSame(entityBean, newBeanInstance); diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java index fed74f781..c3b0a09c2 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java @@ -19,7 +19,7 @@ public class TestDExhEntityEl { // DExhEntity p = new DExhEntity(); // p.setExhange(exh); // -// SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); +// SpiEbeanServer server = (SpiEbeanServer)DB.getDefault(); // // BeanDescriptor descriptor = server.getBeanDescriptor(DExhEntity.class); // diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 72aaa6d9b..28a4f868b 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -1,6 +1,6 @@ package org.tests.ddd.iud; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; @@ -29,9 +29,9 @@ public class TestDPersonEl { p.setLastName("last"); p.setSalary(new Money("12200")); - Ebean.save(p); + DB.save(p); - SpiServer server = Ebean.getDefaultServer().pluginApi(); + SpiServer server = DB.getDefault().pluginApi(); BeanType descriptor = server.beanType(DPerson.class); diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java index 897d0563a..686363fe9 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java @@ -19,12 +19,12 @@ public class TestDPersonIUD { // // p.setInterval(new Interval(System.currentTimeMillis()-20000, System.currentTimeMillis())); // -// Ebean.save(p); +// DB.save(p); // // Oid id = p.getId(); // Assert.assertNotNull(id); // -// DPerson p2 = Ebean.find(DPerson.class) +// DPerson p2 = DB.find(DPerson.class) // .setAutoTune(false) // .where().idEq(id) // .findOne(); @@ -37,7 +37,7 @@ public class TestDPersonIUD { // Assert.assertEquals(NZD, p2.getCmoney().getCurrency()); // // -// Query query = Ebean.find(DPerson.class) +// Query query = DB.find(DPerson.class) // .setAutoTune(false) // .where().gt("cmoney.amount",1) // .query(); diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java index 9dc78289b..de6e66ad1 100644 --- a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -1,7 +1,7 @@ package org.tests.ddl; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; @@ -17,15 +17,15 @@ public class TestForeignKeyModes extends BaseTestCase { public void none() { DfkOne one = new DfkOne("one"); - Ebean.save(one); + DB.save(one); DfkNone none = new DfkNone("none", one); - Ebean.save(none); + DB.save(none); // fails unless there is no Foreign key ... - Ebean.delete(one); + DB.delete(one); - DfkNone found = Ebean.find(DfkNone.class, none.getId()); + DfkNone found = DB.find(DfkNone.class, none.getId()); assertThat(found).isNotNull(); // we still reference one ... even though it does not exist anymore assertThat(found.getOne()).isNotNull(); @@ -36,15 +36,15 @@ public class TestForeignKeyModes extends BaseTestCase { public void noneViaJoin() { DfkOne one = new DfkOne("one2"); - Ebean.save(one); + DB.save(one); DfkNoneViaJoin none = new DfkNoneViaJoin("none2", one); - Ebean.save(none); + DB.save(none); // fails unless there is no Foreign key ... - Ebean.delete(one); + DB.delete(one); - DfkNoneViaJoin found = Ebean.find(DfkNoneViaJoin.class, none.getId()); + DfkNoneViaJoin found = DB.find(DfkNoneViaJoin.class, none.getId()); assertThat(found).isNotNull(); // we still reference one ... even though it does not exist anymore assertThat(found.getOne()).isNotNull(); @@ -53,7 +53,7 @@ public class TestForeignKeyModes extends BaseTestCase { @Test public void noneViaManyToMany() { - DfkOne one = Ebean.getReference(DfkOne.class, 999L); + DfkOne one = DB.getReference(DfkOne.class, 999L); DfkNoneViaMtoM none = new DfkNoneViaMtoM("none2"); none.getOnes().add(one); @@ -61,9 +61,9 @@ public class TestForeignKeyModes extends BaseTestCase { // Would normally fail as DfkOne id:999 is not actually in Database // and with the foreign key constraint on the intersection table the // insert into the intersection table would fail - Ebean.save(none); + DB.save(none); - DfkNoneViaMtoM found = Ebean.find(DfkNoneViaMtoM.class) + DfkNoneViaMtoM found = DB.find(DfkNoneViaMtoM.class) .setId(none.getId()) .fetch("ones", "id") .findOne(); @@ -76,7 +76,7 @@ public class TestForeignKeyModes extends BaseTestCase { assertThat(found.getOnes()).hasSize(0); LoggedSqlCollector.start(); - Ebean.delete(none); + DB.delete(none); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(3); @@ -90,15 +90,15 @@ public class TestForeignKeyModes extends BaseTestCase { public void setNullOnDelete() { DfkOne one = new DfkOne("one2"); - Ebean.save(one); + DB.save(one); DfkSetNull other = new DfkSetNull("none", one); - Ebean.save(other); + DB.save(other); // success with ... fkey value set to null - Ebean.delete(one); + DB.delete(one); - DfkSetNull found = Ebean.find(DfkSetNull.class, other.getId()); + DfkSetNull found = DB.find(DfkSetNull.class, other.getId()); assertThat(found).isNotNull(); assertThat(found.getOne()).isNull(); } @@ -115,18 +115,18 @@ public class TestForeignKeyModes extends BaseTestCase { one.getDetails().add(new DfkCascade("cascade2", one)); one.getDetails().add(new DfkCascade("cascade3", one)); - Ebean.save(one); + DB.save(one); LoggedSqlCollector.start(); - Ebean.delete(one); + DB.delete(one); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("delete from dfk_cascade_one where id=?"); - DfkCascade found = Ebean.find(DfkCascade.class, other.getId()); + DfkCascade found = DB.find(DfkCascade.class, other.getId()); assertThat(found).isNull(); } diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java index 1ccdf17e7..0d33d5e74 100644 --- a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -1,7 +1,7 @@ package org.tests.defaultvalues; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class TestDefaults extends BaseTestCase { } LoggedSqlCollector.start(); - Ebean.save(main); + DB.save(main); final List current = LoggedSqlCollector.current(); assertThat(current).isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index 2e94a0732..d773c010e 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -1,8 +1,8 @@ package org.tests.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; @@ -19,10 +19,10 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { ResetBasicData.reset(); - Ebean.delete(Product.class, 100); - Ebean.delete(Product.class, 101); + DB.delete(Product.class, 100); + DB.delete(Product.class, 101); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); Product prod1 = createProduct(100, "apples"); server.insert(prod1); Product prod2 = createProduct(101, "bananas"); @@ -44,8 +44,8 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { } // cleanup - Ebean.delete(Product.class, 100); - Ebean.delete(Product.class, 101); + DB.delete(Product.class, 100); + DB.delete(Product.class, 101); } private Product createProduct(Integer id, String name) { diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java index 65c60e755..2f114063e 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -260,7 +260,7 @@ public class TestDeleteByQuery extends BaseTestCase { assertThat(query.findCount()).isEqualTo(1); DB.find(Country.class).where().eq("name", "SecretName").delete(); - //Ebean.getDefaultServer().getPluginApi().getBeanType(Country.class).clearQueryCache(); + //DB.getDefault().getPluginApi().getBeanType(Country.class).clearQueryCache(); assertThat(query.findList()).hasSize(0); assertThat(query.findCount()).isEqualTo(0); } diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index d36bca9b4..787de2bd9 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -1,7 +1,7 @@ package org.tests.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -19,12 +19,12 @@ public class TestDeleteCascadeWithListener extends BaseTestCase { m0.getDetails().add(new DcDetail()); m0.getDetails().add(new DcDetail()); - Ebean.save(m0); + DB.save(m0); - DcMaster found = Ebean.find(DcMaster.class, m0.getId()); + DcMaster found = DB.find(DcMaster.class, m0.getId()); LoggedSqlCollector.start(); - Ebean.delete(found); + DB.delete(found); List sql = LoggedSqlCollector.stop(); if (isPersistBatchOnCascade()) { diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index 87b357a93..d78015f5d 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -1,8 +1,8 @@ package org.tests.delete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; @@ -17,13 +17,13 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { public void testSimpleBeanDelete_missingBean_returnsFalse() { // delete by by without version loaded ... should not throw OptimisticLockException - Contact ref = Ebean.getReference(Contact.class, 999999); - assertThat(Ebean.delete(ref)).isFalse(); + Contact ref = DB.getReference(Contact.class, 999999); + assertThat(DB.delete(ref)).isFalse(); - assertThat(Ebean.delete(Contact.class, 999999)).isEqualTo(0); + assertThat(DB.delete(Contact.class, 999999)).isEqualTo(0); // same as above but using Model.delete() - Group modelRef = Ebean.getReference(Group.class, 999999); + Group modelRef = DB.getReference(Group.class, 999999); assertThat(modelRef.delete()).isFalse(); } @@ -31,10 +31,10 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { public void testSimpleBeanDelete_existingBean_returnsTrue() { EBasicVer basic = new EBasicVer("DelTest"); - Ebean.save(basic); + DB.save(basic); - EBasicVer basicRef = Ebean.getReference(EBasicVer.class, basic.getId()); - assertThat(Ebean.delete(basicRef)).isTrue(); + EBasicVer basicRef = DB.getReference(EBasicVer.class, basic.getId()); + assertThat(DB.delete(basicRef)).isTrue(); } @@ -42,22 +42,22 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { public void testSimpleBeanDelete_existingBeanWithJdbcBatch_returnsTrue() { EBasicVer basic = new EBasicVer("DelTestBatch"); - Ebean.save(basic); + DB.save(basic); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction transaction = server.beginTransaction(); try { transaction.setBatchMode(true); // returns true even though the delete has not occurred yet - assertThat(server.delete(Ebean.getReference(EBasicVer.class, basic.getId()), transaction)).isTrue(); + assertThat(server.delete(DB.getReference(EBasicVer.class, basic.getId()), transaction)).isTrue(); // returns true even though the bean does not exist - assertThat(server.delete(Ebean.getReference(EBasicVer.class, 999999), transaction)).isTrue(); + assertThat(server.delete(DB.getReference(EBasicVer.class, 999999), transaction)).isTrue(); transaction.commit(); - assertThat(Ebean.find(EBasicVer.class, basic.getId())).isNull(); + assertThat(DB.find(EBasicVer.class, basic.getId())).isNull(); } finally { transaction.end(); diff --git a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java index f1693e3fb..2d78a94b3 100644 --- a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java @@ -1,8 +1,8 @@ package org.tests.draftable; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ public class DocLinkTest extends BaseTestCase { Link link1 = new Link("something"); link1.save(); - Ebean.getDefaultServer().publish(Link.class, link1.getId()); + DB.getDefault().publish(Link.class, link1.getId()); - Link link = Ebean.find(Link.class) + Link link = DB.find(Link.class) .setId(link1.getId()) .select("name") .findOne(); @@ -64,7 +64,7 @@ public class DocLinkTest extends BaseTestCase { // automatically set asDraft() on lazy loading query linkUpdate.getLocation(); - Ebean.deletePermanent(linkUpdate); + DB.deletePermanent(linkUpdate); } @Test @@ -79,7 +79,7 @@ public class DocLinkTest extends BaseTestCase { link1.setComment("some change"); link1.save(); - Ebean.delete(link1); + DB.delete(link1); } @Test @@ -87,10 +87,10 @@ public class DocLinkTest extends BaseTestCase { Link link1 = new Link("Ld2"); link1.save(); - Ebean.getDefaultServer().publish(Link.class, link1.getId()); + DB.getDefault().publish(Link.class, link1.getId()); - Link link = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); - Ebean.deletePermanent(link); + Link link = DB.find(Link.class).setId(link1.getId()).asDraft().findOne(); + DB.deletePermanent(link); } @Test @@ -99,10 +99,10 @@ public class DocLinkTest extends BaseTestCase { Link link1 = new Link("Ld2"); link1.save(); - Link live = Ebean.getDefaultServer().publish(Link.class, link1.getId()); + Link live = DB.getDefault().publish(Link.class, link1.getId()); try { - Ebean.deletePermanent(live); + DB.deletePermanent(live); fail("never get here"); } catch (PersistenceException e) { @@ -116,16 +116,16 @@ public class DocLinkTest extends BaseTestCase { Link link1 = new Link("Ld2"); link1.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.publish(Link.class, link1.getId()); - link1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); + link1 = DB.find(Link.class).setId(link1.getId()).asDraft().findOne(); assertThat(link1.isDraft()).isTrue(); // this is a soft delete (no automatic publish here, only updates draft) link1.delete(); - Link live = Ebean.find(Link.class).setId(link1.getId()).findOne(); + Link live = DB.find(Link.class).setId(link1.getId()).findOne(); assertThat(live).isNotNull(); assertThat(live.isDraft()).isFalse(); assertThat(live.isDeleted()).isFalse(); // soft delete state not published yet @@ -133,7 +133,7 @@ public class DocLinkTest extends BaseTestCase { // this is a permanent delete (effectively has automatic publish) server.deletePermanent(link1); - live = Ebean.find(Link.class).setId(link1.getId()).findOne(); + live = DB.find(Link.class).setId(link1.getId()).findOne(); assertThat(live).isNull(); } @@ -143,7 +143,7 @@ public class DocLinkTest extends BaseTestCase { Link link1 = new Link("forUpdateLive"); link1.save(); - Link live = Ebean.getDefaultServer().publish(Link.class, link1.getId()); + Link live = DB.getDefault().publish(Link.class, link1.getId()); live.setComment("foo"); // Expect a nice @@ -167,16 +167,16 @@ public class DocLinkTest extends BaseTestCase { link1.setWhenPublish(when); link1.save(); - Link draft1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); + Link draft1 = DB.find(Link.class).setId(link1.getId()).asDraft().findOne(); assertThat(draft1.isDirty()).isTrue(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Link linkLive = server.publish(Link.class, link1.getId(), null); assertThat(linkLive.getComment()).isEqualTo(comment); assertThat(linkLive.getWhenPublish()).isEqualToIgnoringMillis(when); - Link draft1b = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); + Link draft1b = DB.find(Link.class).setId(link1.getId()).asDraft().findOne(); assertThat(draft1b.isDirty()).isFalse(); assertThat(draft1b.getComment()).isNull(); assertThat(draft1b.getWhenPublish()).isNull(); @@ -194,7 +194,7 @@ public class DocLinkTest extends BaseTestCase { Link link3 = new Link("LinkThree"); link3.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.publish(Link.class, link1.getId(), null); server.publish(Link.class, link2.getId(), null); server.publish(Link.class, link3.getId(), null); @@ -240,12 +240,12 @@ public class DocLinkTest extends BaseTestCase { link1.setLocation("firstLocation"); link1.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Link live = server.publish(Link.class, link1.getId(), null); assertThat(live.isDraft()).isFalse(); - Link draftLink = Ebean.find(Link.class) + Link draftLink = DB.find(Link.class) .setId(link1.getId()) .asDraft() .findOne(); @@ -255,7 +255,7 @@ public class DocLinkTest extends BaseTestCase { server.draftRestore(Link.class, link1.getId(), null); - draftLink = Ebean.find(Link.class) + draftLink = DB.find(Link.class) .setId(link1.getId()) .asDraft() .findOne(); @@ -271,11 +271,11 @@ public class DocLinkTest extends BaseTestCase { link1.setComment("Banana"); link1.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.publish(Link.class, link1.getId(), null); - Link draftLink = Ebean.find(Link.class) + Link draftLink = DB.find(Link.class) .setId(link1.getId()) .asDraft() .findOne(); diff --git a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java index d8cf7837e..5c5613a28 100644 --- a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -1,7 +1,7 @@ package org.tests.draftable; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.PagedList; import io.ebean.Query; import org.tests.model.draftable.Link; @@ -26,7 +26,7 @@ public class LinkQueryPublishTest { Link link3 = new Link("L3"); link3.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); List ids = new ArrayList<>(); ids.add(link1.getId()); diff --git a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java index a632f2607..f3ad2cb00 100644 --- a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java @@ -1,7 +1,7 @@ package org.tests.draftable; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.model.draftable.Document; import org.tests.model.draftable.DocumentMedia; @@ -34,7 +34,7 @@ public class OrganisationTest { doc.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Document draftDoc = server.find(Document.class) .asDraft() @@ -74,18 +74,18 @@ public class OrganisationTest { doc.getMedia().add(createMedia("media2")); doc.save(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.publish(Document.class, doc.getId(), null); - Document fetchDoc = Ebean.find(Document.class).setId(doc.getId()).asDraft().findOne(); + Document fetchDoc = DB.find(Document.class).setId(doc.getId()).asDraft().findOne(); List media = fetchDoc.getMedia(); assertThat(media.size()).isEqualTo(2); // // delete one of the 'child' @DraftElement rows ... -// SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from document_media_draft where id = ?"); +// SqlUpdate sqlUpdate = DB.sqlUpdate("delete from document_media_draft where id = ?"); // sqlUpdate.setParameter(1, doc.getMedia().get(0).getId()); // sqlUpdate.execute(); diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index c5e155b3e..4b0521200 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -1,7 +1,7 @@ package org.tests.el; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanFkeyProperty; @@ -20,7 +20,7 @@ public class TestELBasic extends BaseTestCase { @Test public void testEl() { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index 10b7d45d0..59a19dbf7 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -1,6 +1,6 @@ package org.tests.el; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; @@ -20,7 +20,7 @@ public class TestPathExpression { final ExpressionPath city; public TestPathExpression() { - SpiServer server = Ebean.getDefaultServer().pluginApi(); + SpiServer server = DB.getDefault().pluginApi(); beanType = server.beanType(Customer.class); billingId = beanType.getExpressionPath("billingAddress.id"); line1 = beanType.getExpressionPath("billingAddress.line1"); diff --git a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java index 0a14628de..5cffc6f19 100644 --- a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -1,7 +1,7 @@ package org.tests.el; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; @@ -13,7 +13,7 @@ public class TestUnderscoreParam extends BaseTestCase { @Test public void test() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where().raw("name like ?", "Rob%") .query(); diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java index 6ed9b84d1..30cdafd84 100644 --- a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java +++ b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java @@ -1,7 +1,7 @@ package org.tests.expression.bitwise; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.List; @@ -22,7 +22,7 @@ public class TestBitwiseExpressions extends BaseTestCase { private void bitwiseNot() { - List notColour = Ebean.find(BwBean.class) + List notColour = DB.find(BwBean.class) // HAS_COLOUR not set ... .where().bitwiseNot("flags", BwFlags.HAS_COLOUR) .findList(); @@ -34,7 +34,7 @@ public class TestBitwiseExpressions extends BaseTestCase { private void bitwiseAnd() { - List list = Ebean.find(BwBean.class) + List list = DB.find(BwBean.class) // not bulk set AND size set .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE, BwFlags.HAS_SIZE) .findList(); @@ -42,7 +42,7 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list).hasSize(1); assertThat(list.get(0).getName()).isEqualTo("SizeOnly"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) // bulk set AND not size set .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE, BwFlags.HAS_BULK) .findList(); @@ -50,7 +50,7 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list).hasSize(1); assertThat(list.get(0).getName()).isEqualTo("ColourAndBulk"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) // bulk set AND not size set .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR, BwFlags.HAS_COLOUR) .findList(); @@ -61,7 +61,7 @@ public class TestBitwiseExpressions extends BaseTestCase { private void bitwiseAny() { - List list = Ebean.find(BwBean.class) + List list = DB.find(BwBean.class) .where().bitwiseAny("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE) .findList(); @@ -71,19 +71,19 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list.get(2).getName()).isEqualTo("Everything"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAny("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE + BwFlags.HAS_COLOUR) .findList(); assertThat(list).hasSize(4); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAny("flags", BwFlags.HAS_SIZE + BwFlags.HAS_COLOUR) .findList(); assertThat(list).hasSize(4); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAny("flags", BwFlags.HAS_SIZE) .findList(); @@ -91,7 +91,7 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list.get(0).getName()).isEqualTo("SizeOnly"); assertThat(list.get(1).getName()).isEqualTo("Everything"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAny("flags", BwFlags.HAS_COLOUR) .findList(); @@ -103,14 +103,14 @@ public class TestBitwiseExpressions extends BaseTestCase { private void bitwiseAll() { - List list = Ebean.find(BwBean.class) + List list = DB.find(BwBean.class) .where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE) .findList(); assertThat(list).hasSize(1); assertThat(list.get(0).getName()).isEqualTo("Everything"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR) .order().asc("id") .findList(); @@ -119,7 +119,7 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list.get(0).getName()).isEqualTo("ColourAndBulk"); assertThat(list.get(1).getName()).isEqualTo("Everything"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAll("flags", BwFlags.HAS_SIZE) .order().asc("id") .findList(); @@ -128,7 +128,7 @@ public class TestBitwiseExpressions extends BaseTestCase { assertThat(list.get(0).getName()).isEqualTo("SizeOnly"); assertThat(list.get(1).getName()).isEqualTo("Everything"); - list = Ebean.find(BwBean.class) + list = DB.find(BwBean.class) .where().bitwiseAll("flags", BwFlags.HAS_COLOUR) .order().asc("id") .findList(); @@ -142,7 +142,7 @@ public class TestBitwiseExpressions extends BaseTestCase { private void setup() { - Ebean.find(BwBean.class).delete(); + DB.find(BwBean.class).delete(); new BwBean("Nothing", BwFlags.NOTHING).save(); new BwBean("ColourOnly", BwFlags.HAS_COLOUR).save(); diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java index 02ae8f0bb..b02589728 100644 --- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java @@ -1,7 +1,7 @@ package org.tests.family; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -220,9 +220,9 @@ public class TestInheritance extends BaseTestCase { assertEquals("Munich", grandparent1.getAddress()); assertEquals(1, grandparent1.getEffectiveBean().getId().intValue()); - Ebean.find(ChildPerson.class).delete(); - Ebean.find(GrandParentPerson.class).delete(); - Ebean.find(EBasic.class).delete(); + DB.find(ChildPerson.class).delete(); + DB.find(GrandParentPerson.class).delete(); + DB.find(EBasic.class).delete(); } @Test @@ -265,8 +265,8 @@ public class TestInheritance extends BaseTestCase { count = server().find(GrandParentPerson.class).where().eq("basicSameName.description", "Description A").findCount(); assertEquals(1, count); - Ebean.find(ChildPerson.class).delete(); - Ebean.find(GrandParentPerson.class).delete(); - Ebean.find(EBasic.class).delete(); + DB.find(ChildPerson.class).delete(); + DB.find(GrandParentPerson.class).delete(); + DB.find(EBasic.class).delete(); } } diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java index ec5f044f9..d18f8fa2d 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -1,7 +1,7 @@ package org.tests.generated; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.EGenProps; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ public class TestGeneratedProperties extends BaseTestCase { EGenProps bean = new EGenProps(); bean.setName("inserting"); - Ebean.save(bean); + DB.save(bean); assertNotNull(bean.getId()); assertNotNull(bean.getVersion()); @@ -38,13 +38,13 @@ public class TestGeneratedProperties extends BaseTestCase { assertThat(bean.getWhenModified().toInstant().toEpochMilli()).isEqualTo(bean.getLongCreated()); bean.setName("updating..."); - Ebean.save(bean); + DB.save(bean); assertThat(bean.getWhenModified()).isNotEqualTo(bean.getLongCreated()); assertThat(bean.getWhenModified().toInstant().toEpochMilli()).isEqualTo(bean.getLongUpdated()); assertThat(bean.getInstantUpdated().toEpochMilli()).isEqualTo(bean.getLongUpdated()); assertThat(bean.getInstantCreated().toEpochMilli()).isEqualTo(bean.getLongCreated()); - Ebean.delete(bean); + DB.delete(bean); } } diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java index 2b3c873f4..c26692fb1 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -1,7 +1,7 @@ package org.tests.generated; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.MyCurrentUserProvider; import org.tests.model.EWhoProps; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public class TestGeneratedWho extends BaseTestCase { bean.setName("one"); MyCurrentUserProvider.setUser("INSERT_WHO_1"); - Ebean.save(bean); + DB.save(bean); assertEquals("one", bean.getName()); assertEquals("INSERT_WHO_1", bean.getWhoCreated()); @@ -31,7 +31,7 @@ public class TestGeneratedWho extends BaseTestCase { MyCurrentUserProvider.setUser("UPDATE_WHO_1"); bean.setName("two"); - Ebean.save(bean); + DB.save(bean); assertEquals("two", bean.getName()); assertEquals("INSERT_WHO_1", bean.getWhoCreated()); @@ -39,7 +39,7 @@ public class TestGeneratedWho extends BaseTestCase { MyCurrentUserProvider.setUser("UPDATE_WHO_2"); bean.setName("three"); - Ebean.save(bean); + DB.save(bean); assertEquals("INSERT_WHO_1", bean.getWhoCreated()); assertEquals("UPDATE_WHO_2", bean.getWhoModified()); @@ -52,15 +52,15 @@ public class TestGeneratedWho extends BaseTestCase { User creator = new User("jack"); User maintainer01 = new User("jill"); User maintainer02 = new User("joe"); - Ebean.save(creator); - Ebean.save(maintainer01); - Ebean.save(maintainer02); + DB.save(creator); + DB.save(maintainer01); + DB.save(maintainer02); WhoPropsOneToMany bean = new WhoPropsOneToMany(); bean.setName("one"); MyCurrentUserProvider.setUser(creator); - Ebean.save(bean); + DB.save(bean); assertNotNull(bean.getWhoCreated()); assertEquals(creator.getId(), bean.getWhoCreated().getId()); @@ -68,7 +68,7 @@ public class TestGeneratedWho extends BaseTestCase { MyCurrentUserProvider.setUser(maintainer01); bean.setName("two"); - Ebean.save(bean); + DB.save(bean); assertEquals("two", bean.getName()); assertEquals(creator.getId(), bean.getWhoCreated().getId()); @@ -76,7 +76,7 @@ public class TestGeneratedWho extends BaseTestCase { MyCurrentUserProvider.setUser(maintainer02); bean.setName("three"); - Ebean.save(bean); + DB.save(bean); assertEquals(creator.getId(), bean.getWhoCreated().getId()); assertEquals(maintainer02.getId(), bean.getWhoModified().getId()); @@ -87,7 +87,7 @@ public class TestGeneratedWho extends BaseTestCase { @Test public void insertNullIntoOneToManyWhoCreated() { User creator = new User("jack"); - Ebean.save(creator); + DB.save(creator); WhoPropsOneToMany bean = new WhoPropsOneToMany(); bean.setName("one"); @@ -95,7 +95,7 @@ public class TestGeneratedWho extends BaseTestCase { bean.setWhoModified(creator); MyCurrentUserProvider.setUser(null); - Ebean.save(bean); + DB.save(bean); assertNull(bean.getWhoCreated()); assertNull(bean.getWhoModified()); diff --git a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java index eaf7d57b4..a663738c8 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java @@ -1,6 +1,6 @@ package org.tests.genkey; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; @@ -19,12 +19,12 @@ public class TestGeneratedKeys { c1.setName("Two"); c1.setDescription("Test Gen Key Two"); - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Ebean.save(c); - Ebean.save(c1); + DB.save(c); + DB.save(c1); } finally { - Ebean.commitTransaction(); + DB.commitTransaction(); } Integer id = c.getId(); assertNotNull(id); diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java index 8a96e3a18..4ad721274 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java @@ -2,7 +2,7 @@ package org.tests.idkeys; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ECustomId; @@ -15,7 +15,7 @@ public class TestCustomId extends BaseTestCase { public void insert() { ECustomId bean = new ECustomId("fred"); - Ebean.save(bean); + DB.save(bean); assertNotNull(bean.getId()); } @@ -25,9 +25,9 @@ public class TestCustomId extends BaseTestCase { ECustomId bean = new ECustomId("gotId"); String explicitId = ModUUID.newShortId(); bean.setId(explicitId); - Ebean.save(bean); + DB.save(bean); - ECustomId found = Ebean.find(ECustomId.class, explicitId); + ECustomId found = DB.find(ECustomId.class, explicitId); assertEquals(found.getName(), bean.getName()); } } diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index f00c65b87..6627cd81f 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -27,24 +27,24 @@ public class TestSimpleIdInsert extends BaseTestCase { // GlobalProperties.put("datasource.default", "hsqldb"); // GlobalProperties.put("ebean.classes", ESimple.class.getName()); // -// Transaction transaction = Ebean.beginTransaction(); +// Transaction transaction = DB.beginTransaction(); // try { // transaction.setBatchMode(true); // transaction.setLogLevel(LogLevel.SQL); // ESimple e = new ESimple(); // e.setName("name"); -// Ebean.save(e); +// DB.save(e); // // ESimple e2 = new ESimple(); // e2.setName("name2"); -// Ebean.save(e2); +// DB.save(e2); // transaction.commit(); // // Assert.assertNotNull(e.getId()); // Assert.assertNotNull(e2.getId()); // // } finally { -// Ebean.endTransaction(); +// DB.endTransaction(); // } // } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java index e17879542..5a5036721 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java @@ -2,7 +2,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; @@ -24,25 +24,25 @@ public class TestDuplicateKeyException extends BaseTestCase { // Setup the data first final ListAttributeValue value1 = new ListAttributeValue(); - Ebean.save(value1); + DB.save(value1); final ListAttribute listAttribute = new ListAttribute(); listAttribute.add(value1); - Ebean.save(listAttribute); + DB.save(listAttribute); final AttributeHolder holder = new AttributeHolder(); holder.add(listAttribute); try { - Ebean.execute(() -> { - //Ebean.currentTransaction().log("-- saving holder first time"); + DB.execute(() -> { + //DB.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"); + //DB.currentTransaction().setPersistCascade(false); + DB.save(holder); +//DB.currentTransaction().log("-- saving holder second time"); // we don't get this far before failing - //Ebean.save(holder); + //DB.save(holder); }); } catch (Exception e) { assertEquals(e.getMessage(), "test rollback"); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java index ec8caac39..aab913688 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Car; import org.tests.model.basic.CarAccessory; @@ -23,9 +23,9 @@ public class TestInheritInsert extends BaseTestCase { Truck t = new Truck(); t.setCapacity(10d); - Ebean.save(t); + DB.save(t); - Vehicle v = Ebean.find(Vehicle.class, t.getId()); + Vehicle v = DB.find(Vehicle.class, t.getId()); if (v instanceof Truck) { Truck t0 = (Truck) v; assertEquals(Double.valueOf(10d), t0.getCapacity()); @@ -39,9 +39,9 @@ public class TestInheritInsert extends BaseTestCase { driver.setName("Jim"); driver.setVehicle(v); - Ebean.save(driver); + DB.save(driver); - VehicleDriver d1 = Ebean.find(VehicleDriver.class, driver.getId()); + VehicleDriver d1 = DB.find(VehicleDriver.class, driver.getId()); v = d1.getVehicle(); if (v instanceof Truck) { Double capacity = ((Truck) v).getCapacity(); @@ -51,7 +51,7 @@ public class TestInheritInsert extends BaseTestCase { fail("v not a Truck?"); } - List list = Ebean.find(VehicleDriver.class).findList(); + List list = DB.find(VehicleDriver.class).findList(); for (VehicleDriver vehicleDriver : list) { if (vehicleDriver.getVehicle() instanceof Truck) { Double capacity = ((Truck) vehicleDriver.getVehicle()).getCapacity(); @@ -65,14 +65,14 @@ public class TestInheritInsert extends BaseTestCase { Car car = new Car(); car.setLicenseNumber("MARIOS_CAR_LICENSE"); - Ebean.save(car); + DB.save(car); VehicleDriver driver = new VehicleDriver(); driver.setName("Mario"); driver.setVehicle(car); - Ebean.save(driver); + DB.save(driver); - Query query = Ebean.find(VehicleDriver.class); + Query query = DB.find(VehicleDriver.class); query.where().eq("vehicle.licenseNumber", "MARIOS_CAR_LICENSE"); List drivers = query.findList(); @@ -83,10 +83,10 @@ public class TestInheritInsert extends BaseTestCase { assertEquals("Mario", drivers.get(0).getName()); assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle().getLicenseNumber()); - Vehicle car2 = Ebean.find(Vehicle.class, car.getId()); + Vehicle car2 = DB.find(Vehicle.class, car.getId()); car2.setLicenseNumber("test"); - Ebean.save(car); + DB.save(car); } @@ -95,17 +95,17 @@ public class TestInheritInsert extends BaseTestCase { Car car = new Car(); car.setLicenseNumber("ABC"); - Ebean.save(car); + DB.save(car); CarFuse fuse = new CarFuse(); fuse.setLocationCode("xdfg"); - Ebean.save(fuse); + DB.save(fuse); CarAccessory accessory = new CarAccessory(car, fuse); - Ebean.save(accessory); + DB.save(accessory); - Query query = Ebean.find(Car.class) + Query query = DB.find(Car.class) .fetch("accessories") .where() .eq("id", car.getId()) diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index 228f1d861..a4a0547e2 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; @@ -19,15 +19,15 @@ public class TestInheritanceBatchLazyLoad { Car c = new Car(); c.setLicenseNumber("VZVZ1"); c.setDriver("CarDriver"); - Ebean.save(c); + DB.save(c); Truck t = new Truck(); t.setLicenseNumber("VZVZ2"); t.setCapacity(20D); - Ebean.save(t); + DB.save(t); - List list = Ebean.find(Vehicle.class) + List list = DB.find(Vehicle.class) .select("licenseNumber") .where().startsWith("licenseNumber", "VZVZ") .order().asc("licenseNumber") diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java index a42250f49..a0875a694 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java @@ -1,8 +1,8 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.GroupConfiguration; import org.tests.inheritance.model.ProductConfiguration; @@ -13,7 +13,7 @@ public class TestInheritanceDiscriminatorQueryCache extends BaseTestCase { @Test public void testDiscriminatorQueryCache() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); ProductConfiguration pc1 = new ProductConfiguration(); pc1.setName("PC1"); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index 47b76df8a..1f2301da0 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -3,8 +3,8 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.CalculationResult; import org.tests.inheritance.model.Configurations; @@ -21,7 +21,7 @@ public class TestInheritanceJoins extends BaseTestCase { @Test public void testAssocOne() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); ProductConfiguration pc = new ProductConfiguration(); pc.setName("PC1"); @@ -41,7 +41,7 @@ public class TestInheritanceJoins extends BaseTestCase { @Test public void assocOne_when_null() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); GroupConfiguration gc = new GroupConfiguration(); gc.setName("GC1"); @@ -66,7 +66,7 @@ public class TestInheritanceJoins extends BaseTestCase { /* Ensures the fetch join to a property with inheritance work as a left join */ - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); final ProductConfiguration pc = new ProductConfiguration(); pc.setName("PC1"); @@ -84,7 +84,7 @@ public class TestInheritanceJoins extends BaseTestCase { public void testAssocMany() { Configurations configurations = new Configurations(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); server.save(configurations); @@ -107,7 +107,7 @@ public class TestInheritanceJoins extends BaseTestCase { public void testAssocManyWithNoneRelated() { Configurations configurations = new Configurations(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); server.save(configurations); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 78fba42ba..fb25b01d8 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; import org.ebeantest.LoggedSqlCollector; @@ -25,25 +25,25 @@ public class TestInheritanceOnMany extends BaseTestCase { Cat cat = new Cat(); cat.setName("Puss"); - Ebean.save(cat); + DB.save(cat); Dog dog = new Dog(); dog.setRegistrationNumber("DOGGIE"); - Ebean.save(dog); + DB.save(dog); BigDog bd = new BigDog(); bd.setDogSize("large"); bd.setRegistrationNumber("BG1"); - Ebean.save(bd); + DB.save(bd); AnimalShelter shelter = new AnimalShelter(); shelter.setName("My Animal Shelter"); shelter.getAnimals().add(cat); shelter.getAnimals().add(dog); - Ebean.save(shelter); + DB.save(shelter); - AnimalShelter shelter2 = Ebean.find(AnimalShelter.class, shelter.getId()); + AnimalShelter shelter2 = DB.find(AnimalShelter.class, shelter.getId()); List animals = shelter2.getAnimals(); BeanList beanList = (BeanList) animals; @@ -51,7 +51,7 @@ public class TestInheritanceOnMany extends BaseTestCase { assertNotNull(modifyListenMode); - assertNotNull(Ebean.find(Animal.class).findList()); + assertNotNull(DB.find(Animal.class).findList()); } @Test @@ -59,12 +59,12 @@ public class TestInheritanceOnMany extends BaseTestCase { Dog dog = new Dog(); dog.setRegistrationNumber("D2"); - Ebean.save(dog); + DB.save(dog); LoggedSqlCollector.start(); // Dog is concrete so we return as Dog even though // it could be a BigDog (so we are trusting the caller) - Dog ref = Ebean.getReference(Dog.class, dog.getId()); + Dog ref = DB.getReference(Dog.class, dog.getId()); List sql = LoggedSqlCollector.stop(); assertThat(sql).isEmpty(); @@ -80,10 +80,10 @@ public class TestInheritanceOnMany extends BaseTestCase { BigDog bd = new BigDog(); bd.setDogSize("large"); bd.setRegistrationNumber("BG2"); - Ebean.save(bd); + DB.save(bd); LoggedSqlCollector.start(); - BigDog bigDog = Ebean.getReference(BigDog.class, bd.getId()); + BigDog bigDog = DB.getReference(BigDog.class, bd.getId()); List sql = LoggedSqlCollector.stop(); assertThat(sql).isEmpty(); @@ -95,7 +95,7 @@ public class TestInheritanceOnMany extends BaseTestCase { LoggedSqlCollector.start(); // Animal is abstract so we hit the DB - Animal animal = Ebean.getReference(Animal.class, bd.getId()); + Animal animal = DB.getReference(Animal.class, bd.getId()); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index e0ede7386..12adeea1a 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase { master.getReferenced().add(orderedB); LoggedSqlCollector.start(); - Ebean.save(master); + DB.save(master); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(5); // Some platforms insert ids and others don't need to... @@ -40,7 +40,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase { assertSql(trimId(sql, 3)) .contains("insert into ordered_parent (order_master_inheritance_id, dtype, common_name, ordered_bname, sort_order) values"); - OrderMasterInheritance result = Ebean.find(OrderMasterInheritance.class).findOne(); + OrderMasterInheritance result = DB.find(OrderMasterInheritance.class).findOne(); assertThat(result.getReferenced()) .extracting(OrderedParent::getCommonName) .containsExactly("commonOrderedA", "commonOrderedB"); @@ -52,12 +52,12 @@ public class TestInheritanceOrderColumn extends BaseTestCase { .containsExactly("commonOrderedB", "commonOrderedA"); LoggedSql.start(); - Ebean.save(result); + DB.save(result); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?"); - result = Ebean.find(OrderMasterInheritance.class).findOne(); + result = DB.find(OrderMasterInheritance.class).findOne(); assertThat(result.getReferenced()) .extracting(OrderedParent::getCommonName) .containsExactly("commonOrderedB", "commonOrderedA"); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index 7de74f3c1..6d566ab24 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ public class TestInheritanceQuery extends BaseTestCase { LoggedSqlCollector.start(); - Query query = Ebean.find(Parent.class); + Query query = DB.find(Parent.class); query.where().in("val", 90, 91); // restrict to a & b1 @@ -43,7 +43,7 @@ public class TestInheritanceQuery extends BaseTestCase { query2.setInheritType(ChildB.class); assertThat(query2.findList()).containsExactly(b1); - query2 = Ebean.find(Parent.class).setInheritType(ChildB.class); + query2 = DB.find(Parent.class).setInheritType(ChildB.class); assertThat(query2.findList()).contains(b1, b2); List sql = LoggedSqlCollector.stop(); @@ -52,8 +52,8 @@ public class TestInheritanceQuery extends BaseTestCase { assertSql(sql.get(2)).contains("where t0.type = 'B'"); assertThat(sql.get(3)).contains("where t0.type = 'B'"); - Ebean.delete(a); - Ebean.delete(b1); - Ebean.delete(b2); + DB.delete(a); + DB.delete(b1); + DB.delete(b2); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 8731fc1b9..6cbb1945f 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ public class TestInheritanceRawSql extends BaseTestCase { truck.setCapacity(50D); truck.setLicenseNumber("ASB23"); - Ebean.save(truck); + DB.save(truck); String sql = "select dtype, id, license_number from vehicle where id = :id"; @@ -34,7 +34,7 @@ public class TestInheritanceRawSql extends BaseTestCase { RawSql rawSql = rawSqlBuilder.create(); - List list = Ebean.find(Vehicle.class) + List list = DB.find(Vehicle.class) .setRawSql(rawSql) .setParameter("id", truck.getId()) .findList(); @@ -51,7 +51,7 @@ public class TestInheritanceRawSql extends BaseTestCase { truck2.setCapacity(30D); // and now save - Ebean.save(truck2); + DB.save(truck2); } @Test @@ -63,7 +63,7 @@ public class TestInheritanceRawSql extends BaseTestCase { longLease.setMinDuration(100); longLease.setActiveEnd(LocalDate.now()); - Ebean.save(longLease); + DB.save(longLease); Truck truck = new Truck(); @@ -71,7 +71,7 @@ public class TestInheritanceRawSql extends BaseTestCase { truck.setLicenseNumber("ZK1"); truck.setLease(longLease); - Ebean.save(truck); + DB.save(truck); String sql = "select v.dtype, v.id, v.license_number, l.dtype, l.id, l.name " + @@ -84,7 +84,7 @@ public class TestInheritanceRawSql extends BaseTestCase { .tableAliasMapping("l", "lease") .create(); - Vehicle veh = Ebean.find(Vehicle.class) + Vehicle veh = DB.find(Vehicle.class) .setRawSql(rawSql) .setParameter(truck.getId()) .findOne(); @@ -103,7 +103,7 @@ public class TestInheritanceRawSql extends BaseTestCase { .columnMapping("l.name", "lease.name") .create(); - Vehicle veh2 = Ebean.find(Vehicle.class) + Vehicle veh2 = DB.find(Vehicle.class) .setRawSql(rawSql2) .setParameter(truck.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java index 61cb4a3c8..421e51504 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -2,7 +2,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.TIntChild; import org.tests.model.basic.TIntRoot; import org.junit.jupiter.api.Test; @@ -29,18 +29,18 @@ public class TestIntInherit extends BaseTestCase { c2.setChildProperty("cp2"); - Ebean.save(r); - Ebean.save(r2); - Ebean.save(c1); - Ebean.save(c2); + DB.save(r); + DB.save(r2); + DB.save(c1); + DB.save(c2); - TIntRoot result1 = Ebean.find(TIntRoot.class, r.getId()); + TIntRoot result1 = DB.find(TIntRoot.class, r.getId()); assertTrue(result1 instanceof TIntRoot); - TIntRoot ref3 = Ebean.getReference(TIntRoot.class, c1.getId()); + TIntRoot ref3 = DB.getReference(TIntRoot.class, c1.getId()); assertTrue(ref3 instanceof TIntRoot); - TIntRoot result3 = Ebean.find(TIntRoot.class, c1.getId()); + TIntRoot result3 = DB.find(TIntRoot.class, c1.getId()); assertTrue(result3 instanceof TIntChild); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index b956704ff..e365002fc 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestNpeOnDiscriminator extends BaseTestCase { @@ -9,15 +9,15 @@ public class TestNpeOnDiscriminator extends BaseTestCase { @Test public void test() { - InnerReport report = Ebean.json().toBean(InnerReport.class, "{}"); - Ebean.save(report); + InnerReport report = DB.json().toBean(InnerReport.class, "{}"); + DB.save(report); // other service ... InnerReport.Forecast f = new InnerReport.Forecast(); report.setForecast(f); f.innerReport = report; - Ebean.save(f); + DB.save(f); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java index 6cc099987..37c7fc9b1 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; import org.tests.model.basic.ListAttributeValue; @@ -28,15 +28,15 @@ public class TestSkippable extends BaseTestCase { final ListAttributeValue value1 = new ListAttributeValue(); final ListAttributeValue value2 = new ListAttributeValue(); - Ebean.save(value1); - Ebean.save(value2); + DB.save(value1); + DB.save(value2); final ListAttribute listAttribute = new ListAttribute(); listAttribute.add(value1); - Ebean.save(listAttribute); + DB.save(listAttribute); logger.info(" -- seeded data"); - final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId()); + final ListAttribute listAttributeDB = DB.find(ListAttribute.class, listAttribute.getId()); assertNotNull(listAttributeDB); final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next(); @@ -47,7 +47,7 @@ public class TestSkippable extends BaseTestCase { final AttributeHolder holder = new AttributeHolder(); holder.add(listAttributeDB); - Ebean.save(holder); + DB.save(holder); logger.info(" -- saved holder"); // Now change the M2M listAttribute.values and save the holder @@ -57,11 +57,11 @@ public class TestSkippable extends BaseTestCase { listAttributeDB.add(value2); // Save the holder - should cascade down to the listAtribute and save the values - Ebean.save(holder); + DB.save(holder); logger.info(" -- M2M detected delete of value1 and add of value2 ?"); - final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId()); + final ListAttribute listAttributeDB_2 = DB.find(ListAttribute.class, listAttributeDB.getId()); assertNotNull(listAttributeDB_2); final ListAttributeValue value2_DB_2 = listAttributeDB_2.getValues().iterator().next(); @@ -69,7 +69,7 @@ public class TestSkippable extends BaseTestCase { assertEquals(value2.getId(), value2_DB_2.getId()); assertTrue(value2.getId().equals(value2_DB_2.getId())); - Ebean.delete(listAttributeDB_2); + DB.delete(listAttributeDB_2); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index 8adec83ec..05fdb92e7 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -1,7 +1,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,9 +19,9 @@ public class TestTreeOrganisations extends BaseTestCase { node.setTitle("node"); treeNode.setOrganizationNode(node); - Ebean.save(treeNode); + DB.save(treeNode); - treeNode = Ebean.find(OrganizationTreeNode.class, treeNode.getId()); + treeNode = DB.find(OrganizationTreeNode.class, treeNode.getId()); assertEquals(node, treeNode.getOrganizationNode()); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java index f31360ba9..8e9e2a6aa 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java +++ b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java @@ -1,7 +1,7 @@ package org.tests.inheritance.abstrakt; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestInheritanceNum extends BaseTestCase { @@ -13,6 +13,6 @@ public class TestInheritanceNum extends BaseTestCase { block.setName("ibe"); block.setNotes("try it"); - Ebean.save(block); + DB.save(block); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index 72bb02fa0..b01f37f71 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -2,7 +2,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; import org.junit.jupiter.api.Test; @@ -19,24 +19,24 @@ public class TestInheritanceCache extends BaseTestCase { one.setDriver("Jimmy"); one.setNotes("Hello"); - Ebean.save(one); + DB.save(one); - CInhRoot gotOne = Ebean.find(CInhRoot.class) + CInhRoot gotOne = DB.find(CInhRoot.class) .setId(one.getId()) .findOne(); assertThat(gotOne).isInstanceOf(CInhOne.class); - CInhRoot gotOneFromCache = Ebean.find(CInhRoot.class) + CInhRoot gotOneFromCache = DB.find(CInhRoot.class) .setId(one.getId()) .findOne(); assertThat(gotOneFromCache).isInstanceOf(CInhOne.class); - CInhRoot refOne = Ebean.getReference(CInhRoot.class, one.getId()); + CInhRoot refOne = DB.getReference(CInhRoot.class, one.getId()); assertThat(refOne).isInstanceOf(CInhOne.class); - CInhRoot refOneSub = Ebean.getReference(CInhOne.class, one.getId()); + CInhRoot refOneSub = DB.getReference(CInhOne.class, one.getId()); assertThat(refOneSub).isNotNull(); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index a390674ba..a306bfa65 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; @@ -24,17 +24,17 @@ public class TestInheritanceRefCache extends BaseTestCase { one.setDriver("Jimmy"); one.setNotes("Hello"); - Ebean.save(one); + DB.save(one); CInhRef ref = new CInhRef(); ref.setRef(one); - Ebean.save(ref); + DB.save(ref); Integer id = ref.getId(); LoggedSqlCollector.start(); - CInhRef gotRef = Ebean.find(CInhRef.class).setId(id).findOne(); + CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); @@ -44,7 +44,7 @@ public class TestInheritanceRefCache extends BaseTestCase { // fetch again - from cache (but fetch second bean from cache) LoggedSqlCollector.start(); - gotRef = Ebean.find(CInhRef.class).setId(id).findOne(); + gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); @@ -54,7 +54,7 @@ public class TestInheritanceRefCache extends BaseTestCase { // fetch again - both from cache LoggedSqlCollector.start(); - gotRef = Ebean.find(CInhRef.class).setId(id).findOne(); + gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); @@ -72,34 +72,34 @@ public class TestInheritanceRefCache extends BaseTestCase { one.setLicenseNumber("O19"); one.setDriver("Foo"); one.setNotes("Hello"); - Ebean.save(one); + DB.save(one); ids.add(one.getId()); CInhTwo two = new CInhTwo(); two.setLicenseNumber("T23"); two.setAction("Test"); - Ebean.save(two); + DB.save(two); ids.add(two.getId()); LoggedSqlCollector.start(); - Ebean.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); + DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from cinh_root"); // try some cache finds - Ebean.find(CInhRoot.class).setUseQueryCache(true).findList(); - Ebean.find(CInhRoot.class).setUseQueryCache(true).findList(); - Ebean.find(CInhRoot.class).setUseQueryCache(true).findList(); + DB.find(CInhRoot.class).setUseQueryCache(true).findList(); + DB.find(CInhRoot.class).setUseQueryCache(true).findList(); + DB.find(CInhRoot.class).setUseQueryCache(true).findList(); LoggedSqlCollector.start(); - Ebean.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); + DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(0); diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 84e4ccd37..05860052c 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,7 +14,7 @@ public class TestInheritAbstract { @Test public void testMe() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); List list0 = server.find(AbstractBar.class) .findList(); diff --git a/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java b/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java index 094a5d321..1d6c0f1ea 100644 --- a/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java +++ b/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java @@ -1,7 +1,7 @@ package org.tests.insert; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; @@ -9,7 +9,7 @@ public class MainDbCopy { public static void main(String[] args) { - EbeanServer defaultServer = Ebean.getServer(null); + Database defaultServer = DB.getDefault(); EBasic e = new EBasic(); e.setName("blah"); @@ -20,10 +20,7 @@ public class MainDbCopy { EBasic e1 = defaultServer.find(EBasic.class, e.getId()); - EbeanServer serverDest = Ebean.getServer("mysql"); - + Database serverDest = DB.byName("mysql"); serverDest.insert(e1); - - } } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java index bbf529b92..9a711b781 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java @@ -1,7 +1,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; @@ -25,25 +25,25 @@ public class TestInsertCollection extends BaseTestCase { customers.add(cust1); customers.add(cust2); - Ebean.insertAll(customers); + DB.insertAll(customers); assertNotNull(cust1.getId()); assertNotNull(cust2.getId()); - Customer cust1Check = Ebean.find(Customer.class, cust1.getId()); + Customer cust1Check = DB.find(Customer.class, cust1.getId()); assertEquals(cust1.getName(), cust1Check.getName()); - Customer cust2Check = Ebean.find(Customer.class, cust2.getId()); + Customer cust2Check = DB.find(Customer.class, cust2.getId()); assertEquals(cust2.getName(), cust2Check.getName()); cust1.setName("jim-changed"); cust2.setName("bob-changed"); - Ebean.updateAll(customers); + DB.updateAll(customers); awaitL2Cache(); - Customer cust1Check2 = Ebean.find(Customer.class, cust1.getId()); + Customer cust1Check2 = DB.find(Customer.class, cust1.getId()); assertEquals("jim-changed", cust1Check2.getName()); - Customer cust2Check2 = Ebean.find(Customer.class, cust2.getId()); + Customer cust2Check2 = DB.find(Customer.class, cust2.getId()); assertEquals("bob-changed", cust2Check2.getName()); @@ -55,13 +55,13 @@ public class TestInsertCollection extends BaseTestCase { saveList.add(cust1Check2); saveList.add(cust3); - Ebean.saveAll(saveList); + DB.saveAll(saveList); awaitL2Cache(); - Customer cust1Check3 = Ebean.find(Customer.class, cust1.getId()); + Customer cust1Check3 = DB.find(Customer.class, cust1.getId()); assertEquals("jim-updated", cust1Check3.getName()); - Customer cust3Check = Ebean.find(Customer.class, cust3.getId()); + Customer cust3Check = DB.find(Customer.class, cust3.getId()); assertEquals("mac", cust3Check.getName()); List deleteList = new ArrayList<>(); @@ -69,12 +69,12 @@ public class TestInsertCollection extends BaseTestCase { deleteList.add(cust3); deleteList.add(cust2Check2); - Ebean.deleteAll(deleteList); + DB.deleteAll(deleteList); awaitL2Cache(); - assertNull(Ebean.find(Customer.class, cust1Check3.getId())); - assertNull(Ebean.find(Customer.class, cust2Check2.getId())); - assertNull(Ebean.find(Customer.class, cust3.getId())); + assertNull(DB.find(Customer.class, cust1Check3.getId())); + assertNull(DB.find(Customer.class, cust2Check2.getId())); + assertNull(DB.find(Customer.class, cust3.getId())); } } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index 157c4579f..e645e3248 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -3,7 +3,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DataIntegrityException; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ public class TestInsertDataIntegrityException extends BaseTestCase { ResetBasicData.reset(); // an invalid foreign key value - Customer invalidCustomer = Ebean.getReference(Customer.class, 900000); + Customer invalidCustomer = DB.getReference(Customer.class, 900000); Order order = new Order(); order.setStatus(Order.Status.NEW); diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index efa1fad4a..af0628ad5 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -2,7 +2,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DuplicateKeyException; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.BeforeEach; @@ -64,7 +64,7 @@ public class TestInsertDuplicateKey extends BaseTestCase { insertTheBatch_duplicateKey_catchAndContinue(); - List found = Ebean.getDefaultServer() + List found = DB.getDefault() .find(Document.class) .asDraft() .where().startsWith("body", "insertTheBatch_duplicateKey_catchAndContinue") @@ -90,14 +90,14 @@ public class TestInsertDuplicateKey extends BaseTestCase { doc2.save(); // flush at this point, fails - Ebean.getDefaultServer().currentTransaction().flush(); + DB.getDefault().currentTransaction().flush(); } catch (DuplicateKeyException e) { log.info("duplicate failed but just continue" + e.getMessage()); try { // typically we would use transaction.commitAndContinue() // ... this is a rollback and continue type scenario // ... more sensible to use a second transaction that do this - Ebean.getDefaultServer().currentTransaction().getConnection().rollback(); + DB.getDefault().currentTransaction().getConnection().rollback(); } catch (SQLException e1) { e1.printStackTrace(); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 60d8bbfe6..0615e42f6 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -1,7 +1,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.orderentity.OrderEntity; import org.tests.model.orderentity.OrderItemEntity; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class TestInsertOnStringKey extends BaseTestCase { orderEntity.setItems(toList(orderItemEntity)); - Ebean.save(orderEntity); + DB.save(orderEntity); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index d6a6d401b..6407aa046 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java +++ b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -29,11 +29,11 @@ public class TestSaveWithDaylightSavings extends BaseTestCase { // EBasic e = new EBasic(); // e.setSomeDate(daylightSavingDate); // -// Ebean.save(e); +// DB.save(e); // Assert.assertNotNull(e.getId()); // // // Reload the entity from database -// EBasic e2 = Ebean.find(EBasic.class, e.getId()); +// EBasic e2 = DB.find(EBasic.class, e.getId()); // // long diffMillis = e2.getSomeDate().getTime() - e.getSomeDate().getTime(); // @@ -58,7 +58,7 @@ public class TestSaveWithDaylightSavings extends BaseTestCase { // // For it to fail, the time has to match the time at which the daylight saving changes // // are applied in that time zone. Therefore specify it explicitly. // -// EbeanServer server = Ebean.getServer(null); +// Database server = DB.getDefault(); // // Transaction transaction = server.createTransaction(); // Connection connection = transaction.getConnection(); diff --git a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java index 87b97e24d..405bca390 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -2,7 +2,7 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -51,12 +51,12 @@ public class TestCarWheelIud extends BaseTestCase { car.setWheels(wheels); - Ebean.save(car); + DB.save(car); // And I'm trying to delete this entry with code: - Car car2 = Ebean.find(Car.class, car.getId()); + Car car2 = DB.find(Car.class, car.getId()); - Ebean.delete(car2); + DB.delete(car2); } diff --git a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java index e2aa263e4..d478dcbeb 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -1,7 +1,7 @@ package org.tests.iud; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.info.InfoCompany; import org.tests.model.info.InfoCustomer; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ public class TestInfoOneToOne extends BaseTestCase { customer.save(); // assert JsonIgnore working as expected - String asJson = Ebean.json().toJson(company); + String asJson = DB.json().toJson(company); assertThat(asJson).doesNotContain("contacts"); // assert both are inserted diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index e9a324e12..5b723b5dc 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -2,7 +2,7 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; @@ -17,23 +17,23 @@ public class TestInsertQueryUpdate extends BaseTestCase { EBasicVer e0 = new EBasicVer("name0"); e0.setDescription("desc0"); - Ebean.save(e0); + DB.save(e0); - EBasicVer e1 = Ebean.find(EBasicVer.class) + EBasicVer e1 = DB.find(EBasicVer.class) .select("name") .setId(e0.getId()) .findOne(); - BeanState beanState = Ebean.getBeanState(e1); + BeanState beanState = DB.getBeanState(e1); Set loadedProps = beanState.getLoadedProps(); assertFalse(loadedProps.contains("description")); //lastUpdate e1.setName("name1"); - Ebean.save(e1); + DB.save(e1); e1.setDescription("desc1"); - Ebean.save(e1); + DB.save(e1); } diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java index f6bee6094..48e72585b 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -1,7 +1,7 @@ package org.tests.iud; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -14,11 +14,11 @@ public class TestInsertUpdateTrans extends BaseTestCase { @Test public void test() { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { EBasicVer e0 = new EBasicVer("onInsert"); e0.setDescription("something"); - Ebean.save(e0); + DB.save(e0); assertNotNull(e0.getId()); assertNotNull(e0.getLastUpdate()); @@ -27,9 +27,9 @@ public class TestInsertUpdateTrans extends BaseTestCase { e0.setName("onUpdate"); e0.setDescription("differentFromInsert"); - Ebean.save(e0); + DB.save(e0); - EBasicVer e1 = Ebean.find(EBasicVer.class, e0.getId()); + EBasicVer e1 = DB.find(EBasicVer.class, e0.getId()); // we should fetch back the updated data (not inserted) assertEquals(e0.getId(), e1.getId()); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java index 44ed27534..25302f8e1 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson; import org.tests.model.json.EBasicJsonJackson2; @@ -37,7 +37,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, "one"); bean.getValueMap().put(2, "two"); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) DB.getDefault().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); EBasicJsonJackson found = mapper.readValue(json, EBasicJsonJackson.class); @@ -48,10 +48,10 @@ public class TestDbJson_Jackson extends BaseTestCase { assertThat(found.getValueSet()).containsExactly("A", "B"); assertThat(found.getValueMap()).containsEntry(1L, "one").containsEntry(2L, "two"); - Ebean.save(bean); + DB.save(bean); // here we do the same and expect, that we can deserialize the bean also - found = Ebean.find(EBasicJsonJackson.class, bean.getId()); + found = DB.find(EBasicJsonJackson.class, bean.getId()); assertThat(found.getPlainValue()).isEqualTo("plain"); assertThat(found.getValueList()).containsExactly("A", "B"); @@ -83,7 +83,7 @@ public class TestDbJson_Jackson extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) DB.getDefault().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); assertThat(json) @@ -96,9 +96,9 @@ public class TestDbJson_Jackson extends BaseTestCase { assertThat(found.getValueSet()).hasSize(2); assertThat(found.getValueMap()).hasSize(2);; - Ebean.save(bean); + DB.save(bean); - found = Ebean.find(EBasicJsonJackson2.class, bean.getId()); + found = DB.find(EBasicJsonJackson2.class, bean.getId()); assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class); assertThat(found.getValueList()).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java index e83ff4839..52a176dd3 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; @@ -34,7 +34,7 @@ public class TestDbJson_Jackson2 extends BaseTestCase { bean.getValueMap().put(1, new StringJacksonType("A")); bean.getValueMap().put(2, new LongJacksonType(7l)); - ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().config().getObjectMapper(); + ObjectMapper mapper = (ObjectMapper) DB.getDefault().pluginApi().config().getObjectMapper(); String json = mapper.writeValueAsString(bean); found = mapper.readValue(json, EBasicJsonJackson2.class); @@ -44,9 +44,9 @@ public class TestDbJson_Jackson2 extends BaseTestCase { assertThat(found.getValueSet()).hasSize(2); assertThat(found.getValueMap()).hasSize(2);; - Ebean.save(bean); + DB.save(bean); - found = Ebean.find(EBasicJsonJackson2.class, bean.getId()); + found = DB.find(EBasicJsonJackson2.class, bean.getId()); assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class); assertThat(found.getValueList()).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java index 6f2285dd6..0fc2ff68c 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapBlob; import org.junit.jupiter.api.Test; @@ -24,9 +24,9 @@ public class TestJsonMapBlob extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonMapBlob bean1 = Ebean.find(EBasicJsonMapBlob.class, bean.getId()); + EBasicJsonMapBlob bean1 = DB.find(EBasicJsonMapBlob.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -34,6 +34,6 @@ public class TestJsonMapBlob extends BaseTestCase { assertEquals(18L, bean1.getContent().get("docId")); bean1.setName("just change name"); - Ebean.save(bean1); + DB.save(bean1); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java index b8c5b1f6c..fb69a3e53 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapClob; import org.junit.jupiter.api.Test; @@ -24,9 +24,9 @@ public class TestJsonMapClob extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonMapClob bean1 = Ebean.find(EBasicJsonMapClob.class, bean.getId()); + EBasicJsonMapClob bean1 = DB.find(EBasicJsonMapClob.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -34,6 +34,6 @@ public class TestJsonMapClob extends BaseTestCase { assertEquals(18L, bean1.getContent().get("docId")); bean1.setName("just change name"); - Ebean.save(bean1); + DB.save(bean1); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java index e5292734d..76226c209 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapJsonB; import org.junit.jupiter.api.Test; @@ -24,9 +24,9 @@ public class TestJsonMapJsonB extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonMapJsonB bean1 = Ebean.find(EBasicJsonMapJsonB.class, bean.getId()); + EBasicJsonMapJsonB bean1 = DB.find(EBasicJsonMapJsonB.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -34,6 +34,6 @@ public class TestJsonMapJsonB extends BaseTestCase { assertEquals(18L, bean1.getContent().get("docId")); bean1.setName("just change name"); - Ebean.save(bean1); + DB.save(bean1); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java index 7564c2d5e..46ced092a 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapVarchar; import org.junit.jupiter.api.Test; @@ -24,9 +24,9 @@ public class TestJsonMapVarchar extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonMapVarchar bean1 = Ebean.find(EBasicJsonMapVarchar.class, bean.getId()); + EBasicJsonMapVarchar bean1 = DB.find(EBasicJsonMapVarchar.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -34,6 +34,6 @@ public class TestJsonMapVarchar extends BaseTestCase { assertEquals(18L, bean1.getContent().get("docId")); bean1.setName("just change name"); - Ebean.save(bean1); + DB.save(bean1); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index 7d166819d..a1c74ef4e 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.SerializationFeature; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.json.EBasicJsonNode; import com.fasterxml.jackson.databind.JsonNode; @@ -38,9 +38,9 @@ public class TestJsonNodeBasic extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNode bean1 = Ebean.find(EBasicJsonNode.class, bean.getId()); + EBasicJsonNode bean1 = DB.find(EBasicJsonNode.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -49,15 +49,15 @@ public class TestJsonNodeBasic extends BaseTestCase { assertEquals(18L, bean1.getContent().get("docId").asLong()); bean1.setName("just change name"); - Ebean.save(bean1); + DB.save(bean1); JsonNode content1 = objectMapper.readTree(s1); bean1.setName("two"); bean1.setContent(content1); - Ebean.save(bean1); + DB.save(bean1); - EBasicJsonNode bean2 = Ebean.find(EBasicJsonNode.class, bean.getId()); + EBasicJsonNode bean2 = DB.find(EBasicJsonNode.class, bean.getId()); // name changed and docId changed assertEquals("two", bean2.getName()); @@ -66,18 +66,18 @@ public class TestJsonNodeBasic extends BaseTestCase { // content persisted even though it has not changed (as it's loaded) // we can't do dirty detection on JsonNode (like we do on Map) bean1.setName("three"); - Ebean.save(bean1); + DB.save(bean1); - EBasicJsonNode bean3 = Ebean.find(EBasicJsonNode.class, bean.getId()); + EBasicJsonNode bean3 = DB.find(EBasicJsonNode.class, bean.getId()); assertEquals("three", bean3.getName()); assertEquals(99L, bean3.getContent().path("docId").asLong()); // write whole bean with content as JSON - String fullBeanJson = Ebean.json().toJson(bean3); + String fullBeanJson = DB.json().toJson(bean3); // parse JSON into whole bean with content - EBasicJsonNode beanJsonRestored = Ebean.json().toBean(EBasicJsonNode.class, fullBeanJson); + EBasicJsonNode beanJsonRestored = DB.json().toBean(EBasicJsonNode.class, fullBeanJson); assertEquals(99L, beanJsonRestored.getContent().path("docId").asLong()); } @@ -94,14 +94,14 @@ public class TestJsonNodeBasic extends BaseTestCase { EBasicJsonNode bean = new EBasicJsonNode(); bean.setName("lazyLoadTest"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNode bean1 = Ebean.find(EBasicJsonNode.class) + EBasicJsonNode bean1 = DB.find(EBasicJsonNode.class) .select("name") .setId(bean.getId()) .findOne(); - Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index d775fc01a..1e11adc54 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,9 +27,9 @@ public class TestJsonNodeBlob extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeBlob bean1 = Ebean.find(EBasicJsonNodeBlob.class, bean.getId()); + EBasicJsonNodeBlob bean1 = DB.find(EBasicJsonNodeBlob.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -51,14 +51,14 @@ public class TestJsonNodeBlob extends BaseTestCase { EBasicJsonNodeBlob bean = new EBasicJsonNodeBlob(); bean.setName("lazyLoadTest"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeBlob bean1 = Ebean.find(EBasicJsonNodeBlob.class) + EBasicJsonNodeBlob bean1 = DB.find(EBasicJsonNodeBlob.class) .select("name") .setId(bean.getId()) .findOne(); - Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 1e3121146..867917605 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,9 +27,9 @@ public class TestJsonNodeJsonb extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeJsonB bean1 = Ebean.find(EBasicJsonNodeJsonB.class, bean.getId()); + EBasicJsonNodeJsonB bean1 = DB.find(EBasicJsonNodeJsonB.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -51,14 +51,14 @@ public class TestJsonNodeJsonb extends BaseTestCase { EBasicJsonNodeJsonB bean = new EBasicJsonNodeJsonB(); bean.setName("lazyLoadTest"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeJsonB bean1 = Ebean.find(EBasicJsonNodeJsonB.class) + EBasicJsonNodeJsonB bean1 = DB.find(EBasicJsonNodeJsonB.class) .select("name") .setId(bean.getId()) .findOne(); - Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 903b425ca..10546eeb7 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,9 +27,9 @@ public class TestJsonNodeVarchar extends BaseTestCase { bean.setName("one"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeVarchar bean1 = Ebean.find(EBasicJsonNodeVarchar.class, bean.getId()); + EBasicJsonNodeVarchar bean1 = DB.find(EBasicJsonNodeVarchar.class, bean.getId()); assertEquals(bean.getId(), bean1.getId()); assertEquals(bean.getName(), bean1.getName()); @@ -51,14 +51,14 @@ public class TestJsonNodeVarchar extends BaseTestCase { EBasicJsonNodeVarchar bean = new EBasicJsonNodeVarchar(); bean.setName("lazyLoadTest"); bean.setContent(content); - Ebean.save(bean); + DB.save(bean); - EBasicJsonNodeVarchar bean1 = Ebean.find(EBasicJsonNodeVarchar.class) + EBasicJsonNodeVarchar bean1 = DB.find(EBasicJsonNodeVarchar.class) .select("name") .setId(bean.getId()) .findOne(); - Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java index 99d1a4974..6f483933b 100644 --- a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -1,7 +1,7 @@ package org.tests.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.json.EBasicJsonUnmapped; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ public class TestUnmappedProperties extends BaseTestCase { bean.setUnmapped(unmapped); - String asJson = Ebean.json().toJson(bean); + String asJson = DB.json().toJson(bean); assertThat(asJson).contains("{\"name\":\"someName\",\"one\":42,\"nested\":{\"alpha\":\"aa\",\"beta\":\"bb\"}}"); @@ -40,7 +40,7 @@ public class TestUnmappedProperties extends BaseTestCase { String json = "{\"name\":\"someName\",\"one\":42,\"nested\":{\"alpha\":\"aa\",\"beta\":\"bb\"}}"; - EBasicJsonUnmapped bean = Ebean.json().toBean(EBasicJsonUnmapped.class, json); + EBasicJsonUnmapped bean = DB.json().toBean(EBasicJsonUnmapped.class, json); assertThat(bean.getName()).isEqualTo("someName"); assertThat(bean.getUnmapped().get("one")).isEqualTo(42L); diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index 04b8714b6..8186ba1b5 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -1,6 +1,6 @@ package org.tests.json.include; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.Order; @@ -24,7 +24,7 @@ public class TestJsonExcludeEmptyList { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99,\"details\":[]}"; @@ -43,7 +43,7 @@ public class TestJsonExcludeEmptyList { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99}"; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index 06528823b..5bc591256 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -1,6 +1,6 @@ package org.tests.json.include; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.json.EBasicJsonMap; @@ -22,7 +22,7 @@ public class TestJsonExcludeEmptyMap { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99,\"content\":{}}"; @@ -39,7 +39,7 @@ public class TestJsonExcludeEmptyMap { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99,\"content\":{}}"; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index 6ade9c12c..e674504bb 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -1,6 +1,6 @@ package org.tests.json.include; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.AttributeHolder; @@ -22,7 +22,7 @@ public class TestJsonExcludeEmptySet { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99,\"attributes\":[]}"; @@ -39,7 +39,7 @@ public class TestJsonExcludeEmptySet { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99}"; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java index 4f99bce89..ed1b5b9b8 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -1,6 +1,6 @@ package org.tests.json.include; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.json.transientproperties.EJsonTransientObject; @@ -21,7 +21,7 @@ public class TestJsonExcludeNull { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99}"; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index 661503290..1047a5dcf 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -1,6 +1,6 @@ package org.tests.json.include; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonWriteOptions; @@ -25,7 +25,7 @@ public class TestJsonExcludeTransientEmptyList { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99,\"fileNames\":[]}"; @@ -42,7 +42,7 @@ public class TestJsonExcludeTransientEmptyList { JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); - String asJson = Ebean.json().toJson(bean, options); + String asJson = DB.json().toJson(bean, options); String expectedJson = "{\"id\":99}"; @@ -58,7 +58,7 @@ public class TestJsonExcludeTransientEmptyList { PathProperties pathProps = PathProperties.parse("id,name"); - String asJson = Ebean.json().toJson(bean, pathProps); + String asJson = DB.json().toJson(bean, pathProps); assertThat(asJson).isEqualTo("{\"id\":99,\"name\":\"John\"}"); } diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java index c0feb5070..227723973 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java @@ -1,6 +1,6 @@ package org.tests.json.transientproperties; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @@ -15,12 +15,12 @@ public class TestJacksonIgnore { bean.setName("foo"); bean.setBasic(Boolean.TRUE); - String asJson = Ebean.json().toJson(bean); + String asJson = DB.json().toJson(bean); // ignored on write assertFalse(asJson.contains("basic")); - EJsonJacksonIgnore bean1 = Ebean.json().toBean(EJsonJacksonIgnore.class, asJson); + EJsonJacksonIgnore bean1 = DB.json().toBean(EJsonJacksonIgnore.class, asJson); assertNull(bean1.getBasic()); assertEquals(bean.getId(), bean1.getId()); @@ -29,7 +29,7 @@ public class TestJacksonIgnore { // ignored on read String jsonFull = "{\"id\":99,\"name\":\"foo\",\"basic\":true}"; - bean1 = Ebean.json().toBean(EJsonJacksonIgnore.class, jsonFull); + bean1 = DB.json().toBean(EJsonJacksonIgnore.class, jsonFull); assertNull(bean1.getBasic()); assertEquals(bean.getId(), bean1.getId()); diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java index c55ec91a1..b98611738 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java @@ -1,6 +1,6 @@ package org.tests.json.transientproperties; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.PathProperties; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ public class TestModelAJson { PathProperties pathProperties = PathProperties.parse("(a,list(oneField))"); - String json = Ebean.json().toJson(a, pathProperties); + String json = DB.json().toJson(a, pathProperties); assertThat(json).isEqualTo("{\"a\":\"a\",\"list\":[{\"oneField\":1}]}"); diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java index 2dc7fd597..9c8b4cf83 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java @@ -1,6 +1,6 @@ package org.tests.json.transientproperties; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,12 +12,12 @@ public class TestTransientListProperty { String rawJson = "{\"basic\":true,\"fileNames\":[\"1\"]}"; - EJsonTransientList bean = Ebean.json().toBean(EJsonTransientList.class, rawJson); + EJsonTransientList bean = DB.json().toBean(EJsonTransientList.class, rawJson); assertEquals(true, bean.getBasic()); assertEquals(1, bean.getFileNames().size()); - String asJson = Ebean.json().toJson(bean); + String asJson = DB.json().toJson(bean); assertEquals(rawJson, asJson); } diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java index 2add46e7a..fed0db613 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java @@ -1,6 +1,6 @@ package org.tests.json.transientproperties; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,14 +12,14 @@ public class TestTransientObjectProperty { String rawJson = "{\"name\":\"entityBeanName\",\"basic\":true,\"someBean\":{\"name\":\"transientBeanName\",\"baz\":\"foo\"}}"; - EJsonTransientObject bean = Ebean.json().toBean(EJsonTransientObject.class, rawJson); + EJsonTransientObject bean = DB.json().toBean(EJsonTransientObject.class, rawJson); assertEquals("entityBeanName", bean.getName()); assertEquals(true, bean.getBasic()); assertEquals("transientBeanName", bean.getSomeBean().name); assertEquals("foo", bean.getSomeBean().baz); - String asJson = Ebean.json().toJson(bean); + String asJson = DB.json().toJson(bean); assertEquals(rawJson, asJson); } diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 8ecedd6c6..d3aabecd4 100644 --- a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -2,7 +2,7 @@ package org.tests.lazyforeignkeys; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.text.PathProperties; import org.ebeantest.LoggedSqlCollector; @@ -73,7 +73,7 @@ public class TestLazyForeignKeys extends BaseTestCase { pathProp.addToPath("entity1", "id"); pathProp.addToPath("entity2", "id"); - Query query = Ebean.find(MainEntityRelation.class).apply(pathProp); + Query query = DB.find(MainEntityRelation.class).apply(pathProp); List list = query.findList(); assertEquals(1, list.size()); diff --git a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java index bbfb37b0a..aa1ce507e 100644 --- a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -1,7 +1,7 @@ package org.tests.level.test; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.level.Level1; import org.tests.level.Level2; import org.tests.level.Level3; @@ -19,27 +19,27 @@ public class ManyToManyTest extends BaseTestCase { @Test public void test() { - Ebean.beginTransaction(); + DB.beginTransaction(); try { Level4 i = new Level4("i"); Level4 ii = new Level4("ii"); Level4 iii = new Level4("iii"); - Ebean.save(i); - Ebean.save(ii); - Ebean.save(iii); + DB.save(i); + DB.save(ii); + DB.save(iii); Level3 a = new Level3("a"); Level3 b = new Level3("b"); - Ebean.save(a); - Ebean.save(b); + DB.save(a); + DB.save(b); Level2 one = new Level2("one"); Level2 two = new Level2("two"); - Ebean.save(one); - Ebean.save(two); + DB.save(one); + DB.save(two); Level1 x1 = new Level1("x1"); Level1 x2 = new Level1("x2"); @@ -58,14 +58,14 @@ public class ManyToManyTest extends BaseTestCase { x2.getLevel4s().add(ii); x2.getLevel4s().add(iii); - Ebean.save(x1); - Ebean.save(x2); - Ebean.save(x3); - Ebean.save(x4); - Ebean.save(x5); + DB.save(x1); + DB.save(x2); + DB.save(x3); + DB.save(x4); + DB.save(x5); // this query had the original problem - List things = Ebean.find(Level1.class) + List things = DB.find(Level1.class) .fetch("level4s") .fetch("level2s") .fetch("level2s.level3s") @@ -75,7 +75,7 @@ public class ManyToManyTest extends BaseTestCase { validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); - things = Ebean.find(Level1.class) + things = DB.find(Level1.class) .fetch("level2s") .fetch("level2s.level3s") .fetch("level4s") @@ -85,7 +85,7 @@ public class ManyToManyTest extends BaseTestCase { validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); - things = Ebean.find(Level1.class) + things = DB.find(Level1.class) .fetch("level2s") .fetch("level4s") .order().asc("id") @@ -94,7 +94,7 @@ public class ManyToManyTest extends BaseTestCase { validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 6fe0948b3..efc21e866 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -2,7 +2,7 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.EBasicWithLifecycle; @@ -18,7 +18,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("PrePersist"); - Ebean.save(bean); + DB.save(bean); assertThat(bean.getBuffer()).contains("prePersist1"); assertThat(bean.getBuffer()).contains("prePersist2"); @@ -30,7 +30,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("PostPersist"); - Ebean.save(bean); + DB.save(bean); assertThat(bean.getBuffer()).contains("postPersist1"); assertThat(bean.getBuffer()).contains("postPersist2"); @@ -42,9 +42,9 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("PostLoad"); - Ebean.save(bean); + DB.save(bean); - EBasicWithLifecycle loaded = Ebean.find(EBasicWithLifecycle.class, bean.getId()); + EBasicWithLifecycle loaded = DB.find(EBasicWithLifecycle.class, bean.getId()); assertThat(loaded.getBuffer()).contains("postLoad1"); assertThat(loaded.getBuffer()).contains("postLoad2"); } @@ -55,10 +55,10 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("Persisted"); - Ebean.save(bean); + DB.save(bean); bean.setName("PreUpdate"); - Ebean.save(bean); + DB.save(bean); assertThat(bean.getBuffer()).contains("preUpdate1"); assertThat(bean.getBuffer()).contains("preUpdate2"); @@ -87,10 +87,10 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("Persisted"); - Ebean.save(bean); + DB.save(bean); bean.setName("PostUpdate"); - Ebean.save(bean); + DB.save(bean); assertThat(bean.getBuffer()).contains("postUpdate1"); assertThat(bean.getBuffer()).contains("postUpdate2"); @@ -102,13 +102,13 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("Persisted"); - Ebean.save(bean); - Ebean.delete(bean); + DB.save(bean); + DB.delete(bean); assertThat(bean.getBuffer()).contains("preSoftDelete"); assertThat(bean.getBuffer()).contains("postSoftDelete"); - Ebean.deletePermanent(bean); + DB.deletePermanent(bean); assertThat(bean.getBuffer()).contains("preRemove1"); assertThat(bean.getBuffer()).contains("preRemove2"); @@ -122,8 +122,8 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("Persisted"); - Ebean.save(bean); - Ebean.deletePermanent(bean); + DB.save(bean); + DB.deletePermanent(bean); assertThat(bean.getBuffer()).contains("postRemove1"); assertThat(bean.getBuffer()).contains("postRemove2"); @@ -135,9 +135,9 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("PostConstruct"); - Ebean.save(bean); + DB.save(bean); - EBasicWithLifecycle loaded = Ebean.find(EBasicWithLifecycle.class, bean.getId()); + EBasicWithLifecycle loaded = DB.find(EBasicWithLifecycle.class, bean.getId()); assertThat(loaded.getBuffer()).contains("postConstruct1"); assertThat(loaded.getBuffer()).contains("postConstruct2"); // assert also that postLoad was executed @@ -147,7 +147,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { @Test public void shouldExecutePostConstructMethodsWhenInstantiated() { - EBasicWithLifecycle bean = Ebean.getDefaultServer().createEntityBean(EBasicWithLifecycle.class); + EBasicWithLifecycle bean = DB.getDefault().createEntityBean(EBasicWithLifecycle.class); bean.setName("PostConstruct"); @@ -165,7 +165,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { EBasicWithLifecycle bean = new EBasicWithLifecycle(); bean.setName("LazyLoad"); - Ebean.save(bean); + DB.save(bean); BeanDescriptor desc = ((SpiEbeanServer) server()).getBeanDescriptor(EBasicWithLifecycle.class); EBasicWithLifecycle loaded = desc.createReference(false, false, bean.getId(), null); diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index a4554fd7b..0011b53bc 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -1,7 +1,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; @@ -18,43 +18,43 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { @Test public void test() { - Ebean.createUpdate(Permission.class, "delete from Permission").execute(); - Ebean.createUpdate(Tenant.class, "delete from Tenant").execute(); - Ebean.createUpdate(Role.class, "delete from Role").execute(); + DB.createUpdate(Permission.class, "delete from Permission").execute(); + DB.createUpdate(Tenant.class, "delete from Tenant").execute(); + DB.createUpdate(Role.class, "delete from Role").execute(); Tenant tenant1 = new Tenant("Tenant"); - Ebean.save(tenant1); + DB.save(tenant1); Permission p1 = new Permission("p1"); Permission p2 = new Permission("p2"); - Ebean.save(p1); - Ebean.save(p2); + DB.save(p1); + DB.save(p2); Role role1 = new Role("RoleOne"); role1.setTenant(tenant1); Set permissions = new HashSet<>(); - List permsList = Ebean.find(Permission.class).findList(); + List permsList = DB.find(Permission.class).findList(); permissions.addAll(permsList); role1.setPermissions(permissions); - Ebean.save(role1); + DB.save(role1); - List tenantList = Ebean.find(Tenant.class).fetch("roles").findList(); - List roleList = Ebean.find(Role.class).fetch("permissions").findList(); - List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); + List tenantList = DB.find(Tenant.class).fetch("roles").findList(); + List roleList = DB.find(Role.class).fetch("permissions").findList(); + List permissionList = DB.find(Permission.class).fetch("roles").findList(); assertEquals(1, tenantList.size()); assertEquals(2, permissionList.size()); assertEquals(1, roleList.size()); - Ebean.delete(tenant1); + DB.delete(tenant1); - List tenantList2 = Ebean.find(Tenant.class).fetch("roles").findList(); - List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); - List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); + List tenantList2 = DB.find(Tenant.class).fetch("roles").findList(); + List roleList2 = DB.find(Role.class).fetch("permissions").findList(); + List permissionList2 = DB.find(Permission.class).fetch("roles").findList(); assertEquals(0, tenantList2.size()); assertEquals(0, roleList2.size()); diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index f1571c4e7..2dbfa06f0 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -1,7 +1,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; import org.junit.jupiter.api.Test; @@ -21,33 +21,33 @@ public class TestM2MDeleteWithCascade extends BaseTestCase { MRole r0 = new MRole("r0"); MRole r1 = new MRole("r1"); - Ebean.save(r0); - // Ebean.save(r1); + DB.save(r0); + // DB.save(r1); MUser u0 = new MUser("usr0"); u0.addRole(r0); u0.addRole(r1); - Ebean.save(u0); + DB.save(u0); List roles = u0.getRoles(); // this will delete - Ebean.delete(u0); + DB.delete(u0); - MUser notThere = Ebean.find(MUser.class, u0.getUserid()); + MUser notThere = DB.find(MUser.class, u0.getUserid()); assertNull(notThere); List roleIds = new ArrayList<>(); Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid()); - int rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); + int rc = DB.find(MRole.class).where().idIn(roleIds).findCount(); assertEquals(2, rc); - Ebean.deleteAll(roles); + DB.deleteAll(roles); - rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); + rc = DB.find(MRole.class).where().idIn(roleIds).findCount(); assertEquals(0, rc); } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index a94a7198d..fbe5ca783 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -1,7 +1,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.m2m.MailBox; import org.tests.model.m2m.MailUser; import org.junit.jupiter.api.Test; @@ -20,9 +20,9 @@ public class TestM2MMultipleLists extends BaseTestCase { m1.setName("mailBox1"); u.getInbox().add(m1); - Ebean.save(u); + DB.save(u); - u = Ebean.find(MailUser.class, u.getId()); + u = DB.find(MailUser.class, u.getId()); assertEquals(1, u.getInbox().size()); assertEquals(0, u.getOutbox().size()); diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 91fcb23fe..5d5c85ca7 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -1,7 +1,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.m2m.MnyTopic; import org.junit.jupiter.api.Test; @@ -13,17 +13,17 @@ public class TestM2MSelfRelationship extends BaseTestCase { @Test public void test() { - Ebean.getDefaultServer(); + DB.getDefault(); // Create 2 roles r0 and r1 MnyTopic r0 = new MnyTopic("r0"); MnyTopic r1 = new MnyTopic("r1"); // Save r1 and r2 - Ebean.save(r0); - Ebean.save(r1); + DB.save(r0); + DB.save(r1); r0.getSubTopics().add(r1); - Ebean.save(r0); + DB.save(r0); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java index a96294c3b..c7b3d1f5b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -1,7 +1,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.meta.MetaTimedMetric; import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; @@ -22,9 +22,9 @@ public class TestM2mDeleteObject extends BaseTestCase { resetAllMetrics(); - Ebean.createUpdate(Permission.class, "delete from Permission").setLabel("deleteAllPermissions").execute(); - Ebean.createUpdate(Tenant.class, "delete from Tenant").execute(); - Ebean.createUpdate(Role.class, "delete from Role").execute(); + DB.createUpdate(Permission.class, "delete from Permission").setLabel("deleteAllPermissions").execute(); + DB.createUpdate(Tenant.class, "delete from Tenant").execute(); + DB.createUpdate(Role.class, "delete from Role").execute(); List sqlMetrics = sqlMetrics(); assertThat(sqlMetrics).hasSize(1); @@ -32,38 +32,38 @@ public class TestM2mDeleteObject extends BaseTestCase { Tenant t = new Tenant("tenant"); - Ebean.save(t); + DB.save(t); Permission p1 = new Permission("p1"); Permission p2 = new Permission("p2"); - Ebean.save(p1); - Ebean.save(p2); + DB.save(p1); + DB.save(p2); Role role1 = new Role("role"); role1.setTenant(t); Set permissions = new HashSet<>(); - List permsList = Ebean.find(Permission.class).findList(); + List permsList = DB.find(Permission.class).findList(); permissions.addAll(permsList); role1.setPermissions(permissions); - Ebean.save(role1); + DB.save(role1); - List tenantList = Ebean.find(Tenant.class).fetch("roles").findList(); - List roleList = Ebean.find(Role.class).fetch("permissions").findList(); - List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); + List tenantList = DB.find(Tenant.class).fetch("roles").findList(); + List roleList = DB.find(Role.class).fetch("permissions").findList(); + List permissionList = DB.find(Permission.class).fetch("roles").findList(); assertEquals(1, tenantList.size()); assertEquals(2, permissionList.size()); assertEquals(1, roleList.size()); - Ebean.delete(role1); + DB.delete(role1); - List tenantList2 = Ebean.find(Tenant.class).fetch("roles").findList(); - List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); - List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); + List tenantList2 = DB.find(Tenant.class).fetch("roles").findList(); + List roleList2 = DB.find(Role.class).fetch("permissions").findList(); + List permissionList2 = DB.find(Permission.class).fetch("roles").findList(); assertEquals(0, roleList2.size()); assertEquals(1, tenantList2.size()); @@ -76,19 +76,19 @@ public class TestM2mDeleteObject extends BaseTestCase { Permission p1 = new Permission("p1"); Permission p2 = new Permission("p2"); - Ebean.save(p1); - Ebean.save(p2); + DB.save(p1); + DB.save(p2); Role role1 = new Role("role"); Set permissions = new HashSet<>(); permissions.add(p2); role1.setPermissions(permissions); - Ebean.save(role1); + DB.save(role1); // only deletes as not associated - Ebean.delete(p1); + DB.delete(p1); // delete cascades - Ebean.delete(role1); + DB.delete(role1); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java index 5c2866043..c8fe1498b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java +++ b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java @@ -1,7 +1,7 @@ package org.tests.m2m.softdelete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { setup(); - Query query = Ebean.find(MsManyA.class) + Query query = DB.find(MsManyA.class) .where().isNotEmpty("manybs") .order("aid").query(); @@ -41,9 +41,9 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { private void testDeletedB0() { - Ebean.delete(bs.get(0)); + DB.delete(bs.get(0)); - List list = Ebean.find(MsManyA.class) + List list = DB.find(MsManyA.class) .where().isNotEmpty("manybs") .order("aid") .findList(); @@ -57,9 +57,9 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { private void testDeletedB1() { - Ebean.delete(bs.get(1)); + DB.delete(bs.get(1)); - List list = Ebean.find(MsManyA.class) + List list = DB.find(MsManyA.class) .where().isNotEmpty("manybs") .order("aid") .findList(); @@ -72,9 +72,9 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { private void testEndTotals() { - assertEquals(5, Ebean.find(MsManyA.class).findCount()); - assertEquals(3, Ebean.find(MsManyB.class).findCount()); - assertEquals(5, Ebean.find(MsManyB.class).setIncludeSoftDeletes().findCount()); + assertEquals(5, DB.find(MsManyA.class).findCount()); + assertEquals(3, DB.find(MsManyB.class).findCount()); + assertEquals(5, DB.find(MsManyB.class).setIncludeSoftDeletes().findCount()); } private void setup() { @@ -84,9 +84,9 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { private void clean() { - Ebean.createSqlUpdate("delete from ms_many_a_many_b").execute(); - Ebean.createSqlUpdate("delete from ms_many_a").execute(); - Ebean.createSqlUpdate("delete from ms_many_b").execute(); + DB.sqlUpdate("delete from ms_many_a_many_b").execute(); + DB.sqlUpdate("delete from ms_many_a").execute(); + DB.sqlUpdate("delete from ms_many_b").execute(); } private void seed() { @@ -95,16 +95,16 @@ public class TestM2MSoftDeleteExists extends BaseTestCase { bs.add(new MsManyB("b" + i)); } - Ebean.saveAll(as); - Ebean.saveAll(bs); + DB.saveAll(as); + DB.saveAll(bs); as.get(0).getManybs().add(bs.get(0)); as.get(1).getManybs().addAll(bs); as.get(2).getManybs().add(bs.get(1)); - Ebean.save(as.get(0)); - Ebean.save(as.get(1)); - Ebean.save(as.get(2)); + DB.save(as.get(0)); + DB.save(as.get(1)); + DB.save(as.get(2)); } } diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java index 05af24970..438281e38 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java @@ -1,7 +1,7 @@ package org.tests.merge; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; @@ -18,13 +18,13 @@ public class TestMergeBasic extends BaseTestCase { private UUOne rebuildViaJson(UUOne input) { - String asJson = Ebean.json().toJson(input); - return Ebean.json().toBean(UUOne.class, asJson); + String asJson = DB.json().toJson(input); + return DB.json().toBean(UUOne.class, asJson); } private UUOne build() { UUOne uuOne = buildGraph(); - Ebean.save(uuOne); + DB.save(uuOne); return rebuildViaJson(uuOne); } @@ -45,7 +45,7 @@ public class TestMergeBasic extends BaseTestCase { .build(); LoggedSqlCollector.start(); - Ebean.merge(one, options); + DB.merge(one, options); List sql = LoggedSqlCollector.stop(); @@ -93,7 +93,7 @@ public class TestMergeBasic extends BaseTestCase { .build(); LoggedSqlCollector.start(); - Ebean.merge(one, options); + DB.merge(one, options); List sql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java index f7f4fdb7f..f02a45874 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -1,7 +1,7 @@ package org.tests.merge; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchPath; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; @@ -28,7 +28,7 @@ public class TestMergeCustomer extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.merge(mCustomer); + DB.merge(mCustomer); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); @@ -50,7 +50,7 @@ public class TestMergeCustomer extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.merge(mCustomer, options); + DB.merge(mCustomer, options); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); @@ -175,7 +175,7 @@ public class TestMergeCustomer extends BaseTestCase { MCustomer c = new MCustomer("Null Address"); c.setBillingAddress(new MAddress("Cow corner", "Mid Wicket")); - Ebean.save(c); + DB.save(c); MCustomer mCustomer = rebuildViaJson(c); @@ -189,13 +189,13 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() .build(); - Ebean.merge(mCustomer, options); + DB.merge(mCustomer, options); } private MCustomer rebuildViaJson(MCustomer input) { - String asJson = Ebean.json().toJson(input); - return Ebean.json().toBean(MCustomer.class, asJson); + String asJson = DB.json().toJson(input); + return DB.json().toBean(MCustomer.class, asJson); } @Test @@ -361,21 +361,21 @@ public class TestMergeCustomer extends BaseTestCase { private MCustomer partial(String name, String fetchGraph) { MCustomer cust1 = buildCustomer(name); - Ebean.save(cust1); + DB.save(cust1); FetchPath fetchPath = PathProperties.parse(fetchGraph); - String asJson = Ebean.json().toJson(cust1, fetchPath); - return Ebean.json().toBean(MCustomer.class, asJson); + String asJson = DB.json().toJson(cust1, fetchPath); + return DB.json().toBean(MCustomer.class, asJson); } private MCustomer customer(String name) { MCustomer cust1 = buildCustomer(name); - Ebean.save(cust1); + DB.save(cust1); - String asJson = Ebean.json().toJson(cust1); + String asJson = DB.json().toJson(cust1); - return Ebean.json().toBean(MCustomer.class, asJson); + return DB.json().toBean(MCustomer.class, asJson); } private MCustomer buildCustomer(String name) { diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java index 1c6e20e38..69b442d25 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java @@ -1,7 +1,7 @@ package org.tests.merge; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; @@ -22,11 +22,11 @@ public class TestMergeM2M extends BaseTestCase { MGroup group4 = new MGroup(4, "gfour"); MGroup group5 = new MGroup(5, "gfive"); - Ebean.save(group1); - Ebean.save(group2); - Ebean.save(group3); - Ebean.save(group4); - Ebean.save(group5); + DB.save(group1); + DB.save(group2); + DB.save(group3); + DB.save(group4); + DB.save(group5); MMachine m0 = new MMachine("mac1"); m0.getGroups().add(group1); @@ -37,7 +37,7 @@ public class TestMergeM2M extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.merge(m0, options); + DB.merge(m0, options); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -63,7 +63,7 @@ public class TestMergeM2M extends BaseTestCase { m1.getGroups().add(group4); m1.getGroups().add(group5); - Ebean.merge(m1, options); + DB.merge(m1, options); sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(9); diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java b/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java index 06452fdbd..4a2177d5c 100644 --- a/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java +++ b/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.Transactional; import java.math.BigDecimal; @@ -11,11 +11,11 @@ public class MachineUseData { public static DOrg load() { - int count = Ebean.find(DMachineUse.class).findCount(); + int count = DB.find(DMachineUse.class).findCount(); if (count == 0) { return new MachineUseData().loadData(); } else { - return Ebean.find(DOrg.class).where().eq("name", "org0").findOne(); + return DB.find(DOrg.class).where().eq("name", "org0").findOne(); } } diff --git a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java b/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java index 084f4bf08..cac700f04 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.Order.Status; import java.sql.Date; @@ -12,7 +12,7 @@ public class ResetBasicData { private static boolean runOnce; - private static EbeanServer server = Ebean.getServer(null); + private static Database server = DB.getDefault(); public static synchronized void reset() { @@ -57,7 +57,7 @@ public class ResetBasicData { public void deleteAll() { - Ebean.execute(() -> { + DB.execute(() -> { // orm update use bean name and bean properties server.sqlUpdate("delete from o_cached_bean_child").execute(); @@ -134,7 +134,7 @@ public class ResetBasicData { public void insertTestCustAndOrders() { - Ebean.execute(() -> { + DB.execute(() -> { Customer cust1 = insertCustomer("Rob"); Customer cust2 = insertCustomerNoAddress(); insertCustomerFiona(); @@ -173,7 +173,7 @@ public class ResetBasicData { c.addContact(createContact("Fiona", "Black")); c.addContact(createContact("Tracy", "Red")); - Ebean.save(c); + DB.save(c); return c; } @@ -190,7 +190,7 @@ public class ResetBasicData { c.setName(name); c.setStatus(Customer.Status.ACTIVE); - Ebean.save(c); + DB.save(c); return c; } @@ -201,13 +201,13 @@ public class ResetBasicData { c.setStatus(Customer.Status.NEW); c.addContact(createContact("Jack", "Black")); - Ebean.save(c); + DB.save(c); return c; } private static Customer insertCustomer(String name) { Customer c = createCustomer(name, "1 Banana St", "P.O.Box 1234", 1, null); - Ebean.save(c); + DB.save(c); return c; } @@ -237,7 +237,7 @@ public class ResetBasicData { shippingAddr.setLine1(shippingStreet); shippingAddr.setLine2("Sandringham"); shippingAddr.setCity("Auckland"); - shippingAddr.setCountry(Ebean.getReference(Country.class, "NZ")); + shippingAddr.setCountry(DB.getReference(Country.class, "NZ")); c.setShippingAddress(shippingAddr); } @@ -247,7 +247,7 @@ public class ResetBasicData { billingAddr.setLine1(billingStreet); billingAddr.setLine2("St Lukes"); billingAddr.setCity("Auckland"); - billingAddr.setCountry(Ebean.getReference(Country.class, "NZ")); + billingAddr.setCountry(DB.getReference(Country.class, "NZ")); c.setBillingAddress(billingAddr); } @@ -257,9 +257,9 @@ public class ResetBasicData { private Order createOrder1(Customer customer) { - Product product1 = Ebean.getReference(Product.class, 1); - Product product2 = Ebean.getReference(Product.class, 2); - Product product3 = Ebean.getReference(Product.class, 3); + Product product1 = DB.getReference(Product.class, 1); + Product product2 = DB.getReference(Product.class, 2); + Product product3 = DB.getReference(Product.class, 3); Order order = new Order(); @@ -275,13 +275,13 @@ public class ResetBasicData { order.addShipment(new OrderShipment()); - Ebean.save(order); + DB.save(order); return order; } private void createOrder2(Customer customer) { - Product product1 = Ebean.getReference(Product.class, 1); + Product product1 = DB.getReference(Product.class, 1); Order order = new Order(); order.setStatus(Status.SHIPPED); @@ -294,13 +294,13 @@ public class ResetBasicData { order.addShipment(new OrderShipment()); - Ebean.save(order); + DB.save(order); } private void createOrder3(Customer customer) { - Product product1 = Ebean.getReference(Product.class, 1); - Product product3 = Ebean.getReference(Product.class, 3); + Product product1 = DB.getReference(Product.class, 1); + Product product3 = DB.getReference(Product.class, 3); Order order = new Order(); order.setStatus(Status.COMPLETE); @@ -315,7 +315,7 @@ public class ResetBasicData { order.addShipment(new OrderShipment()); - Ebean.save(order); + DB.save(order); } private void createOrder4(Customer customer) { @@ -326,7 +326,7 @@ public class ResetBasicData { order.addShipment(new OrderShipment()); - Ebean.save(order); + DB.save(order); } private void createOrder5(Customer customer) { @@ -336,6 +336,6 @@ public class ResetBasicData { order.setOrderDate(Date.valueOf("2018-06-28")); order.addShipment(new OrderShipment()); - Ebean.save(order); + DB.save(order); } } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 917a9f494..672333318 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -2,7 +2,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; @@ -32,7 +32,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { private static void insertSome() { if (!loadOnce) { - Ebean.find(OCachedNatKeyBean.class).delete(); + DB.find(OCachedNatKeyBean.class).delete(); for (String store : Arrays.asList("abc", "def")) { for (String sku : Arrays.asList("1", "2", "3", "4")) { saveBean(store, sku); @@ -43,11 +43,11 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { } private static void saveBean(String abc, String sku) { - Ebean.save(new OCachedNatKeyBean(abc, sku)); + DB.save(new OCachedNatKeyBean(abc, sku)); } private void clearCacheAndStatistics() { - Ebean.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); clearStatistics(); } @@ -78,7 +78,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { private void loadSomeIntoCache() { - Ebean.find(OCachedNatKeyBean.class) + DB.find(OCachedNatKeyBean.class) .setBeanCacheMode(CacheMode.PUT) .where().le("sku", "2") .findList(); @@ -98,7 +98,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { LoggedSqlCollector.start(); log.info("Partial (2 of 3) ..."); - List list = Ebean.find(OCachedNatKeyBean.class) + List list = DB.find(OCachedNatKeyBean.class) .where() .eq("store", storeId) .in("sku", skus) @@ -117,7 +117,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { assertNaturalKeyHitMiss(2, 1); assertBeanCacheHitMiss(2, 0); - list = Ebean.find(OCachedNatKeyBean.class) + list = DB.find(OCachedNatKeyBean.class) .where() .eq("store", storeId) .in("sku", skus) @@ -136,7 +136,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { natKeyCache.remove("abc;3;"); log.info("Partial (1 of 3) ..."); - list = Ebean.find(OCachedNatKeyBean.class) + list = DB.find(OCachedNatKeyBean.class) .where() .eq("store", storeId) .in("sku", skus) @@ -166,7 +166,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean.class) + List list = DB.find(OCachedNatKeyBean.class) .where() .eq("store", storeId) .in("sku", skus) @@ -195,7 +195,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean.class) + List list = DB.find(OCachedNatKeyBean.class) .where() .eq("store", storeId) .in("sku", skus) @@ -222,7 +222,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { loadSomeIntoCache(); // simple case - no IN clause - OCachedNatKeyBean hit = Ebean.find(OCachedNatKeyBean.class) + OCachedNatKeyBean hit = DB.find(OCachedNatKeyBean.class) .where() .eq("store", "abc") .eq("sku", "2") @@ -239,7 +239,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { setup(); - OCachedNatKeyBean miss = Ebean.find(OCachedNatKeyBean.class) + OCachedNatKeyBean miss = DB.find(OCachedNatKeyBean.class) .where() .eq("store", "def") .eq("sku", "4") @@ -260,7 +260,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { setup(); - OCachedNatKeyBean miss = Ebean.find(OCachedNatKeyBean.class) + OCachedNatKeyBean miss = DB.find(OCachedNatKeyBean.class) .where() .eq("store", "def") .eq("sku", "4") diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 4befd66a9..10861e417 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -2,7 +2,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Pairs; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; @@ -29,7 +29,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { private static void insertSome() { if (!loadOnce) { - Ebean.find(OCachedNatKeyBean3.class).delete(); + DB.find(OCachedNatKeyBean3.class).delete(); List stores = asList("abc", "def"); for (String store : stores) { @@ -46,11 +46,11 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { } private static void saveBean(String store, int code, String sku) { - Ebean.save(new OCachedNatKeyBean3(store, code, sku)); + DB.save(new OCachedNatKeyBean3(store, code, sku)); } private void clearCacheAndStatistics() { - Ebean.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); clearStatistics(); } @@ -81,7 +81,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { private void loadSomeIntoCache() { - Ebean.find(OCachedNatKeyBean3.class) + DB.find(OCachedNatKeyBean3.class) .setBeanCacheMode(CacheMode.PUT) .where() .ge("sku", "2") @@ -102,7 +102,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - Map list = Ebean.find(OCachedNatKeyBean3.class) + Map list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .eq("sku", "2") @@ -131,7 +131,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - Map list = Ebean.find(OCachedNatKeyBean3.class) + Map list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .eq("sku", "2") @@ -160,7 +160,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - Map map = Ebean.find(OCachedNatKeyBean3.class) + Map map = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .eq("sku", "2") @@ -192,7 +192,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean3.class) + List list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .in("code", codes) @@ -225,7 +225,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean3.class) + List list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .in("sku", skus) @@ -255,7 +255,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean3.class) + List list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", storeId) .in("sku", skus) @@ -284,7 +284,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { loadSomeIntoCache(); // simple case - no IN clause - OCachedNatKeyBean3 hit = Ebean.find(OCachedNatKeyBean3.class) + OCachedNatKeyBean3 hit = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .eq("sku", "2") @@ -302,7 +302,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { setup(); - OCachedNatKeyBean3 miss = Ebean.find(OCachedNatKeyBean3.class) + OCachedNatKeyBean3 miss = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "abc") .eq("sku", "2") @@ -323,7 +323,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { setup(); - OCachedNatKeyBean3 miss = Ebean.find(OCachedNatKeyBean3.class) + OCachedNatKeyBean3 miss = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "abc") .eq("sku", "2") @@ -351,7 +351,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean3.class) + List list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .inPairs(pairs) @@ -394,7 +394,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { LoggedSqlCollector.start(); - List list = Ebean.find(OCachedNatKeyBean3.class) + List list = DB.find(OCachedNatKeyBean3.class) .where() .eq("store", "def") .inPairs(pairs) diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 0099f9e73..4673cbac7 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheWithSoftDelete extends BaseTestCase { - private final ServerCache beanCache = DB.getServerCacheManager().beanCache(ESoftWithCache.class); + private final ServerCache beanCache = DB.cacheManager().beanCache(ESoftWithCache.class); @Test public void idIn_expect_hitCache() { diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java index e4a160bf7..8a4b17d12 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java +++ b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -1,7 +1,7 @@ package org.tests.model.basic.first; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestFirstSecond extends BaseTestCase { @@ -11,17 +11,17 @@ public class TestFirstSecond extends BaseTestCase { First first = new First(); first.setName("first"); - Ebean.save(first); + DB.save(first); Second second = new Second(); second.setName("Jim"); second.setTitle("Sir"); second.setFirst(first); - Ebean.save(second); + DB.save(second); second.getFirst().setName("changed"); - Ebean.save(second); - Ebean.save(first); + DB.save(second); + DB.save(first); } } diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java index 18ed4403d..1c8301889 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; @@ -20,7 +20,7 @@ public class DummyDao { public void doSomething() { logger.info(" --- in DummyDao.doSomething() with TxType.REQUIRES_NEW"); - Transaction txn = Ebean.currentTransaction(); + Transaction txn = DB.currentTransaction(); if (txn == null) { logger.error(" NO TRANSACTION ??"); } else { @@ -32,7 +32,7 @@ public class DummyDao { @Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.ALL, batchSize = 99) private void doWithBatchOptionsSet() { - Transaction txn = Ebean.currentTransaction(); + Transaction txn = DB.currentTransaction(); assertTrue(txn.isBatchMode()); assertTrue(txn.isBatchOnCascade()); assertEquals(99, txn.getBatchSize()); @@ -42,7 +42,7 @@ public class DummyDao { @Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.NONE, batchSize = 77) public void doOuterWithBatchOptionsSet() { - Transaction txn = Ebean.currentTransaction(); + Transaction txn = DB.currentTransaction(); assertTrue(txn.isBatchMode()); assertFalse(txn.isBatchOnCascade()); diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 427f10752..c29334653 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import org.junit.jupiter.api.Test; @@ -12,16 +12,16 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { private void init() { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { String sql; SqlUpdate delete; sql = "delete from td_child"; - delete = Ebean.createSqlUpdate(sql); + delete = DB.createSqlUpdate(sql); delete.execute(); sql = "delete from td_parent"; - delete = Ebean.createSqlUpdate(sql); + delete = DB.createSqlUpdate(sql); delete.execute(); EdParent parent = new EdParent(); @@ -34,7 +34,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { children.add(child); parent.setChildren(children); - Ebean.save(parent); + DB.save(parent); EdExtendedParent extendedParent = new EdExtendedParent(); extendedParent.setName("My second computer"); @@ -46,7 +46,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { children.add(child); extendedParent.setChildren(children); - Ebean.save(extendedParent); + DB.save(extendedParent); txn.commit(); } @@ -57,11 +57,11 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { init(); - try (Transaction txn = Ebean.beginTransaction()) { - EdParent parent = Ebean.find(EdParent.class).where().eq("name", "MyComputer").findOne(); + try (Transaction txn = DB.beginTransaction()) { + EdParent parent = DB.find(EdParent.class).where().eq("name", "MyComputer").findOne(); // // Works only if the following statement is included // int x = parent.getChildren().size(); - Ebean.delete(parent); + DB.delete(parent); txn.commit(); } } @@ -71,15 +71,15 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { init(); - Ebean.beginTransaction(); + DB.beginTransaction(); try { - EdExtendedParent extendedParent = Ebean.find(EdExtendedParent.class).where() + EdExtendedParent extendedParent = DB.find(EdExtendedParent.class).where() .eq("name", "My second computer").findOne(); extendedParent.getChildren().size(); - Ebean.delete(extendedParent); - Ebean.commitTransaction(); + DB.delete(extendedParent); + DB.commitTransaction(); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index 8d849f9c1..be128fbbc 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -22,7 +22,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { public void test() { LoggedSqlCollector.start(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); EdParent parent = new EdParent(); @@ -35,7 +35,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { children.add(child); parent.setChildren(children); - Ebean.save(parent); + DB.save(parent); // nothing flushed yet assertThat(LoggedSqlCollector.start()).isEmpty(); @@ -46,12 +46,12 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { assertThat(loggedSql1).hasSize(4); parent.setName("MyDesk"); - Ebean.save(parent); + DB.save(parent); // nothing flushed yet assertThat(LoggedSqlCollector.start()).isEmpty(); - Ebean.commitTransaction(); + DB.commitTransaction(); // insert statements for EdExtendedParent List loggedSql2 = LoggedSqlCollector.start(); diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index d5fea0e3e..5d9473b91 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -20,7 +20,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { public void test() { LoggedSqlCollector.start(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); LoggedSqlCollector.start(); @@ -35,16 +35,16 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { children.add(child); parent.setChildren(children); - Ebean.save(parent); + DB.save(parent); // get Id or any generated property and that invokes a flush parent.getId(); // going to get an update now parent.setName("MyDesk"); - Ebean.save(parent); + DB.save(parent); - Ebean.commitTransaction(); + DB.commitTransaction(); // insert statements for EdExtendedParent List loggedSql = LoggedSqlCollector.stop(); @@ -61,7 +61,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { public void test_noFlushOn_getterOfNonGeneratedProperty() { LoggedSqlCollector.start(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); LoggedSqlCollector.start(); @@ -76,7 +76,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { children.add(child); parent.setChildren(children); - Ebean.save(parent); + DB.save(parent); // no getter call on a generated property // so no flush here @@ -84,10 +84,10 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { parent.setName(existing+" - additional"); // the first and second save of parent merge into a single insert - Ebean.save(parent); + DB.save(parent); // flush - Ebean.commitTransaction(); + DB.commitTransaction(); // insert statements for EdExtendedParent List loggedSql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index eceb8e12c..ff8996562 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -21,7 +21,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { LoggedSqlCollector.start(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); EdParent parent = new EdParent(); @@ -34,7 +34,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { children.add(child); parent.setChildren(children); - Ebean.save(parent); + DB.save(parent); EdExtendedParent extendedParent = new EdExtendedParent(); extendedParent.setName("My second computer"); @@ -52,12 +52,12 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { // does not causes a flush as EdExtendedParent is same root as EdParent // so they get the same batch depth - Ebean.save(extendedParent); + DB.save(extendedParent); // insert statements for EdParent List loggedSql1 = LoggedSqlCollector.start(); - Ebean.commitTransaction(); + DB.commitTransaction(); assertEquals(0, loggedSql1.size()); diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index b7c579fb3..201339bdc 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,8 +16,8 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase { BUser user = new BUser("Rob"); BSite site = new BSite("avaje.org"); - Ebean.save(user); - Ebean.save(site); + DB.save(user); + DB.save(site); insertUpdateBridgeA(user, site); insertUpdateBridgeB(user, site); @@ -30,12 +30,12 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase { private void insertUpdateBridgeA(BUser user, BSite site) { BSiteUserA access = new BSiteUserA(BAccessLevel.ONE, site, user); - Ebean.save(access); + DB.save(access); access.setAccessLevel(BAccessLevel.TWO); - Ebean.save(access); + DB.save(access); - List list = Ebean.find(BSiteUserA.class).findList(); + List list = DB.find(BSiteUserA.class).findList(); assertThat(list).isNotEmpty(); for (BSiteUserA bridge : list) { @@ -43,10 +43,10 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase { assertThat(bridge.getId().userId).isEqualTo(bridge.getUser().id); } - BSiteUserA found = Ebean.find(BSiteUserA.class, new BSiteUserA.Id(site.id, user.id)); + BSiteUserA found = DB.find(BSiteUserA.class, new BSiteUserA.Id(site.id, user.id)); found.setAccessLevel(BAccessLevel.THREE); - Ebean.save(found); + DB.save(found); } /** @@ -55,12 +55,12 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase { private void insertUpdateBridgeB(BUser user, BSite site) { BSiteUserB access = new BSiteUserB(BAccessLevel.ONE, site, user); - Ebean.save(access); + DB.save(access); access.setAccessLevel(BAccessLevel.TWO); - Ebean.save(access); + DB.save(access); - List list = Ebean.find(BSiteUserB.class).findList(); + List list = DB.find(BSiteUserB.class).findList(); assertThat(list).isNotEmpty(); for (BSiteUserB bridge : list) { @@ -75,12 +75,12 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase { private void insertUpdateBridgeC(BUser user, BSite site) { BSiteUserC access = new BSiteUserC(BAccessLevel.ONE, site, user); - Ebean.save(access); + DB.save(access); access.setAccessLevel(BAccessLevel.TWO); - Ebean.save(access); + DB.save(access); - List list = Ebean.find(BSiteUserC.class).findList(); + List list = DB.find(BSiteUserC.class).findList(); assertThat(list).isNotEmpty(); for (BSiteUserC bridge : list) { diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index a148dc262..d27f5155c 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -2,7 +2,7 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -84,8 +84,8 @@ public class TestIdClassScalar extends BaseTestCase { @Test public void test() { - Ebean.save(user); - Ebean.save(site); + DB.save(user); + DB.save(site); insertUpdateBridgeD(user, site); insertUpdateBridgeE(user, site); @@ -99,12 +99,12 @@ public class TestIdClassScalar extends BaseTestCase { LoggedSqlCollector.start(); BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id); - Ebean.save(access); + DB.save(access); access.setAccessLevel(BAccessLevel.TWO); - Ebean.save(access); + DB.save(access); - List list = Ebean.find(BSiteUserD.class).findList(); + List list = DB.find(BSiteUserD.class).findList(); assertThat(list).isNotEmpty(); for (BSiteUserD bridge : list) { @@ -120,14 +120,14 @@ public class TestIdClassScalar extends BaseTestCase { BEmbId id = new BEmbId(site.id, user.id); - BSiteUserD one = Ebean.find(BSiteUserD.class, id); + BSiteUserD one = DB.find(BSiteUserD.class, id); assertThat(one).isNotNull(); assertThat(one.getSiteId()).isEqualTo(site.id); assertThat(one.getUserId()).isEqualTo(user.id); one.setAccessLevel(BAccessLevel.THREE); - Ebean.save(one); + DB.save(one); sql = LoggedSqlCollector.stop(); @@ -144,12 +144,12 @@ public class TestIdClassScalar extends BaseTestCase { LoggedSqlCollector.start(); BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user); - Ebean.save(access); + DB.save(access); access.setAccessLevel(BAccessLevel.TWO); - Ebean.save(access); + DB.save(access); - List list = Ebean.find(BSiteUserE.class).findList(); + List list = DB.find(BSiteUserE.class).findList(); assertThat(list).isNotEmpty(); List sql = LoggedSqlCollector.current(); @@ -166,14 +166,14 @@ public class TestIdClassScalar extends BaseTestCase { BEmbId id = new BEmbId(site.id, user.id); - BSiteUserE one = Ebean.find(BSiteUserE.class, id); + BSiteUserE one = DB.find(BSiteUserE.class, id); assertThat(one).isNotNull(); assertThat(one.getSite().id).isEqualTo(site.id); assertThat(one.getUser().id).isEqualTo(user.id); one.setAccessLevel(BAccessLevel.THREE); - Ebean.save(one); + DB.save(one); sql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index be67a92a1..18ed6d523 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -1,7 +1,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.Random; @@ -17,7 +17,7 @@ public class TestTruckCarWheelInhertiance extends BaseTestCase { TWheel wheel = new TWheel(); wheel.setOwner(truck); - Ebean.save(truck); + DB.save(truck); // This save() works ok... @@ -26,7 +26,7 @@ public class TestTruckCarWheelInhertiance extends BaseTestCase { wheel.setOwner(truck); // And save() is called again - Ebean.save(truck); + DB.save(truck); // Then an exception is raised: } diff --git a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 13fc0d96e..8ff610d9f 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -1,7 +1,7 @@ package org.tests.model.composite; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,12 +17,12 @@ public class TestCompositeKeyUserClient extends BaseTestCase { CkeUser user0 = new CkeUser(); user0.setUserPK(new CkeUserKey(20, "sally")); user0.setName("sally"); - Ebean.save(user0); + DB.save(user0); CkeUser user1 = new CkeUser(); user1.setUserPK(new CkeUserKey(20, "frank")); user1.setName("hello"); - Ebean.save(user1); + DB.save(user1); CkeClient client = new CkeClient(); client.setNotes("try it"); @@ -31,12 +31,12 @@ public class TestCompositeKeyUserClient extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.save(client); + DB.save(client); client.setNotes("update it"); client.setUser(user0); - Ebean.save(client); + DB.save(client); List sql = LoggedSqlCollector.stop(); @@ -44,7 +44,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase { assertSql(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)"); assertSql(sql.get(1)).contains("update cke_client set notes=?, username=? where cod_cpny=? and cod_client=?"); - Ebean.delete(client); + DB.delete(client); } } diff --git a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java index ee59d1eeb..eaf5ad37a 100644 --- a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java @@ -1,6 +1,6 @@ package org.tests.model.ddd; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; @@ -16,9 +16,9 @@ public class TestScalarTypeConverter { exhEntity.setOid(new Oid<>(12)); exhEntity.setAnEnumType(AnEnumType.ONE); - Ebean.save(exhEntity); + DB.save(exhEntity); - int count = Ebean.find(DExhEntity.class) + int count = DB.find(DExhEntity.class) .where().eq("anEnumType", AnEnumType.ONE) .findCount(); diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index a64be330d..1c49afe79 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -24,13 +24,13 @@ public class TestElementCollectionBasic extends BaseTestCase { person.getPhoneNumbers().add("021 4321"); LoggedSqlCollector.start(); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); assertThat(eventLog()).containsOnly("preInsert", "postInsert"); assertThat(sql).hasSize(4); - final EcPerson found = Ebean.find(EcPerson.class) + final EcPerson found = DB.find(EcPerson.class) .setId(person.getId()) //.setLabel("findById") .findOne(); @@ -43,7 +43,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertSql(sql.get(1)).contains("from ec_person_phone t0 where"); // save when not actually changed - Ebean.save(found); + DB.save(found); sql = LoggedSqlCollector.stop(); assertThat(sql).isEmpty(); @@ -59,7 +59,7 @@ public class TestElementCollectionBasic extends BaseTestCase { EcPerson person = new EcPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); - Ebean.save(person); + DB.save(person); assertThat(eventLog()).containsExactly("preInsert", "postInsert"); @@ -79,14 +79,14 @@ public class TestElementCollectionBasic extends BaseTestCase { EcPerson person1 = new EcPerson("Fiona09"); person1.getPhoneNumbers().add("09 1234"); person1.getPhoneNumbers().add("09 4321"); - Ebean.save(person1); + DB.save(person1); assertThat(eventLog()).containsExactly("preInsert", "postInsert"); LoggedSqlCollector.current(); List found = - Ebean.find(EcPerson.class).where() + DB.find(EcPerson.class).where() .startsWith("name", "Fiona0") .order().asc("id") .findList(); @@ -104,7 +104,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertSql(sql.get(1)).contains("select t0.owner_id, t0.phone from ec_person_phone t0 where"); List found2 = - Ebean.find(EcPerson.class) + DB.find(EcPerson.class) .fetch("phoneNumbers") .where() .startsWith("name", "Fiona0") @@ -128,7 +128,7 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateBasic(EcPerson bean) { bean.setName("Fiona021-mod-0"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(1); @@ -141,10 +141,10 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateBasicInBatch(EcPerson bean) { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); bean.setName("Fiona021-mod-0-batch"); - Ebean.save(bean); + DB.save(bean); txn.commit(); } @@ -161,7 +161,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.setName("Fiona021-mod-both"); bean.getPhoneNumbers().add("01-22123"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -188,11 +188,11 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateBothInBatch(EcPerson bean) { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); bean.setName("Fiona021-mod-both-batch"); bean.getPhoneNumbers().add("01-22123"); - Ebean.save(bean); + DB.save(bean); txn.commit(); } @@ -211,7 +211,7 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateNothing(EcPerson bean) { - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); @@ -223,10 +223,10 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateOnlyCollectionInBatch(EcPerson bean) { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); bean.getPhoneNumbers().add("01-4321"); - Ebean.save(bean); + DB.save(bean); txn.commit(); } @@ -245,7 +245,7 @@ public class TestElementCollectionBasic extends BaseTestCase { private void updateOnlyCollection(EcPerson bean) { bean.getPhoneNumbers().add("01-4321"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -273,7 +273,7 @@ public class TestElementCollectionBasic extends BaseTestCase { private void delete(EcPerson bean) { - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); @@ -285,8 +285,8 @@ public class TestElementCollectionBasic extends BaseTestCase { private void jsonToFrom(EcPerson foundFirst) { - String asJson = Ebean.json().toJson(foundFirst); - EcPerson fromJson = Ebean.json().toBean(EcPerson.class, asJson); + String asJson = DB.json().toJson(foundFirst); + EcPerson fromJson = DB.json().toBean(EcPerson.class, asJson); assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers()); } } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index a690a47f1..550b229e5 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; @@ -19,9 +19,9 @@ public class TestElementCollectionBasicCache extends BaseTestCase { EcPerson person = new EcPerson("Cache1"); person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); - Ebean.save(person); + DB.save(person); - EcPerson one = Ebean.find(EcPerson.class) + EcPerson one = DB.find(EcPerson.class) .setId(person.getId()) .findOne(); @@ -29,7 +29,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { LoggedSqlCollector.start(); - EcPerson two = Ebean.find(EcPerson.class) + EcPerson two = DB.find(EcPerson.class) .setId(person.getId()) .findOne(); @@ -39,7 +39,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { List sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // cache hit containing phone numbers - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -49,12 +49,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(sql).hasSize(5); } - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // no change - EcPerson three = Ebean.find(EcPerson.class) + EcPerson three = DB.find(EcPerson.class) .setId(person.getId()) .findOne(); @@ -65,7 +65,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(sql).isEmpty(); // cache hit three.getPhoneNumbers().add("09 6534"); - Ebean.save(three); + DB.save(three); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -74,7 +74,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(sql).hasSize(5); // cache hit } - EcPerson four = Ebean.find(EcPerson.class) + EcPerson four = DB.find(EcPerson.class) .setId(person.getId()) .fetch("phoneNumbers") .findOne(); @@ -85,13 +85,13 @@ public class TestElementCollectionBasicCache extends BaseTestCase { sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // cache hit - Ebean.delete(four); + DB.delete(four); LoggedSqlCollector.stop(); } @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) DB.getDefault()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index a3553900e..fd04106c1 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase { EcmcPerson person = new EcmcPerson("Lob021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 614c6afb2..4d570f80b 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; @@ -19,10 +19,10 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { EcmPerson person = new EcmPerson("CacheMap"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); - Ebean.save(person); + DB.save(person); - EcmPerson one = Ebean.find(EcmPerson.class) + EcmPerson one = DB.find(EcmPerson.class) .setId(person.getId()) .fetch("phoneNumbers") .findOne(); @@ -31,7 +31,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { LoggedSqlCollector.start(); - EcmPerson two = Ebean.find(EcmPerson.class) + EcmPerson two = DB.find(EcmPerson.class) .setId(person.getId()) .findOne(); @@ -41,7 +41,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { List sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // cache hit containing phone numbers - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -51,12 +51,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { assertThat(sql).hasSize(5); } - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // no change - EcmPerson three = Ebean.find(EcmPerson.class) + EcmPerson three = DB.find(EcmPerson.class) .setId(person.getId()) .findOne(); @@ -69,7 +69,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { three.getPhoneNumbers().put("oth", "09 6534"); three.getPhoneNumbers().remove("home"); three.getPhoneNumbers().remove("work"); - Ebean.save(three); + DB.save(three); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -79,7 +79,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { assertThat(sql).hasSize(3); // cache hit } - EcmPerson four = Ebean.find(EcmPerson.class) + EcmPerson four = DB.find(EcmPerson.class) .setId(person.getId()) .fetch("phoneNumbers") .findOne(); @@ -91,13 +91,13 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); // cache hit - Ebean.delete(four); + DB.delete(four); LoggedSqlCollector.stop(); } @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) DB.getDefault()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 1182f6773..59ec71e0d 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,9 +17,9 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { EcblPerson person = new EcblPerson("CacheL"); person.getPhoneNumbers().add(new EcPhone("64", "021","1234")); person.getPhoneNumbers().add(new EcPhone("64","021","4321")); - Ebean.save(person); + DB.save(person); - EcblPerson one = Ebean.find(EcblPerson.class) + EcblPerson one = DB.find(EcblPerson.class) .setId(person.getId()) .fetch("phoneNumbers") .findOne(); @@ -31,7 +31,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { List sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); - EcblPerson two = Ebean.find(EcblPerson.class) + EcblPerson two = DB.find(EcblPerson.class) .setId(person.getId()) .findOne(); @@ -44,7 +44,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { two.getPhoneNumbers().add(new EcPhone("61", "07", "11")); two.getPhoneNumbers().remove(1); - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -60,7 +60,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { assertSql(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); } - EcblPerson three = Ebean.find(EcblPerson.class) + EcblPerson three = DB.find(EcblPerson.class) .setId(person.getId()) .findOne(); @@ -74,12 +74,12 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { three.setName("mod-3"); three.getPhoneNumbers().remove(0); - Ebean.save(three); + DB.save(three); sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(5); - EcblPerson four = Ebean.find(EcblPerson.class) + EcblPerson four = DB.find(EcblPerson.class) .setId(person.getId()) .findOne(); @@ -87,7 +87,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { assertThat(four.getPhoneNumbers()).hasSize(1); - Ebean.delete(four); + DB.delete(four); sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 593326fc3..8ee32aac9 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,10 +17,10 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { EcbmPerson person = new EcbmPerson("Cache1"); person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234")); person.getPhoneNumbers().put("work", new EcPhone("64", "021", "4321")); - Ebean.save(person); + DB.save(person); - EcbmPerson one = Ebean.find(EcbmPerson.class) + EcbmPerson one = DB.find(EcbmPerson.class) .setId(person.getId()) .fetch("phoneNumbers") .findOne(); @@ -32,7 +32,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { List sql = LoggedSqlCollector.current(); assertThat(sql).isEmpty(); - EcbmPerson two = Ebean.find(EcbmPerson.class) + EcbmPerson two = DB.find(EcbmPerson.class) .setId(person.getId()) .findOne(); @@ -45,7 +45,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11")); two.getPhoneNumbers().remove("home"); - Ebean.save(two); + DB.save(two); sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -62,7 +62,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { assertThat(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum) values (?,?,?,?,?)"); } - EcbmPerson three = Ebean.find(EcbmPerson.class) + EcbmPerson three = DB.find(EcbmPerson.class) .setId(person.getId()) .findOne(); @@ -76,12 +76,12 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { three.setName("mod-3"); three.getPhoneNumbers().remove("work"); - Ebean.save(three); + DB.save(three); sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(5); - EcbmPerson four = Ebean.find(EcbmPerson.class) + EcbmPerson four = DB.find(EcbmPerson.class) .setId(person.getId()) .findOne(); @@ -89,7 +89,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { assertThat(four.getPhoneNumbers()).hasSize(1); - Ebean.delete(four); + DB.delete(four); sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 34a042947..3daa0894f 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -1,7 +1,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -18,7 +18,7 @@ public class TestEmbeddedAttrOverride extends BaseTestCase { bean.setName("hello"); LoggedSqlCollector.start(); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 8b86aab7e..c29d5cdf3 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -1,7 +1,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; import org.ebeantest.LoggedSqlCollector; @@ -20,11 +20,11 @@ public class TestEmbeddedManyToOne extends BaseTestCase { ResetBasicData.reset(); - BeanType embType = Ebean.getDefaultServer().pluginApi().beanType(EAddr.class); + BeanType embType = DB.getDefault().pluginApi().beanType(EAddr.class); - Ebean.getDefaultServer().cacheManager().clearAll(); + DB.getDefault().cacheManager().clearAll(); - Country nz = Ebean.getReference(Country.class, "NZ"); + Country nz = DB.getReference(Country.class, "NZ"); EAddr addr = new EAddr("Foo", "Bar", nz); EPerAddr perAddr = new EPerAddr("Embed", addr); @@ -34,12 +34,12 @@ public class TestEmbeddedManyToOne extends BaseTestCase { assertThat(val).isSameAs(nz); - Ebean.save(perAddr); + DB.save(perAddr); LoggedSqlCollector.start(); - EPerAddr found = Ebean.find(EPerAddr.class, perAddr.getId()); + EPerAddr found = DB.find(EPerAddr.class, perAddr.getId()); assertThat(found.getAddress().getCountry().getCode()).isEqualTo("NZ"); assertThat(found.getAddress().getCountry().getName()).startsWith("New"); diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java index ad852a427..b7b1e2f5b 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -1,7 +1,7 @@ package org.tests.model.history; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -33,11 +33,11 @@ public class TestHistoryExclude extends BaseTestCase { public void testSoftDelete_includeSoftDeletes_findList() { HeLink l = new HeLink("two", "boo"); - Ebean.save(l); + DB.save(l); - Ebean.delete(l); + DB.delete(l); - List list = Ebean.find(HeLink.class) + List list = DB.find(HeLink.class) .setIncludeSoftDeletes() .findList(); @@ -48,11 +48,11 @@ public class TestHistoryExclude extends BaseTestCase { public void testSoftDelete_includeSoftDeletes_findOne() { HeLink l = new HeLink("three", "boo2"); - Ebean.save(l); + DB.save(l); - Ebean.delete(l); + DB.delete(l); - HeLink found = Ebean.find(HeLink.class) + HeLink found = DB.find(HeLink.class) .setId(l.getId()) .setIncludeSoftDeletes() .findOne(); @@ -66,7 +66,7 @@ public class TestHistoryExclude extends BaseTestCase { prepare(); - HeLink linkFound = Ebean.find(HeLink.class, link.getId()); + HeLink linkFound = DB.find(HeLink.class, link.getId()); linkFound.getDocs().size(); } @@ -76,7 +76,7 @@ public class TestHistoryExclude extends BaseTestCase { prepare(); - HeLink linkFound = Ebean.find(HeLink.class) + HeLink linkFound = DB.find(HeLink.class) .asOf(new Timestamp(System.currentTimeMillis() + DB_CLOCK_DELTA)) .setId(link.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java index 31afb8e03..3c462c1cc 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -1,7 +1,7 @@ package org.tests.model.history; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class TestHistoryInclude extends BaseTestCase { prepare(); - HiLink linkFound = Ebean.find(HiLink.class, link.getId()); + HiLink linkFound = DB.find(HiLink.class, link.getId()); assertThat(linkFound.getDocs().size()).isEqualTo(2); } @@ -43,7 +43,7 @@ public class TestHistoryInclude extends BaseTestCase { prepare(); - HiLink linkFound = Ebean.find(HiLink.class) + HiLink linkFound = DB.find(HiLink.class) .asOf(new Timestamp(System.currentTimeMillis() + DB_CLOCK_DELTA)) .setId(link.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java index 0ce7505c2..6ac425f71 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java @@ -1,7 +1,7 @@ package org.tests.model.history; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -13,10 +13,10 @@ public class TestHistorySoftDeleteOneToOne extends BaseTestCase { HsdUser u1 = new HsdUser("u1"); - Ebean.save(u1); - Ebean.delete(u1); + DB.save(u1); + DB.delete(u1); - HsdUser one = Ebean.find(HsdUser.class) + HsdUser one = DB.find(HsdUser.class) .setId(u1.getId()) .setIncludeSoftDeletes() .findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index 0817a0967..e0a7b1c2a 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -1,7 +1,7 @@ package org.tests.model.inheritexposedtype.test; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.inheritexposedtype.IXPhoto; import org.junit.jupiter.api.Test; @@ -12,14 +12,14 @@ public class TestInheritExposeDtype extends BaseTestCase { IXPhoto p = new IXPhoto(); p.setName("the name"); - Ebean.save(p); + DB.save(p); // update p.setName("new name"); - Ebean.save(p); + DB.save(p); // delete - Ebean.delete(p); + DB.delete(p); } } diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index f03fc7626..181d9af22 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; @@ -19,9 +19,9 @@ public class TestMediaInheritanceJoinToMany extends BaseTestCase { MProfile profileWithNoPic = new MProfile(); profileWithNoPic.setName(name); - Ebean.save(profileWithNoPic); + DB.save(profileWithNoPic); - Query query = Ebean.find(MProfile.class).fetch("picture").where().eq("name", name).query(); + Query query = DB.find(MProfile.class).fetch("picture").where().eq("name", name).query(); // assert we get the profile with a null picture MProfile profile = query.findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index 2a475f40b..6c1f8ea58 100644 --- a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -1,7 +1,7 @@ package org.tests.model.lazywithid; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,9 +14,9 @@ public class TestColumnIdName extends BaseTestCase { Tune tune = new Tune(); tune.getLoonies().add(new Looney("Taz")); - Ebean.save(tune); + DB.save(tune); - final List fetchedCollection = Ebean.find(Tune.class).findList(); + final List fetchedCollection = DB.find(Tune.class).findList(); assertThat(fetchedCollection).hasSize(1); assertThat(fetchedCollection.get(0).getLoonies()).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java index 5c5b8a840..beb7566e4 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestM2MDoubleInsert { @@ -18,6 +18,6 @@ public class TestM2MDoubleInsert { DRot rot = new DRot("rot"); rot.getCroles().add(role); - Ebean.save(rot); + DB.save(rot); } } diff --git a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index bc074d9be..269e9dd57 100644 --- a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java +++ b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -1,7 +1,7 @@ package org.tests.model.m2o; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; @@ -28,7 +28,7 @@ public class TestManyToOneAsOne extends BaseTestCase { Addr junk = new Addr(); junk.setName("junk"); - Ebean.save(junk); + DB.save(junk); Empl emp = new Empl(); emp.setName("My Name"); @@ -37,17 +37,17 @@ public class TestManyToOneAsOne extends BaseTestCase { address.setName("home"); emp.getAddresses().add(address); - // if I do an interim Ebean.save here it works - //Ebean.save(emp); + // if I do an interim DB.save here it works + //DB.save(emp); address.setEmployee(emp); emp.setDefaultAddress(address); - Ebean.save(emp); + DB.save(emp); assertThat(emp.getDefaultAddress().getId()).isNotNull(); assertThat(address.getEmployee().getId()).isNotNull(); - Empl foundEmpl = Ebean.find(Empl.class, emp.getId()); + Empl foundEmpl = DB.find(Empl.class, emp.getId()); assertThat(foundEmpl.getDefaultAddress().getId()).isEqualTo(address.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java index 9f80ac280..1ac972597 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -2,7 +2,7 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.BeforeEach; @@ -29,24 +29,24 @@ public class Test2NoFk extends BaseTestCase { EUserNoFk root = new EUserNoFk(); root.setUserId(1); root.setUserName("root"); - Ebean.save(root); + DB.save(root); EUserNoFk nobody = new EUserNoFk(); nobody.setUserId(2); nobody.setUserName("nobody"); - Ebean.save(nobody); + DB.save(nobody); // Now build the same with the softDel flag. EUserNoFkSoftDel rootSoftDel = new EUserNoFkSoftDel(); rootSoftDel.setUserId(1); rootSoftDel.setUserName("root"); - Ebean.save(rootSoftDel); + DB.save(rootSoftDel); EUserNoFkSoftDel nobodySoftDel = new EUserNoFkSoftDel(); nobodySoftDel.setUserId(2); nobodySoftDel.setUserName("nobody"); - Ebean.save(nobodySoftDel); + DB.save(nobodySoftDel); EFile2NoFk bash = new EFile2NoFk(); @@ -58,7 +58,7 @@ public class Test2NoFk extends BaseTestCase { user501.setUserId(501); user501SoftDel.setUserId(501); - Ebean.save(bash); + DB.save(bash); // create relation to non existent user EFile2NoFk cmd = new EFile2NoFk(); @@ -66,11 +66,11 @@ public class Test2NoFk extends BaseTestCase { cmd.setFileName("java"); cmd.setOwnerId(500); - Ebean.save(cmd); + DB.save(cmd); - assertThat(Ebean.find(EFile2NoFk.class).findCount()).isEqualTo(2); - assertThat(Ebean.find(EUserNoFk.class).findCount()).isEqualTo(2); - assertThat(Ebean.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2); + assertThat(DB.find(EFile2NoFk.class).findCount()).isEqualTo(2); + assertThat(DB.find(EUserNoFk.class).findCount()).isEqualTo(2); + assertThat(DB.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2); // We should have this data in the database: // @@ -88,7 +88,7 @@ public class Test2NoFk extends BaseTestCase { @Test public void testLazyLoadFile() { - List files = Ebean.find(EFile2NoFk.class).findList(); + List files = DB.find(EFile2NoFk.class).findList(); assertThat(files).hasSize(2); EFile2NoFk file1 = files.get(0); @@ -125,7 +125,7 @@ public class Test2NoFk extends BaseTestCase { @Test public void testEagerLoadFile() { - List files = Ebean.find(EFile2NoFk.class).fetch("owner").findList(); + List files = DB.find(EFile2NoFk.class).fetch("owner").findList(); assertThat(files).hasSize(2); EFile2NoFk file1 = files.get(0); @@ -158,7 +158,7 @@ public class Test2NoFk extends BaseTestCase { @Test public void testLazyLoadFileSoftDel() { - List files = Ebean.find(EFile2NoFk.class).findList(); + List files = DB.find(EFile2NoFk.class).findList(); assertThat(files).hasSize(2); EFile2NoFk file1 = files.get(0); @@ -195,7 +195,7 @@ public class Test2NoFk extends BaseTestCase { @Test public void testEagerLoadFileSoftDel() { - List files = Ebean.find(EFile2NoFk.class).fetch("ownerSoftDel").findList(); + List files = DB.find(EFile2NoFk.class).fetch("ownerSoftDel").findList(); assertThat(files).hasSize(2); EFile2NoFk file1 = files.get(0); diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java index e7d352d32..767a5b86f 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -2,7 +2,7 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; @@ -23,9 +23,9 @@ public class TestNoFk extends BaseTestCase { @BeforeEach public void setup() { // Reset t - Ebean.find(EFileNoFk.class).delete(); - Ebean.find(EUserNoFk.class).delete(); - Ebean.find(EUserNoFkSoftDel.class).delete(); + DB.find(EFileNoFk.class).delete(); + DB.find(EUserNoFk.class).delete(); + DB.find(EUserNoFkSoftDel.class).delete(); DB.sqlUpdate("delete from efile_no_fk_euser_no_fk").execute(); String tabName = isOracle() ? "efile_no_fk_euser_no_fk_soft_d" : "efile_no_fk_euser_no_fk_soft_del"; @@ -35,24 +35,24 @@ public class TestNoFk extends BaseTestCase { EUserNoFk root = new EUserNoFk(); root.setUserId(1); root.setUserName("root"); - Ebean.save(root); + DB.save(root); EUserNoFk nobody = new EUserNoFk(); nobody.setUserId(2); nobody.setUserName("nobody"); - Ebean.save(nobody); + DB.save(nobody); // Now build the same with the softDel flag. EUserNoFkSoftDel rootSoftDel = new EUserNoFkSoftDel(); rootSoftDel.setUserId(1); rootSoftDel.setUserName("root"); - Ebean.save(rootSoftDel); + DB.save(rootSoftDel); EUserNoFkSoftDel nobodySoftDel = new EUserNoFkSoftDel(); nobodySoftDel.setUserId(2); nobodySoftDel.setUserName("nobody"); - Ebean.save(nobodySoftDel); + DB.save(nobodySoftDel); EFileNoFk bash = new EFileNoFk(); @@ -71,7 +71,7 @@ public class TestNoFk extends BaseTestCase { bash.getEditorsSoftDel().add(nobodySoftDel); bash.getEditorsSoftDel().add(user501SoftDel); - Ebean.save(bash); + DB.save(bash); // create relation to non existent user EFileNoFk cmd = new EFileNoFk(); @@ -87,12 +87,12 @@ public class TestNoFk extends BaseTestCase { user500SoftDel.setUserName("not persisted"); cmd.setOwnerSoftDel(user500SoftDel); - Ebean.save(cmd); + DB.save(cmd); - assertThat(Ebean.find(EFileNoFk.class).findCount()).isEqualTo(2); - assertThat(Ebean.find(EUserNoFk.class).findCount()).isEqualTo(2); - assertThat(Ebean.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2); + assertThat(DB.find(EFileNoFk.class).findCount()).isEqualTo(2); + assertThat(DB.find(EUserNoFk.class).findCount()).isEqualTo(2); + assertThat(DB.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2); SqlRow row = DB.sqlQuery("select count(*) as cnt from efile_no_fk_euser_no_fk").findOne(); assertThat(row.getInteger("cnt")).isEqualTo(3); @@ -112,7 +112,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testLazyLoadFile() { - List files = Ebean.find(EFileNoFk.class).findList(); + List files = DB.find(EFileNoFk.class).findList(); assertThat(files).hasSize(2); EFileNoFk file1 = files.get(0); @@ -148,7 +148,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testEagerLoadFile() { - List files = Ebean.find(EFileNoFk.class).fetch("owner").findList(); + List files = DB.find(EFileNoFk.class).fetch("owner").findList(); assertThat(files).hasSize(2); EFileNoFk file1 = files.get(0); @@ -181,7 +181,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testLazyLoadOwner() { - List owners = Ebean.find(EUserNoFk.class).findList(); + List owners = DB.find(EUserNoFk.class).findList(); assertThat(owners).hasSize(2); EUserNoFk owner1 = owners.get(0); @@ -201,7 +201,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testEagerLoadOwner() { - List owners = Ebean.find(EUserNoFk.class) + List owners = DB.find(EUserNoFk.class) .fetch("files") .findList(); assertThat(owners).hasSize(2); @@ -223,7 +223,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testLazyLoadFileSoftDel() { - List files = Ebean.find(EFileNoFk.class).findList(); + List files = DB.find(EFileNoFk.class).findList(); assertThat(files).hasSize(2); EFileNoFk file1 = files.get(0); @@ -260,7 +260,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testEagerLoadFileSoftDel() { - List files = Ebean.find(EFileNoFk.class).fetch("ownerSoftDel").findList(); + List files = DB.find(EFileNoFk.class).fetch("ownerSoftDel").findList(); assertThat(files).hasSize(2); EFileNoFk file1 = files.get(0); @@ -292,7 +292,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testLazyLoadOwnerSoftDel() { - List owners = Ebean.find(EUserNoFkSoftDel.class).findList(); + List owners = DB.find(EUserNoFkSoftDel.class).findList(); assertThat(owners).hasSize(2); EUserNoFkSoftDel owner1 = owners.get(0); @@ -312,7 +312,7 @@ public class TestNoFk extends BaseTestCase { @Test public void testEagerLoadOwnerSoftDel() { - List owners = Ebean.find(EUserNoFkSoftDel.class) + List owners = DB.find(EUserNoFkSoftDel.class) .fetch("files") .findList(); assertThat(owners).hasSize(2); @@ -337,11 +337,11 @@ public class TestNoFk extends BaseTestCase { @Disabled("this would be a bonus task :)") public void testLazyLoadUser500() { // user 500 does not exist in DB - EUserNoFk owner = Ebean.find(EUserNoFk.class, 500); + EUserNoFk owner = DB.find(EUserNoFk.class, 500); assertThat(owner).isNull(); // but there are files that are owned by #500 - owner = Ebean.getReference(EUserNoFk.class, 500); + owner = DB.reference(EUserNoFk.class, 500); assertThat(owner.getUserId()).isEqualTo(500); // this does not work yet, because the executed select contains a join: // select t0.user_id, t1.file_name, t1.owner_user_id @@ -362,7 +362,7 @@ public class TestNoFk extends BaseTestCase { @Test @Disabled("Bonus Task 2") public void testM2mLazyLoadFile() { - List files = Ebean.find(EFileNoFk.class).findList(); + List files = DB.find(EFileNoFk.class).findList(); assertThat(files).hasSize(2); EFileNoFk file1 = files.get(0); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index b39351ca8..5bc9e5bc7 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -21,11 +21,11 @@ public class TestOneToOneCascadeSave extends BaseTestCase { // object if it is currently null so you don't need to do the extra // o.setCustomer(c); - Ebean.save(master); + DB.save(master); assertNotNull(child.getId()); - OtoChild child2 = Ebean.find(OtoChild.class, child.getId()); + OtoChild child2 = DB.find(OtoChild.class, child.getId()); OtoMaster master2 = child2.getMaster(); assertNotNull(master2); } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 32a39cdbf..8a7b6702f 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -23,9 +23,9 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { master.setName("m2"); master.setChild(child); - Ebean.save(master); + DB.save(master); - Query query = Ebean.find(OtoBMaster.class) + Query query = DB.find(OtoBMaster.class) //.select("name") .where().idEq(master.getId()) .query(); @@ -53,12 +53,12 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { @Test public void native_with_o2oAndImportedPrimaryKey() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.find(OtoBMaster.class).delete(); OtoBMaster one = new OtoBMaster(); one.setName("hello"); - Ebean.save(one); + DB.save(one); OtoBMaster m = server.findNative(OtoBMaster.class, "select * from oto_bmaster").findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 866568799..70db66096 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestOneToOneJoinColumn extends BaseTestCase { @@ -14,7 +14,7 @@ public class TestOneToOneJoinColumn extends BaseTestCase { company.setCorpId("corp_id_1000000"); msg.setCompany(company); - Ebean.save(msg); - Ebean.find(ORoadShowMsg.class, msg.getId()); + DB.save(msg); + DB.find(ORoadShowMsg.class, msg.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java index 46f7bf476..9876b6737 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestOneToOneManyDelete { @@ -24,9 +24,9 @@ public class TestOneToOneManyDelete { top.getManies().add(many); } - Ebean.save(top); + DB.save(top); - Ebean.delete(top); + DB.delete(top); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 6cb1040de..9d96c4ace 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -23,7 +23,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { OtoCustAddress address = new OtoCustAddress("line1", "line2"); jack.setAddress(address); - Ebean.save(jack); + DB.save(jack); // set new address OtoCustAddress address2 = new OtoCustAddress("other1", "other2"); @@ -31,7 +31,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { // Fail do to uniqueness constraint LoggedSqlCollector.start(); - Ebean.save(jack); + DB.save(jack); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(5); @@ -42,7 +42,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { assertThat(sql.get(4)).contains("-- bind("); jack.setAddress(null); - Ebean.save(jack); + DB.save(jack); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(3); @@ -50,7 +50,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { assertSqlBind(sql.get(1)); assertSql(sql.get(2)).contains("update oto_cust set version=? where cid=? and version=?"); - OtoCustAddress foundAddress = Ebean.find(OtoCustAddress.class, address2.getAid()); + OtoCustAddress foundAddress = DB.find(OtoCustAddress.class, address2.getAid()); assertThat(foundAddress).isNull(); } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 17655b945..78f35ec05 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -15,14 +15,14 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { public void test_updateInsert() { OtoAtwo b = new OtoAtwo("b1", "b test"); - Ebean.save(b); + DB.save(b); OtoAone a = new OtoAone("a1", "a test"); b.setAone(a); LoggedSqlCollector.start(); - Ebean.save(b); + DB.save(b); List update = LoggedSqlCollector.current(); assertThat(update).hasSize(3); @@ -30,7 +30,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { assertSqlBind(update.get(1)); assertThat(update.get(2)).contains("update oto_atwo set aone_id=? where id=?"); - Ebean.delete(b); + DB.delete(b); List deletes = LoggedSqlCollector.stop(); assertThat(deletes).hasSize(2); @@ -48,7 +48,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.save(b); + DB.save(b); List inserts = LoggedSqlCollector.current(); assertThat(inserts).hasSize(3); @@ -56,7 +56,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { assertSqlBind(inserts.get(1)); assertThat(inserts.get(2)).contains("insert into oto_atwo"); - Ebean.delete(b); + DB.delete(b); List deletes = LoggedSqlCollector.stop(); assertThat(deletes).hasSize(2); @@ -68,18 +68,18 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { public void test_remove() { OtoAtwo b = new OtoAtwo("b3", "b test"); - Ebean.save(b); + DB.save(b); OtoAone a = new OtoAone("a3", "a test"); b.setAone(a); - Ebean.save(b); + DB.save(b); LoggedSqlCollector.start(); OtoAone a2 = new OtoAone("a4", "a test"); b.setAone(a2); - Ebean.save(b); + DB.save(b); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(5); @@ -89,7 +89,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { assertThat(sql.get(3)).contains("delete from oto_aone where id=?"); assertSqlBind(sql.get(4)); - Ebean.delete(b); + DB.delete(b); List deletes = LoggedSqlCollector.stop(); assertThat(deletes).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index a2fb61c7f..3ca354606 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { OtoPrime prime = new OtoPrime("p" + desc); OtoPrimeExtra extra = new OtoPrimeExtra("e" + desc); prime.setExtra(extra); - Ebean.save(prime); + DB.save(prime); return prime; } @@ -29,7 +29,7 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values"); - Query query = Ebean.find(OtoPrime.class).setId(p1.getPid()); + Query query = DB.find(OtoPrime.class).setId(p1.getPid()); OtoPrime found = query.findOne(); @@ -39,7 +39,7 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { assertThat(found.getName()).isEqualTo("p" + desc); - Query queryWithFetch = Ebean.find(OtoPrime.class) + Query queryWithFetch = DB.find(OtoPrime.class) .setId(p1.getPid()) .fetch("extra"); @@ -60,20 +60,20 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { OtoPrimeExtra extra = oneWith.getExtra(); extra.setExtra("modified"); - Ebean.save(oneWith); + DB.save(oneWith); extra.setExtra("mod2"); oneWith.setName("mod2"); - Ebean.save(oneWith); + DB.save(oneWith); } private void thenDelete(OtoPrime found) { - OtoPrime bean = Ebean.find(OtoPrime.class, found.getPid()); + OtoPrime bean = DB.find(OtoPrime.class, found.getPid()); LoggedSqlCollector.start(); - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index e7958eb79..770f671d4 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { OtoUBPrime prime = new OtoUBPrime("u" + desc); OtoUBPrimeExtra extra = new OtoUBPrimeExtra("v" + desc); prime.setExtra(extra); - Ebean.save(prime); + DB.save(prime); return prime; } @@ -28,7 +28,7 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values"); - Query query = Ebean.find(OtoUBPrime.class).setId(p1.getPid()); + Query query = DB.find(OtoUBPrime.class).setId(p1.getPid()); OtoUBPrime found = query.findOne(); @@ -38,7 +38,7 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { assertThat(found.getName()).isEqualTo("u" + desc); - Query queryWithFetch = Ebean.find(OtoUBPrime.class) + Query queryWithFetch = DB.find(OtoUBPrime.class) .setId(p1.getPid()) .fetch("extra"); @@ -59,20 +59,20 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { OtoUBPrimeExtra extra = oneWith.getExtra(); extra.setExtra("modified"); - Ebean.save(oneWith); + DB.save(oneWith); extra.setExtra("mod2"); oneWith.setName("mod2"); - Ebean.save(oneWith); + DB.save(oneWith); } private void thenDelete(OtoUBPrime found) { - OtoUBPrime bean = Ebean.find(OtoUBPrime.class, found.getPid()); + OtoUBPrime bean = DB.find(OtoUBPrime.class, found.getPid()); LoggedSqlCollector.start(); - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index fa5c5ee1d..9e80ba467 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { OtoUPrime prime = new OtoUPrime("u" + desc); OtoUPrimeExtra extra = new OtoUPrimeExtra("v" + desc); prime.setExtra(extra); - Ebean.save(prime); + DB.save(prime); return prime; } @@ -26,9 +26,9 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { String desc = "" + System.currentTimeMillis(); OtoUPrime p1 = new OtoUPrime("u" + desc); - Ebean.save(p1); + DB.save(p1); - Query query = Ebean.find(OtoUPrime.class) + Query query = DB.find(OtoUPrime.class) .setId(p1.getPid()) .fetch("extra", "eid"); @@ -49,7 +49,7 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values"); - Query query = Ebean.find(OtoUPrime.class).setId(p1.getPid()); + Query query = DB.find(OtoUPrime.class).setId(p1.getPid()); OtoUPrime found = query.findOne(); @@ -59,7 +59,7 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { assertThat(found.getName()).isEqualTo("u" + desc); - Query queryWithFetch = Ebean.find(OtoUPrime.class) + Query queryWithFetch = DB.find(OtoUPrime.class) .setId(p1.getPid()) .fetch("extra"); @@ -81,21 +81,21 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { OtoUPrimeExtra extra = oneWith.getExtra(); extra.setExtra("modified"); - Ebean.save(oneWith); + DB.save(oneWith); extra.setExtra("mod2"); oneWith.setName("mod2"); - Ebean.save(oneWith); + DB.save(oneWith); } private void thenDelete(OtoUPrime found) { - OtoUPrime bean = Ebean.find(OtoUPrime.class, found.getPid()); + OtoUPrime bean = DB.find(OtoUPrime.class, found.getPid()); LoggedSqlCollector.start(); - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java index 4497dc27e..d19da3abc 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -16,12 +16,12 @@ public class TestOneToOneSoftDeleteChild extends BaseTestCase { OtoSdMaster master = new OtoSdMaster("m1"); master.setChild(child); - Ebean.save(master); + DB.save(master); verifyBeforeDelete(master, child); - Ebean.delete(child); + DB.delete(child); verifyAfterDelete(master, child); } diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index c40131fa4..c7c63156d 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -1,7 +1,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -18,17 +18,17 @@ public class TestOrphanRemoveO2M extends BaseTestCase { master.getDetails().add(new OrpDetail("d1", "d1")); master.getDetails().add(new OrpDetail("d2", "d2")); - Ebean.save(master); + DB.save(master); master.getDetails().clear(); LoggedSqlCollector.start(); - Ebean.save(master); + DB.save(master); List sql = LoggedSqlCollector.stop(); - assertThat(Ebean.find(OrpDetail.class, "d1")).isNull(); - assertThat(Ebean.find(OrpDetail.class, "d2")).isNull(); + assertThat(DB.find(OrpDetail.class, "d1")).isNull(); + assertThat(DB.find(OrpDetail.class, "d2")).isNull(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from orp_detail where id=?"); @@ -43,16 +43,16 @@ public class TestOrphanRemoveO2M extends BaseTestCase { m0.getDetails().add(new OrpDetail("d21", "d1")); m0.getDetails().add(new OrpDetail("d22", "d2")); - Ebean.save(m0); + DB.save(m0); - OrpMaster m1 = Ebean.find(OrpMaster.class, "m2"); + OrpMaster m1 = DB.find(OrpMaster.class, "m2"); m1.getDetails().size(); m1.getDetails().clear(); m1.getDetails().add(new OrpDetail("d23", "d3")); - Ebean.save(m1); + DB.save(m1); - m1 = Ebean.find(OrpMaster.class, "m2"); + m1 = DB.find(OrpMaster.class, "m2"); // Expect only one. assertThat(m1.getDetails()).hasSize(1); assertThat(m1.getDetails()).extracting("id").containsExactly("d23"); @@ -60,14 +60,14 @@ public class TestOrphanRemoveO2M extends BaseTestCase { m1.getDetails().clear(); m1.getDetails().add(new OrpDetail("d24", "d4")); m1.getDetails().add(new OrpDetail("d25", "d5")); - Ebean.save(m1); + DB.save(m1); - m1 = Ebean.find(OrpMaster.class, "m2"); + m1 = DB.find(OrpMaster.class, "m2"); assertThat(m1.getDetails()).hasSize(2); assertThat(m1.getDetails()).extracting("id").contains("d24", "d25"); - m1 = Ebean.find(OrpMaster.class) + m1 = DB.find(OrpMaster.class) .setId("m2") .setUseCache(false) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java index cdfe68995..cce4380c9 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java @@ -1,7 +1,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -16,16 +16,16 @@ public class TestOrphanRemoveO2MFlat extends BaseTestCase { m0.getDetails().add(new OrpDetail2("d21", "d1", "m2")); m0.getDetails().add(new OrpDetail2("d22", "d2", "m2")); - Ebean.save(m0); + DB.save(m0); - OrpMaster2 m1 = Ebean.find(OrpMaster2.class, "m2"); + OrpMaster2 m1 = DB.find(OrpMaster2.class, "m2"); m1.getDetails().size(); m1.getDetails().clear(); m1.getDetails().add(new OrpDetail2("d23", "d3", "m2")); - Ebean.save(m1); + DB.save(m1); - m1 = Ebean.find(OrpMaster2.class, "m2"); + m1 = DB.find(OrpMaster2.class, "m2"); // Expect only one. assertThat(m1.getDetails()).hasSize(1); assertThat(m1.getDetails()).extracting("id").contains("d23"); @@ -33,14 +33,14 @@ public class TestOrphanRemoveO2MFlat extends BaseTestCase { m1.getDetails().clear(); m1.getDetails().add(new OrpDetail2("d24", "d4", "m2")); m1.getDetails().add(new OrpDetail2("d25", "d5", "m2")); - Ebean.save(m1); + DB.save(m1); - m1 = Ebean.find(OrpMaster2.class, "m2"); + m1 = DB.find(OrpMaster2.class, "m2"); assertThat(m1.getDetails()).hasSize(2); assertThat(m1.getDetails()).extracting("id").contains("d24", "d25"); - m1 = Ebean.find(OrpMaster2.class) + m1 = DB.find(OrpMaster2.class) .setId("m2") .setUseCache(false) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index d44184b16..692f79f44 100644 --- a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -1,7 +1,7 @@ package org.tests.model.prnt; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestPrinterStateIssue extends BaseTestCase { @@ -11,42 +11,42 @@ public class TestPrinterStateIssue extends BaseTestCase { MSomeOther other = new MSomeOther(); other.setName("otherRefBean"); - Ebean.save(other); + DB.save(other); MPrinter printer = new MPrinter(); printer.setDataWarehouseId(other); printer.setName("foo"); printer.setAllFlags(20L); - Ebean.save(printer); + DB.save(printer); MPrinterState state = new MPrinterState(); state.setDataWarehouseId(other); state.setFlags(10L); state.setPrinter(printer); - Ebean.save(state); + DB.save(state); MPrinterState cyanState = new MPrinterState(); cyanState.setDataWarehouseId(other); cyanState.setFlags(10L); cyanState.setPrinter(printer); - Ebean.save(state); + DB.save(state); printer.setCurrentState(state); printer.setLastTonerSwapCyan(cyanState); - Ebean.save(printer); + DB.save(printer); MPrinterState newState = new MPrinterState(); newState.setDataWarehouseId(other); newState.setFlags(10L); - //Ebean.save(newState); + //DB.save(newState); printer.setLastTonerSwapCyan(newState); newState.setPrinter(printer); - Ebean.save(printer); + DB.save(printer); - MPrinter printer1 = Ebean.find(MPrinter.class, printer.getId()); + MPrinter printer1 = DB.find(MPrinter.class, printer.getId()); MPrinterState state1 = printer1.getCurrentState(); state1.setFlags(9L); printer1.setAllFlags(99L); @@ -54,11 +54,11 @@ public class TestPrinterStateIssue extends BaseTestCase { state1.setFlags(7L); -// BeanState beanState = Ebean.getBeanState(printer1); +// BeanState beanState = DB.getBeanState(printer1); // Set changedProps = beanState.getChangedProps(); // System.out.println("changed: "+changedProps); - Ebean.save(printer1); + DB.save(printer1); } } diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java index 541d310ae..7bc0c2c1c 100644 --- a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java @@ -1,7 +1,7 @@ package org.tests.model.pview; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; @@ -14,9 +14,9 @@ public class TestPview extends BaseTestCase { @Test public void test() { - Wview wview = Ebean.getReference(Wview.class, UUID.randomUUID()); + Wview wview = DB.getReference(Wview.class, UUID.randomUUID()); - Query query = Ebean.find(Paggview.class); + Query query = DB.find(Paggview.class); query.select("amount"); query.where().eq("pview.wviews", wview); query.order("pview.value"); diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index f3c803365..e7c3d42e5 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -1,8 +1,8 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; public class TestResourceFileSelfRef extends BaseTestCase { @@ -10,7 +10,7 @@ public class TestResourceFileSelfRef extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); ResourceFile childFile1 = new ResourceFile(); childFile1.setName("childFile1"); diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 2c27bc798..f99d5d6de 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -1,7 +1,7 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestSelfRefExample extends BaseTestCase { public void test() { try { - Ebean.createSqlUpdate("delete from self_ref_example").execute(); + DB.sqlUpdate("delete from self_ref_example").execute(); } catch (PersistenceException e) { logger.debug("TestSelfRefExample skipped - MySql not deleting based on constraints"); return; @@ -32,16 +32,16 @@ public class TestSelfRefExample extends BaseTestCase { SelfRefExample e7 = new SelfRefExample("test3", e3); SelfRefExample e8 = new SelfRefExample("test3", e7); - Ebean.save(e1); - Ebean.save(e2); - Ebean.save(e3); - Ebean.save(e4); - Ebean.save(e5); - Ebean.save(e6); - Ebean.save(e7); - Ebean.save(e8); + DB.save(e1); + DB.save(e2); + DB.save(e3); + DB.save(e4); + DB.save(e5); + DB.save(e6); + DB.save(e7); + DB.save(e8); - Query examples = Ebean.find(SelfRefExample.class).setLazyLoadBatchSize(1); + Query examples = DB.find(SelfRefExample.class).setLazyLoadBatchSize(1); List list = examples.where().eq("name", "test1").order().asc("id").findList(); assertThat(list).hasSize(2); @@ -66,7 +66,7 @@ public class TestSelfRefExample extends BaseTestCase { assertThat(e3Searched.getChildren()).extracting("id").contains(e7.getId()); // If we get all the items, you can see the structure goes down a fair bit further. - Query examples2 = Ebean.createQuery(SelfRefExample.class).order("id asc"); + Query examples2 = DB.createQuery(SelfRefExample.class).order("id asc"); List list2 = examples2.findList(); assertEquals(e1.getId(), list2.get(0).getId()); diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 48134bd4f..de4b88393 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -2,7 +2,7 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,9 +14,9 @@ public class TestTextJsonSelfRef extends BaseTestCase { @Test public void test() { - Ebean.execute(() -> { + DB.execute(() -> { - if (Ebean.find(SelfRefCustomer.class).findCount() == 0) { + if (DB.find(SelfRefCustomer.class).findCount() == 0) { SelfRefCustomer c1 = new SelfRefCustomer(); c1.setName("Foo"); c1.setReferredBy(c1); @@ -29,22 +29,22 @@ public class TestTextJsonSelfRef extends BaseTestCase { c3.setName("baz"); c3.setReferredBy(c1); - Ebean.save(c1); - Ebean.save(c2); - Ebean.save(c3); + DB.save(c1); + DB.save(c2); + DB.save(c3); } }); - List customers = Ebean.find(SelfRefCustomer.class).order("id desc").findList(); + List customers = DB.find(SelfRefCustomer.class).order("id desc").findList(); // Check that there are no 'reference' beans here for (SelfRefCustomer cust : customers) { - BeanState beanState = Ebean.getBeanState(cust); + BeanState beanState = DB.getBeanState(cust); assertFalse(beanState.isReference()); } // JsonWriteOptions options = JsonWriteOptions.parsePath("(id,name,referredBy(id))"); -// String customerContent = Ebean.createJsonContext().toJson(customers);//, false, options); +// String customerContent = DB.json().toJson(customers);//, false, options); // System.out.println("Customers: " + customerContent); // // Assert diff --git a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java index 2fc281e2a..ec3cbba19 100644 --- a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -1,7 +1,7 @@ package org.tests.model.survey; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -38,9 +38,9 @@ public class TestOrderByFetch extends BaseTestCase { questionListGroup2.add(question(2)); group2.setQuestions(questionListGroup2); - Ebean.save(survey); + DB.save(survey); - Survey foundSurvey = Ebean.find(Survey.class) + Survey foundSurvey = DB.find(Survey.class) .setDisableLazyLoading(true) .fetch("categories") .fetch("categories.groups") diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 01bf94513..4b74ceb75 100644 --- a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -1,7 +1,7 @@ package org.tests.model.tevent; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; public class TestAssocOneNullTraverse extends BaseTestCase { @@ -10,9 +10,9 @@ public class TestAssocOneNullTraverse extends BaseTestCase { public void test() { TEvent event = new TEvent("event"); - Ebean.save(event); + DB.save(event); - Ebean.find(TEvent.class) + DB.find(TEvent.class) .fetch("one.logs") .findList(); } @@ -20,7 +20,7 @@ public class TestAssocOneNullTraverse extends BaseTestCase { // @Test // public void testSelectAggregation() { // -// Query query = Ebean.find(TEvent.class) +// Query query = DB.find(TEvent.class) // .select("id, name") // .fetch("one", "count"); // diff --git a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java index efdd41302..b318e643f 100644 --- a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java +++ b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java @@ -1,7 +1,7 @@ package org.tests.model.version; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,17 +39,17 @@ public class TestVersionHierarchyModification extends BaseTestCase { toy22.setName("vToy2.2"); child2.getToys().add(toy22); - Ebean.save(parent); + DB.save(parent); } @AfterEach public void cleanUp() { - Ebean.find(VersionParent.class).delete(); + DB.find(VersionParent.class).delete(); } @Test public void testMoveDown() { - VersionParent parent = Ebean.find(VersionParent.class).findOne(); + VersionParent parent = DB.find(VersionParent.class).findOne(); assertThat(parent).isNotNull(); assertThat(parent.getChildren()).hasSize(2); @@ -66,9 +66,9 @@ public class TestVersionHierarchyModification extends BaseTestCase { toyToMove.setChild(secondChild); secondChild.getToys().add(1, toyToMove); - Ebean.save(parent); + DB.save(parent); - parent = Ebean.find(VersionParent.class).findOne(); + parent = DB.find(VersionParent.class).findOne(); assertThat(parent).isNotNull(); assertThat(parent.getChildren()).hasSize(2); @@ -83,7 +83,7 @@ public class TestVersionHierarchyModification extends BaseTestCase { @Test public void testMoveUp() { - VersionParent parent = Ebean.find(VersionParent.class).findOne(); + VersionParent parent = DB.find(VersionParent.class).findOne(); assertThat(parent).isNotNull(); assertThat(parent.getChildren()).hasSize(2); @@ -100,9 +100,9 @@ public class TestVersionHierarchyModification extends BaseTestCase { toyToMove.setChild(firstChild); firstChild.getToys().add(1, toyToMove); - Ebean.save(parent); + DB.save(parent); - parent = Ebean.find(VersionParent.class).findOne(); + parent = DB.find(VersionParent.class).findOne(); assertThat(parent).isNotNull(); assertThat(parent.getChildren()).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java index 2068496ba..5f91694b1 100644 --- a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java +++ b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -1,7 +1,7 @@ package org.tests.model.view; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -19,7 +19,7 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EOrderAgg.class) + Query query = DB.find(EOrderAgg.class) .where().gt("orderTotal", 20) .query(); @@ -34,7 +34,7 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EOrderAgg.class) + Query query = DB.find(EOrderAgg.class) //.fetch("order", "id") .where().gt("orderTotal", 20) .query(); @@ -52,7 +52,7 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EOrderAgg.class) + Query query = DB.find(EOrderAgg.class) .fetch("order") .fetch("order.details") .where().gt("orderTotal", 20) diff --git a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java index 7c71c20d3..71a87432b 100644 --- a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java +++ b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java @@ -1,7 +1,7 @@ package org.tests.model.zero; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,12 +21,12 @@ public class TestWithZero extends BaseTestCase { WithZeroParent parent = new WithZeroParent(); parent.getChildren().add(withZero); - Ebean.save(parent); + DB.save(parent); parent.getChildren().add(new WithZero()); //withZero.setName("Foo"); - Ebean.save(parent); + DB.save(parent); } diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index b469d4489..e1cdd2ba8 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -1,7 +1,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.dbplatform.IdType; import org.ebeantest.LoggedSqlCollector; @@ -32,7 +32,7 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.saveAll(Arrays.asList(classA, classB)); + DB.saveAll(Arrays.asList(classA, classB)); List sql = LoggedSqlCollector.current(); @@ -51,8 +51,8 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase { } assertSqlBind(sql, 8, 10); - ClassA dbA = Ebean.find(ClassA.class, 1); - ClassB dbB = Ebean.find(ClassB.class, 2); + ClassA dbA = DB.find(ClassA.class, 1); + ClassB dbB = DB.find(ClassB.class, 2); assertThat(dbA.getMonkeys()).hasSize(2); assertThat(dbB.getMonkeys()).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 607a1a4ed..7578f4f98 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -2,7 +2,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { private JtMonkey m2 = new JtMonkey("Uim3"); private void initialInsert() { - Ebean.saveAll(Arrays.asList(troop, m0, m1, m2)); + DB.saveAll(Arrays.asList(troop, m0, m1, m2)); } @Test @@ -35,7 +35,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { troop.getMonkeys().add(m0); troop.getMonkeys().add(m1); - Ebean.save(troop); + DB.save(troop); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -56,7 +56,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertThat(intersectionRows).isEqualTo(2); LoggedSqlCollector.current(); - JtMonkeyGroup fetchTroop = Ebean.find(JtMonkeyGroup.class) + JtMonkeyGroup fetchTroop = DB.find(JtMonkeyGroup.class) .fetch("monkeys") .where().idEq(troop.getPid()) .findOne(); @@ -68,7 +68,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertSql(sql.get(0)).contains("from mkeygroup t0 left join mkeygroup_monkey t1z_ on t1z_.mkeygroup_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?"); assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version"); - Ebean.delete(troop); + DB.delete(troop); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index 8af0550d8..a95572545 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -1,7 +1,7 @@ package org.tests.o2o; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -18,17 +18,17 @@ public class TestOneToOneSaveWithoutChanges { a.setB(new OtoLevelB("B")); a.getB().setC(new OtoLevelC("C")); - Ebean.save(a); + DB.save(a); - OtoLevelA dbA = Ebean.find(OtoLevelA.class, 1); + OtoLevelA dbA = DB.find(OtoLevelA.class, 1); OtoLevelB dbB = dbA.getB(); OtoLevelC dbC = dbB.getC(); LoggedSqlCollector.start(); - Ebean.save(dbA); - Ebean.save(dbB); - Ebean.save(dbC); + DB.save(dbA); + DB.save(dbB); + DB.save(dbC); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(0); diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java index 84c858b1f..31369ca77 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -1,7 +1,7 @@ package org.tests.o2o; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; import org.tests.update.EPersonOnline; @@ -15,12 +15,12 @@ public class TestReferenceSave { @Test public void test() { - Ebean.getDefaultServer(); + DB.getDefault(); LoggedSqlCollector.start(); - EPersonOnline bean = Ebean.getReference(EPersonOnline.class, 1L); - Ebean.save(bean); + EPersonOnline bean = DB.getReference(EPersonOnline.class, 1L); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); diff --git a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java index 431b7a30c..5926bfbbe 100644 --- a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java @@ -1,6 +1,6 @@ package org.tests.order; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -23,9 +23,9 @@ public class TestOrderColumn extends TransactionalTestCase { master.getChildren().add(child); } - Ebean.save(master); + DB.save(master); - final OrderMaster result = Ebean.find(OrderMaster.class).findOne(); + final OrderMaster result = DB.find(OrderMaster.class).findOne(); assertThat(result.getChildren()).hasSize(5); assertThat(result.getChildren()).extracting(OrderReferencedChild::getName).containsExactly("p0", "p1", "p2", "p3", "p4"); @@ -43,9 +43,9 @@ public class TestOrderColumn extends TransactionalTestCase { master.getChildren().add(child); } - Ebean.save(master); + DB.save(master); - OrderMaster result = Ebean.find(OrderMaster.class).findOne(); + OrderMaster result = DB.find(OrderMaster.class).findOne(); assertThat(result.getChildren()).hasSize(5); assertThat(master.getChildren()).extracting(OrderReferencedChild::getName).containsExactly("p0", "p1", "p2", "p3", "p4"); @@ -53,9 +53,9 @@ public class TestOrderColumn extends TransactionalTestCase { master.getChildren().sort(Comparator.comparing(OrderReferencedChild::getName).reversed()); assertThat(master.getChildren()).extracting(OrderReferencedChild::getName).containsExactly("p4", "p3", "p2", "p1", "p0"); - Ebean.save(master); + DB.save(master); - result = Ebean.find(OrderMaster.class).findOne(); + result = DB.find(OrderMaster.class).findOne(); assertThat(result.getChildren()).hasSize(5); assertThat(result.getChildren()).extracting(OrderReferencedChild::getName).containsExactly("p4", "p3", "p2", "p1", "p0"); @@ -77,9 +77,9 @@ public class TestOrderColumn extends TransactionalTestCase { master.getChildren().add(child); } - Ebean.save(master); + DB.save(master); - final OrderMaster result = Ebean.find(OrderMaster.class).findOne(); + final OrderMaster result = DB.find(OrderMaster.class).findOne(); final List children = result.getChildren(); assertThat(children).hasSize(5); @@ -98,7 +98,7 @@ public class TestOrderColumn extends TransactionalTestCase { children.get(3).getToys().get(2).setTitle("tt32"); LoggedSqlCollector.start(); - Ebean.save(result); + DB.save(result); final List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(3); @@ -123,9 +123,9 @@ public class TestOrderColumn extends TransactionalTestCase { master.getChildren().add(child); } - Ebean.save(master); + DB.save(master); - final OrderMaster result = Ebean.find(OrderMaster.class).findOne(); + final OrderMaster result = DB.find(OrderMaster.class).findOne(); final List children = result.getChildren(); assertThat(children).hasSize(5); @@ -135,7 +135,7 @@ public class TestOrderColumn extends TransactionalTestCase { child.getToys().remove(1); LoggedSqlCollector.start(); - Ebean.save(result); + DB.save(result); final List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(4); diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index c67369022..0a5eaeed9 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -1,8 +1,8 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; @@ -13,7 +13,7 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); server.beginTransaction(); try { diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 9e95b7c5d..ef94d337b 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -2,7 +2,7 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -18,13 +18,13 @@ public class TestPersistenceContextQueryScope extends BaseTestCase { public void test() { EBasicVer bean = new EBasicVer("first"); - Ebean.save(bean); + DB.save(bean); - //Ebean.getServerCacheManager().setCaching(EBasicVer.class, true); + //DB.cacheManager().setCaching(EBasicVer.class, true); - Ebean.beginTransaction(); + DB.beginTransaction(); try { - EBasicVer bean1 = Ebean.find(EBasicVer.class, bean.getId()); + EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId()); // do an update of the name in the DB int rowCount = DB.sqlUpdate("update e_basicver set name=? where id=?") @@ -36,21 +36,21 @@ 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) + EBasicVer bean2 = DB.find(EBasicVer.class) .setId(bean.getId()) .setUseCache(false) // ignore L2 cache .findOne(); // 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) + EBasicVer bean3 = DB.find(EBasicVer.class) .setId(bean.getId()) .setUseCache(false) // ignore L2 cache .setPersistenceContextScope(QUERY) .findOne(); // TRANsACTION scope ... same as bean2 and does not hit the DB - EBasicVer bean5 = Ebean.find(EBasicVer.class) + EBasicVer bean5 = DB.find(EBasicVer.class) .setId(bean.getId()) .setUseCache(false) // ignore L2 cache .setPersistenceContextScope(TRANSACTION) @@ -64,12 +64,12 @@ public class TestPersistenceContextQueryScope extends BaseTestCase { assertSame(bean1, bean5); assertEquals("second", bean3.getName()); - Ebean.delete(bean3); + DB.delete(bean3); - Ebean.commitTransaction(); + DB.commitTransaction(); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } } diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index c93df67bd..f1658ada9 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -1,7 +1,7 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -23,7 +23,7 @@ public class TestPersistenceContextScopeUsingOrders extends BaseTestCase { ResetBasicData.reset(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) // Use QUERY or TRANSACTION scope (just not NONE) .setPersistenceContextScope(QUERY) .fetch("customer", "id, name") diff --git a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 60329b4e3..4bc6e2ad3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .setFirstRow(3) .order().asc("id") .findList(); @@ -43,7 +43,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .setMaxRows(10) .findList(); @@ -63,7 +63,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .setFirstRow(3) .setMaxRows(10) .order().asc("id") @@ -84,7 +84,7 @@ 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) + DB.find(Order.class) .setMaxRows(1) .findList(); @@ -102,7 +102,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); PagedList pagedList = - Ebean.find(Order.class) + DB.find(Order.class) .setMaxRows(10) .findPagedList(); @@ -123,7 +123,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .setFirstRow(10) .setMaxRows(10) .order("id") @@ -146,7 +146,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .order().asc("orderDate") .setMaxRows(10) .findPagedList() @@ -165,7 +165,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Order.class) + DB.find(Order.class) .order().asc("orderDate") .order().desc("id") .setMaxRows(10) diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index ae0839bfd..a2c930ee5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.ObjectGraphNode; import io.ebean.bean.ObjectGraphOrigin; @@ -28,7 +28,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { ResetBasicData.reset(); - Query q = Ebean.find(Order.class) + Query q = DB.find(Order.class) .setAutoTune(true) //.fetch("customer") //.fetch("customer.contacts") @@ -68,7 +68,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { private static void collectUsage() { - Ebean.getDefaultServer().autoTune().collectProfiling(); + DB.getDefault().autoTune().collectProfiling(); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index 6f848175b..2fcf67d61 100644 --- a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { try { for (int i = 0; i < 100; i++) { try { - Query q0 = Ebean.find(Customer.class).where().icontains("namexxx", "Rob") + Query q0 = DB.find(Customer.class).where().icontains("namexxx", "Rob") .query(); q0.findList(); @@ -50,13 +50,13 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { try { for (int i = 0; i < 100; i++) { - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Query q0 = Ebean.find(Customer.class).where().icontains("namexxx", "Rob") + Query q0 = DB.find(Customer.class).where().icontains("namexxx", "Rob") .query(); q0.findList(); - Ebean.commitTransaction(); + DB.commitTransaction(); } catch (Exception e) { if (e.getMessage().contains("Unsuccessfully waited")) { fail("No connections found while only one thread is running. (after " + i + " queries)"); @@ -64,8 +64,8 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { e.printStackTrace(); } } finally { - if (Ebean.currentTransaction().isActive()) { - Ebean.rollbackTransaction(); + if (DB.currentTransaction().isActive()) { + DB.rollbackTransaction(); } } } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 0a33ced29..3c9d43b02 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.MyLobSize; import org.junit.jupiter.api.Test; @@ -21,13 +21,13 @@ public class TestDefaultFetchLazy extends BaseTestCase { m.setMyCount(10); m.setMyLob("A big lob of data"); - Ebean.save(m); + DB.save(m); assertNotNull(m.getId()); - MyLobSize myLobSize = Ebean.find(MyLobSize.class, m.getId()); + MyLobSize myLobSize = DB.find(MyLobSize.class, m.getId()); - BeanState beanState = Ebean.getBeanState(myLobSize); + BeanState beanState = DB.getBeanState(myLobSize); Set loadedProps = beanState.getLoadedProps(); assertNotNull(loadedProps); @@ -39,7 +39,7 @@ public class TestDefaultFetchLazy extends BaseTestCase { assertFalse(loadedProps.contains("myCount")); // the details is also tuned - Query queryMany = Ebean.find(MyLobSize.class).fetch("details")// ,"+query") + Query queryMany = DB.find(MyLobSize.class).fetch("details")// ,"+query") .where().gt("id", 0).query(); queryMany.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java index e290bb817..ec5e64686 100644 --- a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java +++ b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -18,7 +18,7 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); - Query q = Ebean.find(Customer.class).where() + Query q = DB.find(Customer.class).where() .disjunction() .conjunction().startsWith("name", "r").eq("anniversary", onAfter).endJunction() .conjunction().eq("status", Customer.Status.ACTIVE).gt("id", 0).endJunction() @@ -39,7 +39,7 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); - Query q = Ebean.find(Customer.class) + Query q = DB.find(Customer.class) .where() .or() .and() @@ -62,7 +62,7 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); - Query q = Ebean.find(Customer.class) + Query q = DB.find(Customer.class) .where() .not() .gt("id", 1) @@ -83,7 +83,7 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); - Query q = Ebean.find(Customer.class) + Query q = DB.find(Customer.class) .where() .or() .eq("status", Customer.Status.ACTIVE) @@ -105,7 +105,7 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); - Query q = Ebean.find(Customer.class) + Query q = DB.find(Customer.class) .where() .or() .eq("status", Customer.Status.ACTIVE) diff --git a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java index 7bdad3793..a03386c2e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -15,7 +15,7 @@ public class TestFindOneOrEmpty extends BaseTestCase { @Test public void empty() { - Optional willBeEmpty = Ebean.find(Customer.class) + Optional willBeEmpty = DB.find(Customer.class) .setId(Integer.MAX_VALUE) .findOneOrEmpty(); @@ -27,7 +27,7 @@ public class TestFindOneOrEmpty extends BaseTestCase { ResetBasicData.reset(); - Optional customer = Ebean.find(Customer.class) + Optional customer = DB.find(Customer.class) .setId(1) .findOneOrEmpty(); diff --git a/ebean-core/src/test/java/org/tests/query/TestIContains.java b/ebean-core/src/test/java/org/tests/query/TestIContains.java index f100b6cab..346fe17a9 100644 --- a/ebean-core/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-core/src/test/java/org/tests/query/TestIContains.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -20,7 +20,7 @@ public class TestIContains extends BaseTestCase { ResetBasicData.reset(); // case insensitive - Query query = Ebean.find(Customer.class).where().icontains("name", "Rob").query(); + Query query = DB.find(Customer.class).where().icontains("name", "Rob").query(); query.findList(); String generatedSql = query.getGeneratedSql(); @@ -28,21 +28,21 @@ public class TestIContains extends BaseTestCase { assertThat(generatedSql).contains("lower(t0.name)"); // case sensitive - query = Ebean.find(Customer.class).where().contains("name", "Rob").query(); + query = DB.find(Customer.class).where().contains("name", "Rob").query(); query.findList(); generatedSql = query.getGeneratedSql(); assertThat(generatedSql).contains(" t0.name "); - Ebean.find(Customer.class).where().icontains("name", "Rob").findList(); - Ebean.find(Customer.class).where().icontains("name", "Rob").findList(); - Ebean.find(Customer.class).where().icontains("name", "Rob").findList(); + DB.find(Customer.class).where().icontains("name", "Rob").findList(); + DB.find(Customer.class).where().icontains("name", "Rob").findList(); + DB.find(Customer.class).where().icontains("name", "Rob").findList(); String sql = "select id, status, name from o_customer where lower(name) like :name"; RawSql parse = RawSqlBuilder.parse(sql).create(); - Ebean.find(Customer.class).setRawSql(parse).setParameter("name", "Jim").findList(); + DB.find(Customer.class).setRawSql(parse).setParameter("name", "Jim").findList(); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index 868e50c7e..fd73bdbb1 100644 --- a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -16,7 +16,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id, name") .where().eq("orders.details.product.name", "Desk") .query(); @@ -47,7 +47,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id, name") .where().disjunction().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() .query(); @@ -68,7 +68,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id, name") .where().or().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java index 8f3202f34..2991df135 100644 --- a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.EOptOneA; @@ -14,7 +14,7 @@ public class TestJoinOptOneCascade extends BaseTestCase { public void test() { // the left join cascades to the join for c - Query query = Ebean.find(EOptOneA.class).fetch("b").fetch("b.c"); + Query query = DB.find(EOptOneA.class).fetch("b").fetch("b.c"); query.findList(); String sql = query.getGeneratedSql(); @@ -28,7 +28,7 @@ public class TestJoinOptOneCascade extends BaseTestCase { public void test_where() { // the left join cascades to the join for c - Query query = Ebean.find(EOptOneA.class) + Query query = DB.find(EOptOneA.class) .where() .eq("b.c.nameForC", "foo") .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java index 5b571781f..80d7d6c0d 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -21,7 +21,7 @@ public class TestLimitAlterFetchMany extends BaseTestCase { // ... otherwise we wouldn't be able to use the // limit offset clause - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) // this will automatically get converted to a // query join ... due to the maxRows .fetch("contacts").setMaxRows(5).order("id"); diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java index af7200141..e593402f6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .setAutoTune(false) .setFirstRow(0) .setMaxRows(10) diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java index e583e9430..44c8eeb19 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -18,7 +18,7 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class).select("id,status") + Query query = DB.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) @@ -49,7 +49,7 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class).select("id,status") + Query query = DB.find(Customer.class).select("id,status") .fetch("orders") // the where on a 'many' (like orders) requires an // additional join and distinct which is independent @@ -87,7 +87,7 @@ public class TestManyWhereJoin extends BaseTestCase { Long productId = 1L; - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().eq("details.product.id", productId) .order("cretime asc").query(); @@ -118,9 +118,9 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Product product = Ebean.getReference(Product.class, 1L); + Product product = DB.getReference(Product.class, 1L); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) //.fetch("details") .where().eq("details.product", product) .order("cretime asc").query(); @@ -152,9 +152,9 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Product product = Ebean.getReference(Product.class, 1L); + Product product = DB.getReference(Product.class, 1L); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("details") .where().eq("details.product", product) .order("cretime asc").query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java index 54ba80459..3d6eb76cb 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; import org.junit.jupiter.api.Test; @@ -18,40 +18,40 @@ public class TestManyWhereJoinM2M extends BaseTestCase { @Test public void test() { - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { MRole r1 = new MRole(); r1.setRoleName("role1"); - Ebean.save(r1); + DB.save(r1); MRole r2 = new MRole(); r2.setRoleName("role2special"); - Ebean.save(r2); + DB.save(r2); MRole r3 = new MRole(); r3.setRoleName("role3"); - Ebean.save(r3); + DB.save(r3); MUser u0 = new MUser(); u0.setUserName("user0"); u0.addRole(r1); u0.addRole(r2); - Ebean.save(u0); + DB.save(u0); MUser u1 = new MUser(); u1.setUserName("user1"); u1.addRole(r1); - Ebean.save(u1); + DB.save(u1); MUser u2 = new MUser(); u2.setUserName("user2"); - Ebean.save(u2); + DB.save(u2); txn.commit(); } - Query query = Ebean.find(MUser.class).fetch("roles") + Query query = DB.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) @@ -71,7 +71,7 @@ public class TestManyWhereJoinM2M extends BaseTestCase { private void isEmpty() { - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .where().isEmpty("roles") .query(); @@ -83,7 +83,7 @@ public class TestManyWhereJoinM2M extends BaseTestCase { private void isNotEmpty() { - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .select("userName") .where().isNotEmpty("roles") .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index e7426c427..4d10df1be 100644 --- a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -26,7 +26,7 @@ public class TestMyAdHocSqlSelect extends BaseTestCase { .columnMapping("order_id", "order.id") .create(); - Query query = Ebean.find(MyAdHoc.class) + Query query = DB.find(MyAdHoc.class) .setRawSql(rawSql) .where().gt("order_id", 0) .having().gt("detailCount", 0) @@ -49,7 +49,7 @@ public class TestMyAdHocSqlSelect extends BaseTestCase { .columnMapping("detail_count", "detailCount") .create(); - Query query = Ebean.find(MyAdHoc.class) + Query query = DB.find(MyAdHoc.class) .setRawSql(rawSql) .where().gt("order_id", 0) .having().gt("detailCount", 0) diff --git a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 19645684e..139a762c1 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -20,7 +20,7 @@ public class TestOneToManyCorrectGrouping extends BaseTestCase { public void test() { ResetBasicData.reset(); - Query customerQuery = Ebean.find(Customer.class) + Query customerQuery = DB.find(Customer.class) .fetch("orders") .where().le("id", 2) .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java index 4f548b1cc..1b7aa0578 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeantest.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ public class TestOuterJoin extends BaseTestCase { public void testOuterOnNullQuery() throws Exception { LoggedSql.start(); - List list = Ebean.find(Customer.class).where() + List list = DB.find(Customer.class).where() .isNull("orders") .le("id", 4) // ignore others than basicData .findList(); @@ -41,7 +41,7 @@ public class TestOuterJoin extends BaseTestCase { // use OR construct LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .or() .isNull("orders.details.product.name") .isNull("orders") @@ -59,7 +59,7 @@ public class TestOuterJoin extends BaseTestCase { // use AND construct LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .and() .isNull("orders.details.product.name") .isNull("orders") @@ -76,7 +76,7 @@ public class TestOuterJoin extends BaseTestCase { assertThat(list).hasSize(2); LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .isNull("orders.details.product.name") .le("id", 4) // ignore others than basicData .findList(); @@ -93,7 +93,7 @@ public class TestOuterJoin extends BaseTestCase { public void testInnerOnNonNullQuery() throws Exception { LoggedSql.start(); - List list = Ebean.find(Customer.class).where() + List list = DB.find(Customer.class).where() .isNotNull("orders") .le("id", 4) // ignore others than basicData .findList(); @@ -104,7 +104,7 @@ public class TestOuterJoin extends BaseTestCase { // use OR construct LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .or() .isNotNull("orders.details.product.name") .isNotNull("orders") @@ -122,7 +122,7 @@ public class TestOuterJoin extends BaseTestCase { // use AND construct LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .and() .isNotNull("orders.details.product.name") .isNotNull("orders") @@ -138,7 +138,7 @@ public class TestOuterJoin extends BaseTestCase { LoggedSql.start(); - list = Ebean.find(Customer.class).where() + list = DB.find(Customer.class).where() .isNotNull("orders.details.product.name") .le("id", 4) // ignore others than basicData .findList(); @@ -154,7 +154,7 @@ public class TestOuterJoin extends BaseTestCase { LoggedSql.start(); - List orders1 = Ebean.find(Order.class).order("id").findList(); + List orders1 = DB.find(Order.class).order("id").findList(); assertThat(LoggedSql.collect().get(0)) .contains(" join o_customer") // ensure that we do not left join the customer @@ -164,7 +164,7 @@ public class TestOuterJoin extends BaseTestCase { // now fetch "details" bean, which may be optional LoggedSql.start(); - List orders2 = Ebean.find(Order.class) + List orders2 = DB.find(Order.class) .fetch("details", "id").order("id").findList(); assertThat(LoggedSql.collect().get(0)) diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java index 4b4c1b1b0..51c5844f3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; @@ -23,16 +23,16 @@ public class TestQueryBaseTable extends BaseTestCase { LoggedSqlCollector.start(); - Customer one = Ebean.find(Customer.class) + Customer one = DB.find(Customer.class) .setBaseTable("O_CUSTOMER") .where().startsWith("name", "Rob") .findOne(); - Customer two = Ebean.find(Customer.class) + Customer two = DB.find(Customer.class) .where().startsWith("name", "Rob") .findOne(); - Customer three = Ebean.find(Customer.class) + Customer three = DB.find(Customer.class) .setBaseTable("O_CUSTOMER") .where().startsWith("name", "Fiona") .findOne(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index df5c17d04..bec162c9a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -18,14 +18,14 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) .fetchQuery("details") .order().asc("id") .order().desc("details.id").findList(); assertNotNull(list); - List list2 = Ebean.find(Order.class) + List list2 = DB.find(Order.class) .fetchQuery("customer") .fetch("customer.contacts") .order().asc("id") @@ -34,7 +34,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { assertNotNull(list2); - List list3 = Ebean.find(Customer.class) + List list3 = DB.find(Customer.class) .fetch("orders") .filterMany("orders").eq("status", Order.Status.NEW) .order().desc("orders.id") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 90e10f4c6..edc07ee04 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.tests.model.basic.Contact; @@ -24,7 +24,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { ResetBasicData.reset(); // test that join to order.details is not included in the initial query (included in query join) - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setAutoTune(false) .fetch("orders") .fetch("orders.details"); @@ -72,7 +72,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { ResetBasicData.reset(); // test that join to order.details is not included - Query shipQuery = Ebean.find(OrderShipment.class) + Query shipQuery = DB.find(OrderShipment.class) .setAutoTune(false) .fetch("order") .fetch("order.details"); @@ -113,7 +113,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { ResetBasicData.reset(); // test that join to order.details is not included - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setAutoTune(false) .fetch("customer") .fetch("customer.orders"); @@ -144,7 +144,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { ResetBasicData.reset(); // test that join to order.details is not included - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setAutoTune(false) .fetch("customer") .where().ilike("customer.name", "Rob%") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index 10f95d355..683c926c6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Contact; import org.tests.model.basic.ContactNote; import org.tests.model.basic.Customer; @@ -18,7 +18,7 @@ public class TestQueryFetchSkipPath extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) // .setAutoTune(true) .setAutoTune(false).select("status") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 37e2bbf75..1142cf761 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.MUser; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ public class TestQueryFilterManyOnM2M extends BaseTestCase { @Test public void test() { - Ebean.find(MUser.class).fetch("roles").filterMany("roles").ilike("roleName", "Jim%").findList(); + DB.find(MUser.class).fetch("roles").filterMany("roles").ilike("roleName", "Jim%").findList(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index 9db665351..042082dcb 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; import org.tests.model.basic.Customer; @@ -23,7 +23,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .fetchQuery("orders") .where().ilike("name", "Rob%").gt("id", 0) .filterMany("orders").eq("status", Order.Status.NEW) @@ -45,7 +45,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetchQuery("details") .fetch("details.product", "name") .filterMany("details").ilike("product.name", "c%") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 7c3bcead7..e0aee3b11 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -21,8 +21,7 @@ public class TestQueryFilterManySimple extends BaseTestCase { // not really last week :) Date lastWeek = Date.valueOf("2010-01-01"); - List list = Ebean - .find(Customer.class) + List list = DB.find(Customer.class) // .join("orders", new JoinConfig().lazy()) // .join("orders", new JoinConfig().query()) .fetch("orders").fetchQuery("contacts").where().ilike("name", "rob%") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 1b0715e86..2a514f985 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -151,8 +151,8 @@ public class TestQueryFindIterate extends BaseTestCase { LoggedSqlCollector.start(); // make sure we don't hit the L2 cache for order shipments - DB.getServerCacheManager().clear(Order.class); - DB.getServerCacheManager().clear(OrderShipment.class); + DB.cacheManager().clear(Order.class); + DB.cacheManager().clear(OrderShipment.class); DB.find(Order.class) .setLazyLoadBatchSize(10) diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index 195350e39..e1e091f15 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -20,7 +20,7 @@ public class TestQueryFindMapTypedKey extends BaseTestCase { ResetBasicData.reset(); - Map productsBySku = Ebean.find(Product.class) + Map productsBySku = DB.find(Product.class) .setMapKey("sku") .findMap(); @@ -29,7 +29,7 @@ public class TestQueryFindMapTypedKey extends BaseTestCase { Product desk = productsBySku.get("DSK1"); assertNotNull(desk); - Map map = Ebean.find(Customer.class) + Map map = DB.find(Customer.class) .select("id, name") .setMapKey("name") .findMap(); @@ -42,7 +42,7 @@ public class TestQueryFindMapTypedKey extends BaseTestCase { ResetBasicData.reset(); - Map orderMap = Ebean.find(Order.class) + Map orderMap = DB.find(Order.class) .where().eq("status", Order.Status.NEW) .setMapKey("customer.id") .findMap(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java index a4561aa0f..823997ee8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -38,14 +38,14 @@ public class TestQueryFindPagedList extends BaseTestCase { @Test public void test_noMaxRows() { assertThrows(PersistenceException.class, () -> - Ebean.find(Order.class).findPagedList()); + DB.find(Order.class).findPagedList()); } @Test public void test_maxRows_NoCount() { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class) + PagedList pagedList = DB.find(Order.class) .setMaxRows(4) .findPagedList(); @@ -65,7 +65,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class) + PagedList pagedList = DB.find(Order.class) .setMaxRows(3) .findPagedList(); @@ -88,7 +88,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); // fetch less that total orders (page size 3) - PagedList pagedList = Ebean.find(Order.class) + PagedList pagedList = DB.find(Order.class) .setMaxRows(3) .findPagedList(); @@ -102,7 +102,7 @@ public class TestQueryFindPagedList extends BaseTestCase { // fetch less that total orders (page size 3) - PagedList pagedList2 = Ebean.find(Order.class) + PagedList pagedList2 = DB.find(Order.class) .setFirstRow(1) .setMaxRows(3) .order("id") @@ -118,7 +118,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertThat(orders2.size()).isLessThan(totalRowCount); - PagedList pagedList3 = Ebean.find(Order.class) + PagedList pagedList3 = DB.find(Order.class) .setFirstRow(2) .setMaxRows(150) .order("id") @@ -132,7 +132,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertThat(xtoYofZ).isEqualTo("3 to " + totalRowCount + " of " + totalRowCount); assertThat(list3.size()).isEqualTo(totalRowCount - 2); - PagedList pagedList4 = Ebean.find(Order.class) + PagedList pagedList4 = DB.find(Order.class) .setFirstRow(0) .setMaxRows(totalRowCount) .findPagedList(); @@ -141,7 +141,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertFalse(pagedList4.hasPrev()); assertThat(pagedList4.getDisplayXtoYofZ(" to ", " of ")).isEqualTo("1 to " + totalRowCount + " of " + totalRowCount); - PagedList pagedList5 = Ebean.find(Order.class) + PagedList pagedList5 = DB.find(Order.class) .setFirstRow(0) .setMaxRows(totalRowCount - 1) .findPagedList(); @@ -155,7 +155,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class).setMaxRows(4).findPagedList(); + PagedList pagedList = DB.find(Order.class).setMaxRows(4).findPagedList(); LoggedSqlCollector.start(); @@ -172,7 +172,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList(); + PagedList pagedList = DB.find(Order.class).setMaxRows(3).findPagedList(); Future rowCount = pagedList.getFutureCount(); List orders = pagedList.getList(); @@ -194,7 +194,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); // fetch less that total orders (page size 3) - PagedList pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList(); + PagedList pagedList = DB.find(Order.class).setMaxRows(3).findPagedList(); pagedList.loadCount(); List orders = pagedList.getList(); @@ -209,14 +209,14 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList(); + PagedList pagedList = DB.find(Order.class).setMaxRows(3).findPagedList(); LoggedSqlCollector.start(); // kinda not normal but just wrap in a transaction to assert // the background fetch does not occur (which explicitly creates // its own transaction) ... so a bit naughty with the test here - Ebean.beginTransaction(); + DB.beginTransaction(); try { List orders = pagedList.getList(); @@ -237,7 +237,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertEquals(firstTxn, secTxn); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } @@ -247,7 +247,7 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); - PagedList pagedList = Ebean.find(Order.class) + PagedList pagedList = DB.find(Order.class) .alias("b") .where().raw("b.id > 0") .setMaxRows(6) diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java index 02b8063a1..c9b2663f8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Section; @@ -20,29 +20,29 @@ public class TestQueryFindReadOnly extends BaseTestCase { Article a0 = new Article("art1", "auth1"); a0.addSection(s0); - Ebean.save(a0); + DB.save(a0); - Article ar1 = Ebean.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne(); + Article ar1 = DB.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne(); assertNotNull(ar1); - assertTrue(Ebean.getBeanState(ar1).isReadOnly()); + assertTrue(DB.getBeanState(ar1).isReadOnly()); List
    ar1sections = ar1.getSections(); assertEquals(1, ar1sections.size()); Section s2 = ar1sections.get(0); - assertTrue(Ebean.getBeanState(s2).isReadOnly()); + assertTrue(DB.getBeanState(s2).isReadOnly()); - Ebean.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList(); + DB.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList(); - Article ar0 = Ebean.find(Article.class, a0.getId()); + Article ar0 = DB.find(Article.class, a0.getId()); assertNotNull(ar0); - assertFalse(Ebean.getBeanState(ar0).isReadOnly()); + assertFalse(DB.getBeanState(ar0).isReadOnly()); List
    ar0sections = ar0.getSections(); Section s1 = ar0sections.get(0); - assertFalse(Ebean.getBeanState(s1).isReadOnly()); + assertFalse(DB.getBeanState(s1).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java index 3dafbe3c4..7af8308af 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -19,9 +19,9 @@ public class TestQueryInAssocOne extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).where().lt("id", 200).findList(); + List list = DB.find(Customer.class).where().lt("id", 200).findList(); - Query query = Ebean.find(Order.class).where().in("customer", list).query(); + Query query = DB.find(Order.class).where().in("customer", list).query(); query.findList(); String sql = query.getGeneratedSql(); @@ -36,9 +36,9 @@ public class TestQueryInAssocOne extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).where().lt("id", 300).findList(); + List list = DB.find(Customer.class).where().lt("id", 300).findList(); - Query query = Ebean.find(Order.class).where().isIn("customer", list).query(); + Query query = DB.find(Order.class).where().isIn("customer", list).query(); query.findList(); String sql = query.getGeneratedSql(); @@ -53,9 +53,9 @@ public class TestQueryInAssocOne extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).where().lt("id", 200).findList(); + List list = DB.find(Customer.class).where().lt("id", 200).findList(); - Query query = Ebean.find(Order.class).where().notIn("customer", list).query(); + Query query = DB.find(Order.class).where().notIn("customer", list).query(); query.findList(); String sql = query.getGeneratedSql(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 1945c8951..0c75084b6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -17,7 +17,7 @@ public class TestQueryJoinBatchSize extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) .fetch("customer") //.fetch("orders.details", new FetchConfig().query()) //.fetch("orders.shipments", new FetchConfig().query()) @@ -35,7 +35,7 @@ public class TestQueryJoinBatchSize extends BaseTestCase { // // ResetBasicData.reset(); // -// Ebean.find(Customer.class) +// DB.find(Customer.class) // .fetch("orders", new FetchConfig().query(3).lazy(2)) // //.fetch("orders.details", new FetchConfig().query()) // //.fetch("orders.shipments", new FetchConfig().query()) diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 42df03083..6fe7a9771 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -18,7 +18,7 @@ public class TestQueryJoinMulipleMany extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class).fetch("customer").fetch("customer.contacts").where() + List list = DB.find(Order.class).fetch("customer").fetch("customer.contacts").where() .gt("id", 0).findList(); assertNotNull(list); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index 407bf8f72..fb3a03d44 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -19,7 +19,7 @@ public class TestQueryMultiManyOrder extends BaseTestCase { ResetBasicData.reset(); - Query q = Ebean.find(Order.class).fetch("shipments").fetch("details") + Query q = DB.find(Order.class).fetch("shipments").fetch("details") .fetch("details.product").fetch("customer").where().gt("id", 0).query(); List list = q.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java index 97b10c468..7432639a8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -19,25 +19,25 @@ public class TestQueryNullAssocOne extends BaseTestCase { ResetBasicData.reset(); - Query q0 = Ebean.find(Order.class).where().eq("customer", null).query(); + Query q0 = DB.find(Order.class).where().eq("customer", null).query(); List orders = q0.findList(); assertNotNull(orders); assertTrue(q0.getGeneratedSql().contains("where t0.kcustomer_id is null")); - Query q1 = Ebean.find(Order.class).where().eq("customer.id", null).query(); + Query q1 = DB.find(Order.class).where().eq("customer.id", null).query(); List o1 = q1.findList(); assertTrue(o1.size() == orders.size()); assertTrue(q1.getGeneratedSql().contains("where t0.kcustomer_id is null")); - Query q2 = Ebean.find(Order.class).where().isNull("customer").query(); + Query q2 = DB.find(Order.class).where().isNull("customer").query(); List o2 = q2.findList(); assertTrue(o2.size() == orders.size()); assertTrue(q2.getGeneratedSql().contains("where t0.kcustomer_id is null")); - Query q3 = Ebean.find(Order.class).where().isNull("customer").query(); + Query q3 = DB.find(Order.class).where().isNull("customer").query(); List o3 = q3.findList(); assertTrue(o3.size() == orders.size()); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index be27bcc7a..f00a6d282 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestQueryPathJoinAndOrder extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("id,name, status").fetch("contacts") + List list = DB.find(Customer.class).select("id,name, status").fetch("contacts") .order().asc("id").order().desc("contacts.firstName").setMaxRows(3).findList(); assertNotNull(list); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 6ee11db34..2d5187d6f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -19,7 +19,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class).where().eq("status", Order.Status.NEW).ge("id", 1) + Query query = DB.find(Order.class).where().eq("status", Order.Status.NEW).ge("id", 1) .order().desc("id"); int rc0 = query.findCount(); @@ -46,7 +46,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { } // should still hit query plan cache - Query query2 = Ebean.find(Order.class).where().eq("status", Order.Status.NEW) + Query query2 = DB.find(Order.class).where().eq("status", Order.Status.NEW) .ge("id", idGt).order().desc("id"); int rc2 = query2.findCount(); diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 09cb4514f..328cf521a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -18,21 +18,21 @@ public class TestRefToLazyLoadMany extends BaseTestCase { ResetBasicData.reset(); - List custList = Ebean.find(Customer.class).select("id").findList(); + List custList = DB.find(Customer.class).select("id").findList(); Customer c = custList.get(0); List contacts2 = c.getContacts(); - assertEquals(3, Ebean.getBeanState(c).getLoadedProps().size()); + assertEquals(3, DB.getBeanState(c).getLoadedProps().size()); // now lazy load the contacts contacts2.size(); - Customer c2 = Ebean.getReference(Customer.class, c.getId()); + Customer c2 = DB.getReference(Customer.class, c.getId()); // we only "loaded" the contacts BeanList and not all of c2 List contacts = c2.getContacts(); - // Set loadedProps = Ebean.getBeanState(c2).getLoadedProps(); + // Set loadedProps = DB.getBeanState(c2).getLoadedProps(); // assertEquals(1, loadedProps.size()); // now lazy load the contacts diff --git a/ebean-core/src/test/java/org/tests/query/TestRowCount.java b/ebean-core/src/test/java/org/tests/query/TestRowCount.java index c37bcbaf5..0d3f215c8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestRowCount.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -20,7 +20,7 @@ public class TestRowCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("details") .where() .gt("id", 1) @@ -45,7 +45,7 @@ public class TestRowCount extends BaseTestCase { public void find_count_distinct_singleProperty() { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("anniversary") .where().eq("status", Customer.Status.NEW) @@ -62,7 +62,7 @@ public class TestRowCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("anniversary, status"); diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java index e917fdd4d..469d525a1 100644 --- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java @@ -151,10 +151,10 @@ public class TestSubQuery extends BaseTestCase { * * public void testInheritance1() { ResetBasicData.reset(); * - * Query sq = Ebean.createQuery(Vehicle.class) .select("id") + * Query sq = DB.createQuery(Vehicle.class) .select("id") * .setAutoTune(false) .where() .query(); * - * Query pq = Ebean.find(VehicleDriver.class) + * Query pq = DB.find(VehicleDriver.class) * .where().in("vehicle.id", sq) .query(); * * pq.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 89f28425e..a81957b7e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -14,7 +14,7 @@ public class TestThreeLevelQueryJoin extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(Customer.class).fetchQuery("orders") + DB.find(Customer.class).fetchQuery("orders") .fetchQuery("orders.details") .fetchQuery("orders.shipments") .fetchQuery("shippingAddress") diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java index 49f6219b5..8b28bc9e8 100644 --- a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; import io.ebean.annotation.ForPlatform; @@ -29,7 +29,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where() .raw("(status = ? or (orderDate < ? and shipDate is null) or customer.name like ?)", Order.Status.APPROVED, new Timestamp(System.currentTimeMillis()), "Rob") @@ -45,7 +45,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(OrderDetail.class) + DB.find(OrderDetail.class) .where() .not(Expr.eq("id", 1)) .raw("orderQty < shipQty") @@ -75,7 +75,7 @@ public class TestWhereRawClause extends BaseTestCase { List vals = asList("Rob", "Fiona", "Jack"); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("name") .where() .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", vals) @@ -91,7 +91,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("name") .where() .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", null) @@ -107,7 +107,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("name") .where() .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", Collections.emptySet()) @@ -123,7 +123,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where() .raw("name in (?1)", asList("Rob", "Fiona", "Jack")) .query(); @@ -139,7 +139,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .where() .raw("name = any(?)", asList("Rob", "Fiona", "Jack")) .findList(); @@ -155,15 +155,15 @@ public class TestWhereRawClause extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Customer.class) + DB.find(Customer.class) .select("name").where().rawOrEmpty("name = any(?)", asList("Rob", "Fiona", "Jack")) .findList(); - Ebean.find(Customer.class) + DB.find(Customer.class) .select("name").where().rawOrEmpty("name = any(?)", asList()) .findList(); - Ebean.find(Customer.class) + DB.find(Customer.class) .select("name").where().rawOrEmpty("name = any(?)", null) .findList(); @@ -179,7 +179,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(OrderDetail.class) + DB.find(OrderDetail.class) .where() .ne("id", 42) .raw("orderQty < ?", 100) diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 71ce72841..a8508db65 100644 --- a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -1,7 +1,7 @@ package org.tests.query.aggregation; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; @@ -28,24 +28,24 @@ public class TestAggregationCount extends BaseTestCase { one.getLogs().add(new TEventMany("all", 1, 10)); one.getLogs().add(new TEventMany("be", 2, 12.2)); one.getLogs().add(new TEventMany("add", 3, 13)); - Ebean.save(one); + DB.save(one); TEventOne two = new TEventOne("second", TEventOne.Status.AA); two.getLogs().add(new TEventMany("at", 10, 10)); two.getLogs().add(new TEventMany("add", 30, 13)); two.getLogs().add(new TEventMany("alf", 30, 13)); - Ebean.save(two); + DB.save(two); TEventOne three = new TEventOne("thrird", TEventOne.Status.BB); - Ebean.save(three); + DB.save(three); three.setName("third"); - Ebean.save(three); + DB.save(three); } @Test public void testBaseSelect() { - Query query = Ebean.find(TEventOne.class); + Query query = DB.find(TEventOne.class); List list = query.findList(); String sql = sqlOf(query, 5); @@ -67,7 +67,7 @@ public class TestAggregationCount extends BaseTestCase { LoggedSqlCollector.start(); int count = - Ebean.find(TEventOne.class) + DB.find(TEventOne.class) .where().isNotNull("name") .findCount(); @@ -80,7 +80,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testNonAggregationLazyLoading() { - Query query = Ebean.find(TEventOne.class).select("id"); + Query query = DB.find(TEventOne.class).select("id"); List list = query.findList(); String sql = sqlOf(query, 5); @@ -94,7 +94,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void findCount_withHaving() { - Query query = Ebean.find(TEventOne.class) + Query query = DB.find(TEventOne.class) //.select("id, totalUnits") .having() .ge("totalUnits", 1) @@ -111,7 +111,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testFull() { - Query query2 = Ebean.find(TEventOne.class) + Query query2 = DB.find(TEventOne.class) .select("name, count, totalUnits, totalAmount") .where() .startsWith("logs.description", "a") @@ -140,7 +140,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testOrderByTotal() { - Query query = Ebean.find(TEventOne.class) + Query query = DB.find(TEventOne.class) .select("name, count, totalUnits, totalAmount") .order().asc("totalUnits").order().asc("name"); @@ -161,7 +161,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testSelectSome() { - Query query0 = Ebean.find(TEventOne.class) + Query query0 = DB.find(TEventOne.class) .select("name, count, totalUnits"); query0.findList(); @@ -173,7 +173,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testSelectOnly() { - Query query0 = Ebean.find(TEventOne.class) + Query query0 = DB.find(TEventOne.class) .select("name, count, totalUnits, totalAmount"); query0.findList(); @@ -185,7 +185,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testSelectWhere() { - Query query0 = Ebean.find(TEventOne.class) + Query query0 = DB.find(TEventOne.class) .select("name, count, totalUnits, totalAmount") .where().gt("logs.description", "a").query(); @@ -198,7 +198,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testSelectHavingOrderBy() { - Query query1 = Ebean.find(TEventOne.class) + Query query1 = DB.find(TEventOne.class) .select("name, count, totalUnits, totalAmount") .having().ge("count", 1) .order().asc("name"); @@ -210,7 +210,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testSelectWithFetch() { - Query query0 = Ebean.find(TEventOne.class) + Query query0 = DB.find(TEventOne.class) .select("name, count") .fetch("event", "name"); @@ -223,7 +223,7 @@ public class TestAggregationCount extends BaseTestCase { @Test public void testTopLevelAggregation() { - Query query0 = Ebean.find(TEventOne.class) + Query query0 = DB.find(TEventOne.class) .select("status, maxVersion") .where().isNotNull("name") .having().ge("maxVersion", 1) @@ -259,7 +259,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query0 = Ebean.find(Order.class) + Query query0 = DB.find(Order.class) .select("max(updtime)") .where().eq("status", Order.Status.NEW) .query(); @@ -270,7 +270,7 @@ public class TestAggregationCount extends BaseTestCase { String sql = sqlOf(query0, 5); assertThat(sql).contains("select max(t0.updtime) from o_order t0"); - Timestamp maxNotNew = Ebean.find(Order.class) + Timestamp maxNotNew = DB.find(Order.class) .select("max(updtime)") .where().ne("status", Order.Status.NEW) .findSingleAttribute(); @@ -284,7 +284,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(OrderDetail.class) + Query query = DB.find(OrderDetail.class) .select("max(orderQty)"); Integer maxOrderQty = query.findSingleAttribute(); @@ -299,7 +299,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(OrderDetail.class) + Query query = DB.find(OrderDetail.class) .select("min(orderQty)"); Integer minOrderQty = query.findSingleAttribute(); @@ -314,7 +314,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("max(lastName)"); String maxName = query.findSingleAttribute(); @@ -329,7 +329,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("min(firstName)"); String minName = query.findSingleAttribute(); @@ -345,7 +345,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("count(lastName)"); Long count = query.findSingleAttribute(); @@ -360,7 +360,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("count(distinct lastName)"); Long count = query.findSingleAttribute(); @@ -378,7 +378,7 @@ public class TestAggregationCount extends BaseTestCase { LoggedSqlCollector.start(); String maxLastName = - Ebean.find(Contact.class) + DB.find(Contact.class) .select("max(lastName)") .where().isNull("phone") .findSingleAttribute(); @@ -397,7 +397,7 @@ public class TestAggregationCount extends BaseTestCase { LoggedSqlCollector.start(); Long count = - Ebean.find(Contact.class) + DB.find(Contact.class) .select("count(distinct lastName)") .where().isEmpty("notes") .findSingleAttribute(); @@ -417,7 +417,7 @@ public class TestAggregationCount extends BaseTestCase { List names = - Ebean.find(Contact.class) + DB.find(Contact.class) .select(concat("lastName",", ","firstName")) .where().isNull("phone") .order().asc("lastName") @@ -438,7 +438,7 @@ public class TestAggregationCount extends BaseTestCase { List names = - Ebean.find(Contact.class) + DB.find(Contact.class) .select(concat("updtime",", ","firstName")+"::String") .where().isNull("phone") .order().asc("lastName") @@ -459,7 +459,7 @@ public class TestAggregationCount extends BaseTestCase { Instant instant = - Ebean.find(Contact.class) + DB.find(Contact.class) .select("max(updtime)::Instant") .where().isNull("phone") .findSingleAttribute(); @@ -480,7 +480,7 @@ public class TestAggregationCount extends BaseTestCase { List contacts = - Ebean.find(Contact.class) + DB.find(Contact.class) .select("email, " + concat("lastName",", ","firstName") + " as lastName") .where().isNull("phone") .order().asc("lastName") diff --git a/ebean-core/src/test/java/org/tests/query/cache/Main2.java b/ebean-core/src/test/java/org/tests/query/cache/Main2.java index 56a7ee0b1..48d513999 100644 --- a/ebean-core/src/test/java/org/tests/query/cache/Main2.java +++ b/ebean-core/src/test/java/org/tests/query/cache/Main2.java @@ -1,12 +1,12 @@ package org.tests.query.cache; -import io.ebean.Ebean; +import io.ebean.DB; public class Main2 { public static void main(String[] args) { TestDistinct test = new TestDistinct(); - Ebean.find(ContractCosts.class).where() + DB.find(ContractCosts.class).where() .in("position.contract.aclEntries.aclEntry.id",1L, 2L, 3L).findList(); // <-- will fix some cache issue? test.testMissingUnique(); diff --git a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java index b58ea42d6..4dc9702fe 100644 --- a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java @@ -1,7 +1,7 @@ package org.tests.query.cache; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; @@ -18,9 +18,9 @@ public class TestDistinct extends BaseTestCase { @Test public void testMissingUnique() { Acl acl = new Acl("1"); - Ebean.save(acl); + DB.save(acl); Acl acl2 = new Acl("2"); - Ebean.save(acl2); + DB.save(acl2); Contract contract = new Contract(); AclContainerRelation rel1 = new AclContainerRelation(); rel1.setAclEntry(acl); @@ -33,10 +33,10 @@ public class TestDistinct extends BaseTestCase { Position pos = new Position(); pos.setContract(contract); contract.getPositions().add(pos); - Ebean.save(contract); + DB.save(contract); ContractCosts cost = new ContractCosts(); cost.setPosition(pos); - Ebean.save(cost); + DB.save(cost); //costsQuery(acl.getId(), acl2.getId()).findCount(); @@ -50,10 +50,10 @@ public class TestDistinct extends BaseTestCase { } public ExpressionList positionsQuery(final Long aclId) { - return Ebean.find(Position.class).where().eq("contract.aclEntries.aclEntry.id", aclId); + return DB.find(Position.class).where().eq("contract.aclEntries.aclEntry.id", aclId); } public ExpressionList costsQuery(final Long... aclId) { - return Ebean.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId); + return DB.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId); } } diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index fefae450d..9b449cf4d 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -1,7 +1,7 @@ package org.tests.query.embedded; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; @@ -30,7 +30,7 @@ public class TestFilteringByEmbeddedInJoinedTable extends BaseTestCase { eEmbDatePeriod.setDate2(date2); outer1.setDatePeriod(eEmbDatePeriod); - Ebean.save(outer1); + DB.save(outer1); return outer1; } @@ -48,20 +48,20 @@ public class TestFilteringByEmbeddedInJoinedTable extends BaseTestCase { EEmbInner inner1 = new EEmbInner(); inner1.setOuter(outer1); inner1.setNomeInner("inner1-1"); - Ebean.save(inner1); + DB.save(inner1); EEmbInner inner2 = new EEmbInner(); // Setting outer1 also here inner2.setOuter(outer1); inner2.setNomeInner("inner2-1"); - Ebean.save(inner2); + DB.save(inner2); EEmbInner inner3 = new EEmbInner(); inner3.setOuter(outer3); inner3.setNomeInner("inner3-3"); - Ebean.save(inner3); + DB.save(inner3); - ExpressionList el = Ebean.find(EEmbInner.class).where() + ExpressionList el = DB.find(EEmbInner.class).where() .eq("outer.datePeriod.date1", new Date(11111)); List list = el.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 481012c36..6a174e792 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -1,8 +1,8 @@ package org.tests.query.embedded; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; @@ -40,9 +40,9 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { invoice.setBillAddress(bill); // act: save and fetch - Ebean.save(invoice); + DB.save(invoice); - EInvoice invoice2 = Ebean.find(EInvoice.class, invoice.getId()); + EInvoice invoice2 = DB.find(EInvoice.class, invoice.getId()); // assert fetched bean populated as expected assertEquals(invoice.getId(), invoice2.getId()); @@ -54,18 +54,18 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { // act: only update one of the embedded fields invoice2.getBillAddress().setStreet("3 Pineapple St"); // bean should be dirty - Ebean.save(invoice2); + DB.save(invoice2); awaitL2Cache(); - EInvoice invoice3 = Ebean.find(EInvoice.class, invoice.getId()); + EInvoice invoice3 = DB.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) + EInvoice invoicePartial = DB.find(EInvoice.class) .select("state, date") .where().idEq(invoice.getId()) .findOne(); @@ -76,7 +76,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { assertNotNull(billAddress); assertEquals("3 Pineapple St", billAddress.getStreet()); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); ServerCacheManager serverCacheManager = server.cacheManager(); // get cache, clear the cache and statistics @@ -85,7 +85,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { beanCache.statistics(true); // fetch and load the cache - EInvoice invoice4 = Ebean.find(EInvoice.class, invoice.getId()); + EInvoice invoice4 = DB.find(EInvoice.class, invoice.getId()); assertNotNull(invoice4); ServerCacheStatistics statistics = beanCache.statistics(false); @@ -94,7 +94,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { assertEquals(0, statistics.getHitCount()); // fetch out of the cache this time - EInvoice invoice5 = Ebean.find(EInvoice.class, invoice.getId()); + EInvoice invoice5 = DB.find(EInvoice.class, invoice.getId()); assertNotNull(invoice5); statistics = beanCache.statistics(false); diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index aef592d92..840b3b46f 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; import org.junit.jupiter.api.Test; @@ -18,39 +18,39 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { @Test public void test() { - Ebean.beginTransaction(); + DB.beginTransaction(); try { MRole r1 = new MRole(); r1.setRoleName("role1B"); - Ebean.save(r1); + DB.save(r1); MRole r2 = new MRole(); r2.setRoleName("role2specialB"); - Ebean.save(r2); + DB.save(r2); MRole r3 = new MRole(); r3.setRoleName("role3B"); - Ebean.save(r3); + DB.save(r3); MUser u0 = new MUser(); u0.setUserName("user0B"); u0.addRole(r1); u0.addRole(r2); - Ebean.save(u0); + DB.save(u0); MUser u1 = new MUser(); u1.setUserName("user1B"); u1.addRole(r1); - Ebean.save(u1); + DB.save(u1); queryOrExpression(r2.getRoleid()); queryDisjunction(r2.getRoleid()); - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .where().disjunction() .eq("roles.roleName", "role2specialB") // user0 .eq("roles.roleName", "role3B") // nobody @@ -64,13 +64,13 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { assertThat(sql).contains(".role_name = ?"); } finally { - Ebean.rollbackTransaction(); + DB.rollbackTransaction(); } } private void queryDisjunction(Integer roleid) { - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .where().or() .eq("userName", "user0B") .eq("roles.roleid", roleid) @@ -85,9 +85,9 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { @Test public void testSelectOneToOneDisjunction() { - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Query query = Ebean.find(Wheel.class) + Query query = DB.find(Wheel.class) .select("id") .where().or() .ge("tire.id", 100) @@ -97,13 +97,13 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { String sql = sqlOf(query); assertThat(sql).contains("join"); } finally { - Ebean.rollbackTransaction(); + DB.rollbackTransaction(); } } private void queryOrExpression(Integer roleid) { - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .where().or( Expr.eq("userName", "user0B"), Expr.eq("roles.roleid", roleid) diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index 75aac4ac2..c617a1a60 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; @@ -16,8 +16,8 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase { @Test public void test() { - Ebean.deleteAll(Ebean.find(UUTwo.class).select("id").findList()); - Ebean.deleteAll(Ebean.find(UUOne.class).select("id").findList()); + DB.deleteAll(DB.find(UUTwo.class).select("id").findList()); + DB.deleteAll(DB.find(UUOne.class).select("id").findList()); // setup UUOne master1 = new UUOne(); @@ -30,13 +30,13 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase { UUOne master2 = new UUOne(); master2.setName("testDisjOuter_2_name"); - Ebean.save(master1); - Ebean.save(detail1); - Ebean.save(master2); + DB.save(master1); + DB.save(detail1); + DB.save(master2); // Have outer join so that "testDisjOuter_2_name" is found - Query query = Ebean.find(UUOne.class) + Query query = DB.find(UUOne.class) .where().disjunction() .eq("name", "testDisjOuter_2_name") .eq("comments.name", "testDisjOuter_CHILD_1") diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index 1d1b04d00..52750e354 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { LoggedSqlCollector.start(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .select("id, status, orderDate") .where().gt("details.orderQty", 0) .findList(); @@ -40,7 +40,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); - Query q = Ebean.find(Order.class) + Query q = DB.find(Order.class) .fetch("customer") .fetch("customer.contacts") .where().gt("id", 0).query(); @@ -52,7 +52,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(sql.contains("join o_customer t1 on t1.id ")); assertTrue(sql.contains("left join contact t2 on")); - Map ordersById = Ebean.find(Order.class).setMapKey("id").where().gt("id", 0).query().findMap(); + Map ordersById = DB.find(Order.class).setMapKey("id").where().gt("id", 0).query().findMap(); for (Order o: list) { int withoutFetch = ordersById.get(o.getId()).getCustomer().getContacts().size(); int withFetch = o.getCustomer().getContacts().size(); @@ -75,7 +75,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); - Query q = Ebean.find(Order.class) + Query q = DB.find(Order.class) .fetch("details") .fetch("details.product") .fetch("customer") @@ -99,7 +99,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); - Query q = Ebean.find(Order.class) + Query q = DB.find(Order.class) .fetch("customer") .fetch("customer.contacts") .fetchQuery("details") diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index 35af2fcf7..fbf8e8798 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orderIds = Ebean.find(Order.class) + List orderIds = DB.find(Order.class) .where().eq("totalItems", 3) .findIds(); assertThat(orderIds).hasSize(2); @@ -43,7 +43,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .where().eq("totalItems", 3) .findList(); assertThat(orders).hasSize(2); @@ -58,7 +58,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - int orders = Ebean.find(Order.class) + int orders = DB.find(Order.class) .where().eq("totalItems", 3) .findCount(); assertThat(orders).isEqualTo(2); @@ -74,7 +74,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - int orders = Ebean.find(Order.class) + int orders = DB.find(Order.class) .where() .eq("totalItems", 3) .gt("totalAmount", 10) @@ -92,7 +92,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orderDates = Ebean.find(Order.class) + List orderDates = DB.find(Order.class) .select("orderDate") .where().eq("totalItems", 3) .findSingleAttributeList(); @@ -109,7 +109,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Order order = Ebean.find(Order.class) + Order order = DB.find(Order.class) .select("totalItems") .where().eq("totalItems", 3) .setMaxRows(1) @@ -133,7 +133,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - List orderIds = Ebean.find(ParentPerson.class) + List orderIds = DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findIds(); @@ -147,7 +147,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ParentPerson.class) + DB.find(ParentPerson.class) .select("identifier") //.where().eq("totalAge", 3) .where().eq("familyName", "foo") @@ -163,7 +163,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ParentPerson.class) + DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findCount(); @@ -178,7 +178,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ParentPerson.class) + DB.find(ParentPerson.class) .select("address") .where().eq("totalAge", 3) .findSingleAttributeList(); @@ -194,7 +194,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ParentPerson.class) + DB.find(ParentPerson.class) .where().eq("totalAge", 3) .setMaxRows(1) .orderById(true) @@ -210,7 +210,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ChildPerson.class) + DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findIds(); @@ -225,7 +225,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(ChildPerson.class) + DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findCount(); diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index cc104af6b..9ef713127 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -21,7 +21,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { @Test public void test() { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor d = server.getBeanDescriptor(Order.class); ElPropertyValue elGetValue = d.getElGetValue("customer.contacts"); @@ -29,7 +29,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) .fetch("customer") .fetchQuery("customer.contacts", "firstName") .fetch("customer.contacts.group") @@ -47,7 +47,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { // String oq = // "find order join customer join customer.contacts join details (+query(4),+lazy(5))"; - // Query q = Ebean.createQuery(Order.class, oq); + // Query q = DB.createQuery(Order.class, oq); // q.setAutoTune(false); // List list2 = q.findList(); // diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index 9e3e821c1..eaeceb7aa 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -1,7 +1,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().ilike("customer.name", "rob%") .query(); @@ -44,7 +44,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().disjunction().ilike("customer.name", "rob%").gt("id", 1).endJunction() .query(); @@ -70,7 +70,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .fetch("customer") .fetch("customer.contacts") .where().ilike("customer.name", "rob%") diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index 8ff707e98..4a841a1bb 100644 --- a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -1,7 +1,7 @@ package org.tests.query.lazy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.ProfileLocation; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -24,7 +24,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(Order.class) + DB.find(Order.class) .setProfileLocation(loc0) .setLazyLoadBatchSize(2) .findEach(bean -> doStuff(bean)); @@ -35,7 +35,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(Order.class) + DB.find(Order.class) .setProfileLocation(loc1) .fetch("details", "id") .fetch("details.product", "sku") @@ -51,7 +51,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); List orders = - Ebean.find(Order.class) + DB.find(Order.class) .setProfileLocation(loc2) .setLazyLoadBatchSize(2) .findList(); @@ -67,7 +67,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); List orders = - Ebean.find(Order.class) + DB.find(Order.class) .setProfileLocation(loc3) .fetch("details", "id") .fetch("details.product", "sku") @@ -86,7 +86,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) .setLazyLoadBatchSize(100) .findList(); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java index ffe259a6f..3f032cf9d 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.OrderBy; import io.ebean.Query; import org.tests.model.basic.Order; @@ -18,7 +18,7 @@ public class TestOrderByClear extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .order().asc("orderDate"); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index 07c545590..1c223c3ce 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -19,7 +19,7 @@ public class TestOrderByOnComplex extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class).order().desc("customer"); + Query query = DB.find(Order.class).order().desc("customer"); query.findList(); @@ -32,7 +32,7 @@ public class TestOrderByOnComplex extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .order("case when status=3 then 10 when status=2 then 11 else 99 end"); List list = query.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index 44d5083dc..be0852516 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -26,7 +26,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where() .eq("junk", "blah") .eq("name", "jim") @@ -43,9 +43,9 @@ public class TestOrderByWithDistinct extends BaseTestCase { @IgnorePlatform({Platform.MYSQL, Platform.MARIADB, Platform.SQLSERVER, Platform.NUODB}) // do not support nulls first/last public void testDistinctOn() { - MRole role = Ebean.getReference(MRole.class, 1); + MRole role = DB.getReference(MRole.class, 1); - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .where() .eq("roles", role) .order("userName asc nulls first").query(); @@ -64,7 +64,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { @Test public void testOrderByWithDistinct() { - Query query = Ebean.find(MUser.class); + Query query = DB.find(MUser.class); query.findList(); assertSql(query).doesNotContain("order by"); @@ -75,7 +75,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { if (isH2()) { assertSql(query).contains("from muser t0 limit 1000"); } - query = Ebean.find(MUser.class) + query = DB.find(MUser.class) .where() .eq("roles.roleName", "A") .query(); @@ -101,25 +101,25 @@ public class TestOrderByWithDistinct extends BaseTestCase { */ MUserType ut = new MUserType("md"); - Ebean.save(ut); + DB.save(ut); MUser user1 = new MUser("one"); user1.setUserType(ut); - Ebean.save(user1); + DB.save(user1); MUser user2 = new MUser("two"); user2.setUserType(ut); - Ebean.save(user2); + DB.save(user2); MRole roleA = new MRole("A"); - Ebean.save(roleA); + DB.save(roleA); MRole roleB = new MRole("B"); - Ebean.save(roleB); + DB.save(roleB); user1.addRole(roleA); - Ebean.save(user1); + DB.save(user1); user2.addRole(roleB); - Ebean.save(user2); + DB.save(user2); - Query query = Ebean.find(MUser.class) + Query query = DB.find(MUser.class) .fetch("userType", "name") .where() .eq("roles.roleName", "A") @@ -151,7 +151,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { // 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) + query = DB.find(MUser.class) .setAutoTune(false) .select("userName") .fetch("userType", "name") diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index e74129648..bd23305c3 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class TestOrderByWithDistinctTake2 extends BaseTestCase { @Test public void test() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id, name") .where().ilike("contacts.firstName", "R%") .order("name desc").query(); @@ -50,7 +50,7 @@ public class TestOrderByWithDistinctTake2 extends BaseTestCase { @Test public void testWithAscAndDesc() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .where().ilike("contacts.firstName", "R%") .order("name asc,id desc").query(); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index 68db9d12d..42c165202 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestOrderByWithFunction extends BaseTestCase { length = "len"; } - Query query = Ebean.find(Customer.class).order(length + "(name),name"); + Query query = DB.find(Customer.class).order(length + "(name),name"); query.findList(); String sql = query.getGeneratedSql(); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 6e487eefa..2afad5bfe 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -1,7 +1,7 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -35,7 +35,7 @@ public class TestOrderByWithMany extends BaseTestCase { LoggedSqlCollector.start(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); // a query that ensures we are going to lazy load on the details List orders = query.findList(); @@ -59,7 +59,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkWithBuiltInManyBasic() { - Query query = Ebean.find(Order.class).fetch("details"); + Query query = DB.find(Order.class).fetch("details"); query.findList(); String sql = query.getGeneratedSql(); @@ -69,7 +69,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkWithBuiltInMany() { - Query query = Ebean.find(Order.class).fetch("details").order().desc("customer.name"); + Query query = DB.find(Order.class).fetch("details").order().desc("customer.name"); query.findList(); @@ -82,7 +82,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkAppendId() { - Query query = Ebean.find(Order.class).fetch("shipments").order().desc("customer.name"); + Query query = DB.find(Order.class).fetch("shipments").order().desc("customer.name"); query.findList(); @@ -94,7 +94,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkNone() { - Query query = Ebean.find(Order.class).order().desc("customer.name"); + Query query = DB.find(Order.class).order().desc("customer.name"); query.findList(); @@ -108,7 +108,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkBoth() { - Query query = Ebean.find(Order.class).fetch("shipments").order() + Query query = DB.find(Order.class).fetch("shipments").order() .desc("customer.name, shipments.shipTime"); query.findList(); @@ -120,7 +120,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkPrepend() { - Query query = Ebean.find(Order.class).fetch("shipments").order() + Query query = DB.find(Order.class).fetch("shipments").order() .desc("shipments.shipTime"); query.findList(); @@ -132,7 +132,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkAlreadyIncluded() { - Query query = Ebean.find(Order.class).fetch("shipments").order() + Query query = DB.find(Order.class).fetch("shipments").order() .desc("id, shipments.shipTime"); query.findList(); @@ -144,7 +144,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkAlreadyIncluded2() { - Query query = Ebean.find(Order.class).fetch("shipments").order() + Query query = DB.find(Order.class).fetch("shipments").order() .desc("orderDate, id, shipments.shipTime"); query.findList(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java index 82b77cd85..37a09cb7a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; @@ -13,7 +13,7 @@ public class TestFetchPreference extends BaseTestCase { @Test public void fetchPreference_overrideOrder() { - Query query = Ebean.find(Conversation.class) + Query query = DB.find(Conversation.class) // FetchPreference overrides so participants is joined and messages query joined .fetch("messages") .fetch("participants"); @@ -27,7 +27,7 @@ public class TestFetchPreference extends BaseTestCase { @Test public void fetchPreference_sr() { - Query query = Ebean.find(Conversation.class) + Query query = DB.find(Conversation.class) // without FetchPreference this ToMany would be our first ToMany join // and participants would be query joined .fetch("group.users") @@ -44,7 +44,7 @@ public class TestFetchPreference extends BaseTestCase { @Test public void fetchPreference_inOrder() { - Query query = Ebean.find(Conversation.class) + Query query = DB.find(Conversation.class) .fetch("participants") .fetch("messages"); @@ -56,7 +56,7 @@ public class TestFetchPreference extends BaseTestCase { @Test public void fetchQuery_onlyOneJoinCandidate() { - Query query = Ebean.find(Conversation.class) + Query query = DB.find(Conversation.class) .fetch("messages") .fetchQuery("participants"); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index 5b2582375..e32bcff15 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.junit.jupiter.api.Test; @@ -18,12 +18,12 @@ public class TestFindIdsWithInheritance extends BaseTestCase { Truck truck = new Truck(); truck.setLicenseNumber("TK123"); - Ebean.save(truck); + DB.save(truck); - List ids = Ebean.find(Vehicle.class).findIds(); + List ids = DB.find(Vehicle.class).findIds(); assertNotNull(ids); - Ebean.delete(truck); + DB.delete(truck); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index d997dc556..7c56986f5 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,8 +1,8 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; import com.sun.management.HotSpotDiagnosticMXBean; @@ -32,7 +32,7 @@ public class TestFindIterateHeapDump extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); // Transaction transaction = server.beginTransaction(); // try { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 5dd124f7a..118ca213a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Order.class) + List list = DB.find(Order.class) .setLazyLoadBatchSize(100) .setUseCache(false) .select("shipDate") @@ -30,7 +30,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { // assert first bean is partially loaded Order order0 = list.get(0); - BeanState beanState = Ebean.getBeanState(order0); + BeanState beanState = DB.beanState(order0); Set loadedProps = beanState.getLoadedProps(); assertTrue(loadedProps.contains("shipDate")); assertTrue(!loadedProps.contains("status")); @@ -43,7 +43,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { // assert that these beans are fully loaded for (int i = 1; i < list.size(); i++) { Order order1 = list.get(1); - beanState = Ebean.getBeanState(order1); + beanState = DB.beanState(order1); loadedProps = beanState.getLoadedProps(); assertNull(loadedProps); } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index 772719d90..4680763cf 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonEnum; @@ -18,9 +18,9 @@ public class TestFindWhereUsingEnumerated extends TransactionalTestCase { e.setName("TheNonEnumIsEnd"); e.setNote("note"); - Ebean.save(e); + DB.save(e); - MNonUpdPropEntity unique = Ebean.find(MNonUpdPropEntity.class).where() + MNonUpdPropEntity unique = DB.find(MNonUpdPropEntity.class).where() .eq("nonEnum", MNonEnum.END) .eq("name", "TheNonEnumIsEnd") .findOne(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index 328ab92a8..e832dfdcc 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -1,8 +1,8 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.ExpressionList; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestFormulaWithFindCount extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); ExpressionList ex = server.find(Order.class).select("id, status ,totalAmount").where().gt("totalAmount", 1d); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index a265499fb..a0fc9fa7b 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -23,7 +23,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { ResetBasicData.reset(); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descOrder = server.getBeanDescriptor(Order.class); BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) descOrder.getBeanProperty("details"); @@ -33,7 +33,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { List orders = - Ebean.find(Order.class) + DB.find(Order.class) .where().lt("id", 4) .findList(); @@ -44,11 +44,11 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { // start transaction to keep PC going to lazy query - Ebean.beginTransaction(); + DB.beginTransaction(); try { - Ebean.find(Order.class, 1); + DB.find(Order.class, 1); - SpiQuery query0 = (SpiQuery) Ebean.find(OrderDetail.class); + SpiQuery query0 = (SpiQuery) DB.find(OrderDetail.class); query0.setLazyLoadForParents(beanProperty); @@ -59,10 +59,10 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { platformAssertIn(query0.getGeneratedSql(), "where (t0.order_id)"); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } - List details = Ebean.find(OrderDetail.class) + List details = DB.find(OrderDetail.class) .where().eq("order.id", 1) .findList(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index 5779a39ba..48ed870b2 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ public class TestManyToManyLazyLoading extends BaseTestCase { createData(); - List users = Ebean.find(MUser.class).findList(); + List users = DB.find(MUser.class).findList(); for (MUser user : users) { List roles = user.getRoles(); @@ -28,14 +28,14 @@ public class TestManyToManyLazyLoading extends BaseTestCase { MRole r0 = new MRole("r0"); MRole r1 = new MRole("r1"); - Ebean.save(r0); - Ebean.save(r1); + DB.save(r0); + DB.save(r1); MUser u0 = new MUser("usr0"); u0.addRole(r0); u0.addRole(r1); - Ebean.save(u0); + DB.save(u0); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index e648754e5..feacd3e2e 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { Long groupId = 1L; Long userId = 1L; - Query query = Ebean.find(Conversation.class) + Query query = DB.find(Conversation.class) .where().eq("group.id", groupId) .disjunction() .conjunction() diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java index 927cbeb84..c830b9c10 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; @@ -21,7 +21,7 @@ public class TestQueryDistinct extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("name"); @@ -47,7 +47,7 @@ public class TestQueryDistinct extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where().setDistinct(true) .select("name"); @@ -62,7 +62,7 @@ public class TestQueryDistinct extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("status") .where().isNotNull("status").query(); @@ -87,7 +87,7 @@ public class TestQueryDistinct extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setMaxRows(10) .setDistinct(true) .select("name"); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index aef18b94e..b7f38538c 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -21,7 +21,7 @@ public class TestQueryRawExpressionMany extends BaseTestCase { Integer quantity = 1; - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().raw("details.orderQty = ?", quantity) .query(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 264bc18b9..6b3ad1a7f 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.CountDistinctOrder; import io.ebean.CountedValue; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -76,7 +76,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); List names = - Ebean.find(Customer.class) + DB.find(Customer.class) .setDistinct(true) .select("name") .where().eq("status", Customer.Status.NEW).startsWith("name", "R") @@ -96,7 +96,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); List dates = - Ebean.find(Customer.class) + DB.find(Customer.class) .setDistinct(true) .select("anniversary") .where().isNotNull("anniversary") @@ -110,7 +110,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { public void withOrderBy() { Query query = - Ebean.find(Customer.class) + DB.find(Customer.class) .setDistinct(true) .select("name") .where().eq("status", Customer.Status.NEW) @@ -125,7 +125,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class).select("name"); + Query query = DB.find(Customer.class).select("name"); List names = query.findSingleAttributeList(); @@ -138,7 +138,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("name") .where().eq("id", 1).query(); @@ -151,7 +151,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributeList_with_join_column() { ResetBasicData.reset(); - Query query = Ebean.find(MainEntityRelation.class) + Query query = DB.find(MainEntityRelation.class) .fetch("entity1", "attr1") .setDistinct(true) .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) @@ -173,7 +173,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributesVariousSelection1() { - Query query = Ebean.find(MainEntityRelation.class) + Query query = DB.find(MainEntityRelation.class) .fetch("entity1", "attr1") .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) .where().query(); @@ -186,7 +186,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributesVariousSelection2() { - Query query = Ebean.find(MainEntityRelation.class) + Query query = DB.find(MainEntityRelation.class) .select("attr1") .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) .where().query(); @@ -199,7 +199,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributesVariousSelection3() { - Query query = Ebean.find(MainEntityRelation.class) + Query query = DB.find(MainEntityRelation.class) .select("id") .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) .where().query(); @@ -212,7 +212,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributesVariousSelection4() { - Query query = Ebean.find(MainEntityRelation.class) + Query query = DB.find(MainEntityRelation.class) .fetch("entity1", "id") .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) .where().query(); @@ -225,7 +225,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @Test public void findSingleAttributesVariousSelection5() { - Query query = Ebean.find(OmBasicParent.class) + Query query = DB.find(OmBasicParent.class) .fetch("children", "name") .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC) .where().query(); @@ -240,7 +240,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("max(name)") .where().gt("id", 1).query(); @@ -255,7 +255,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - String name = Ebean.find(Customer.class) + String name = DB.find(Customer.class) .select("name") .where().eq("id", 1) .findSingleAttribute(); @@ -268,7 +268,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("name") .where().eq("status", Customer.Status.NEW) @@ -285,7 +285,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("name") .where().eq("status", Customer.Status.NEW) @@ -304,18 +304,18 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class).select("name"); + Query query = DB.find(Customer.class).select("name"); query.findSingleAttributeList(); assertThat(sqlOf(query)).contains("select t0.name from o_customer t0"); - Query query2 = Ebean.find(Customer.class).select("name"); + Query query2 = DB.find(Customer.class).select("name"); query2.findList(); assertThat(sqlOf(query2, 1)).contains("select t0.id, t0.name from o_customer t0"); } @Test public void distinctOnIdProperty() { - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .select("id") .setMaxRows(100); @@ -336,7 +336,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .setDistinct(true) .fetch("billingAddress", "city"); @@ -351,7 +351,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer.billingAddress", "city"); @@ -366,7 +366,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(ChildA.class) + Query query = DB.find(ChildA.class) .setDistinct(true) .select("more"); @@ -379,7 +379,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EUncle.class) + Query query = DB.find(EUncle.class) .setDistinct(true) .fetch("parent", "more"); @@ -395,7 +395,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .select("id") .setMaxRows(100); @@ -415,7 +415,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .fetch("billingAddress", "city"); List cities = query.findSingleAttributeList(); @@ -429,7 +429,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(VwCustomer.class) + Query query = DB.find(VwCustomer.class) .fetch("billingAddress", "city"); List cities = query.findSingleAttributeList(); @@ -443,7 +443,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(ChildA.class) + Query query = DB.find(ChildA.class) .select("more"); query.findSingleAttributeList(); @@ -456,7 +456,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EUncle.class) + Query query = DB.find(EUncle.class) .fetch("parent", "more"); query.findSingleAttributeList(); @@ -469,7 +469,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(EUncle.class) + Query query = DB.find(EUncle.class) .fetch("parent", "more"); query.findSingleAttributeList(); @@ -483,7 +483,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Data.class) + Query query = DB.find(Data.class) .setDistinct(true) .fetch("parents", "more") .setMaxRows(100); @@ -500,7 +500,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .select("customer") .order().desc("customer"); @@ -515,7 +515,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .select("customer.id") .order().desc("customer.id"); @@ -530,7 +530,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer", "billingAddress") .order().desc("customer.billingAddress"); @@ -545,7 +545,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer", "billingAddress") .where().eq("customer.billingAddress.city", "Auckland") @@ -566,7 +566,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer", "billingAddress") .where().eq("customer.billingAddress.city", "Auckland") @@ -587,7 +587,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer", "billingAddress") .where().eq("customer.billingAddress.city", "Auckland") @@ -608,7 +608,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .setDistinct(true) .fetch("customer", "billingAddress") .where().eq("customer.shippingAddress.city", "Auckland") // query on shippingAddress @@ -631,10 +631,10 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); - int count = Ebean.find(Contact.class).findCount(); + int count = DB.find(Contact.class).findCount(); assertThat(count).isGreaterThanOrEqualTo(12); - Query query = Ebean.find(Contact.class) + Query query = DB.find(Contact.class) .select("firstName"); List> list1 = query @@ -649,21 +649,21 @@ public class TestQuerySingleAttribute extends BaseTestCase { //assertThat(list1.toString()).isEqualTo("[3: Bugs1, 1: Fiona, 3: Fred1, 1: Jack, 3: Jim1, 1: Tracy]"); - query = Ebean.find(Contact.class).select("firstName"); + query = DB.find(Contact.class).select("firstName"); list1 = query .setCountDistinct(CountDistinctOrder.ATTR_DESC) .findSingleAttributeList(); assertThat(list1.get(0)).isInstanceOf(CountedValue.class); //assertThat(list1.toString()).isEqualTo("[1: Tracy, 3: Jim1, 1: Jack, 3: Fred1, 1: Fiona, 3: Bugs1]"); - query = Ebean.find(Contact.class).select("firstName"); + query = DB.find(Contact.class).select("firstName"); list1 = query .setCountDistinct(CountDistinctOrder.COUNT_ASC_ATTR_DESC) .findSingleAttributeList(); assertThat(list1.get(0)).isInstanceOf(CountedValue.class); //assertThat(list1.toString()).isEqualTo("[1: Tracy, 1: Jack, 1: Fiona, 3: Jim1, 3: Fred1, 3: Bugs1]"); - query = Ebean.find(Contact.class).fetch("customer.shippingAddress", "line1");//("firstName") + query = DB.find(Contact.class).fetch("customer.shippingAddress", "line1");//("firstName") List> list2 = query .setCountDistinct(CountDistinctOrder.ATTR_ASC) .findSingleAttributeList(); @@ -676,7 +676,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { //assertThat(list2.toString()).isEqualTo("[1: null, 3: 1 Banana St, 5: 12 Apple St, 3: 15 Kumera Way]"); - query = Ebean.find(Contact.class).select("firstName") + query = DB.find(Contact.class).select("firstName") .where().eq("customer.shippingAddress.line1", "12 Apple St").query(); List> list3 = query .setCountDistinct(CountDistinctOrder.ATTR_ASC) @@ -690,7 +690,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { //assertThat(list3.toString()).isEqualTo("[1: Bugs1, 1: Fiona, 1: Fred1, 1: Jim1, 1: Tracy]"); - query = Ebean.find(Contact.class).fetch("customer.billingAddress", "line1") + query = DB.find(Contact.class).fetch("customer.billingAddress", "line1") .where().or() .ne("customer.shippingAddress.line1", "12 Apple St") .isNull("customer.shippingAddress.line1") @@ -710,7 +710,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { // Test Limiter for MSSQL - query = Ebean.find(Contact.class).fetch("customer.billingAddress", "line1").setFirstRow(1).setMaxRows(2); + query = DB.find(Contact.class).fetch("customer.billingAddress", "line1").setFirstRow(1).setMaxRows(2); List> list5 = query .where().isNotNull("customer.billingAddress.line1").query() .setCountDistinct(CountDistinctOrder.ATTR_DESC) @@ -746,7 +746,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { List> orderStatusCount = - Ebean.find(Order.class) + DB.find(Order.class) .select("status") .where() .gt("orderDate", LocalDate.now().minusMonths(3)) @@ -793,7 +793,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { @AfterEach public void cleanup() { - Ebean.find(MainEntityRelation.class).delete(); - Ebean.find(MainEntity.class).delete(); + DB.find(MainEntityRelation.class).delete(); + DB.find(MainEntity.class).delete(); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java index 45ac3cb55..74e53f13f 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.selfref.SelfParent; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class TestSelfParent extends BaseTestCase { @Test public void test() { - if (Ebean.find(SelfParent.class).findCount() > 0) { + if (DB.find(SelfParent.class).findCount() > 0) { // only run once return; } @@ -29,16 +29,16 @@ public class TestSelfParent extends BaseTestCase { SelfParent child21 = new SelfParent("child21", child2); SelfParent child22 = new SelfParent("child22", child2); - Ebean.save(root); - Ebean.save(child1); - Ebean.save(child11); - Ebean.save(child111); - Ebean.save(child12); - Ebean.save(child2); - Ebean.save(child21); - Ebean.save(child22); + DB.save(root); + DB.save(child1); + DB.save(child11); + DB.save(child111); + DB.save(child12); + DB.save(child2); + DB.save(child21); + DB.save(child22); - List roots = Ebean.find(SelfParent.class).where().eq("parent", null).findList(); + List roots = DB.find(SelfParent.class).where().eq("parent", null).findList(); assertEquals(1, roots.size()); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java index b8396593a..20e0fc7a9 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,8 +1,8 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Expression; import io.ebean.Query; import org.tests.model.basic.Customer; @@ -13,7 +13,7 @@ public class TestSubQueryBinding extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); Query someCustomerIds = server.find(Customer.class).select("id").where().lt("id", 5).query(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 341d553e5..3b26ea15f 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -23,7 +23,7 @@ public class TestWhereAnnotation extends BaseTestCase { LoggedSqlCollector.start(); - Ebean.find(Customer.class) + DB.find(Customer.class) .fetch("orders") .findList(); @@ -40,11 +40,11 @@ public class TestWhereAnnotation extends BaseTestCase { ResetBasicData.reset(); - Ebean.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); LoggedSqlCollector.start(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .order().asc("id") .findList(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index 0bd6ae56e..e637d2411 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; @@ -16,14 +16,14 @@ public class TestWhereLikeWithSlash extends BaseTestCase { public void testWithSlash() { EBasic basic = new EBasic("slash\\monkey"); - Ebean.save(basic); + DB.save(basic); - Query query = Ebean.find(EBasic.class).where().startsWith("name", "slash\\mon").query(); + Query query = DB.find(EBasic.class).where().startsWith("name", "slash\\mon").query(); List list = query.findList(); assertEquals(1, list.size()); - Query query1 = Ebean.find(EBasic.class).where().like("name", "slash\\mon%").query(); + Query query1 = DB.find(EBasic.class).where().like("name", "slash\\mon%").query(); List list1 = query1.findList(); if (!isMySql() && !isNuoDb() && !isMariaDB()) { @@ -37,14 +37,14 @@ public class TestWhereLikeWithSlash extends BaseTestCase { public void testWithPipe() { EBasic basic = new EBasic("bash|monkey"); - Ebean.save(basic); + DB.save(basic); - Query query = Ebean.find(EBasic.class).where().startsWith("name", "bash|mo").query(); + Query query = DB.find(EBasic.class).where().startsWith("name", "bash|mo").query(); List list = query.findList(); assertEquals(1, list.size()); - Query query1 = Ebean.find(EBasic.class).where().like("name", "bash|mon%").query(); + Query query1 = DB.find(EBasic.class).where().like("name", "bash|mon%").query(); List list1 = query1.findList(); // This doesn't work in the latest version of H2 so disable for now. @@ -56,19 +56,19 @@ public class TestWhereLikeWithSlash extends BaseTestCase { public void testWithOpenSquare() { EBasic basic = new EBasic("mash[monkey"); - Ebean.save(basic); + DB.save(basic); - Query query = Ebean.find(EBasic.class).where().startsWith("name", "mash[mo").query(); + Query query = DB.find(EBasic.class).where().startsWith("name", "mash[mo").query(); List list = query.findList(); assertEquals(1, list.size()); List list1; if (isSqlServer()) { - list1 = Ebean.find(EBasic.class).where().like("name", "mash[[]mon%").query().findList(); + list1 = DB.find(EBasic.class).where().like("name", "mash[[]mon%").query().findList(); } else { - list1 = Ebean.find(EBasic.class).where().like("name", "mash[mon%").query().findList(); + list1 = DB.find(EBasic.class).where().like("name", "mash[mon%").query().findList(); } // This doesn't work in the latest version of H2 so disable for now. diff --git a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 293c4acaa..9f85d5563 100644 --- a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -1,6 +1,6 @@ package org.tests.query.softdelete; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.PagedList; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; @@ -22,12 +22,12 @@ public class TestSoftDeletePagingList extends TransactionalTestCase { list.add(new Cover("SoftDelPaged-2")); list.add(new Cover("SoftDelPaged-3")); - Ebean.saveAll(list); - Ebean.delete(list.get(1)); + DB.saveAll(list); + DB.delete(list.get(1)); LoggedSqlCollector.start(); - PagedList pagedList = Ebean.find(Cover.class) + PagedList pagedList = DB.find(Cover.class) .where().startsWith("s3Url", "SoftDelPaged-") .setMaxRows(10) .findPagedList(); diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index e87a3a3d5..66e9ce6bd 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -1,7 +1,7 @@ package org.tests.query.sqlquery; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.Platform; import io.ebean.plugin.SpiServer; @@ -22,7 +22,7 @@ public class TestNativeILikeExpression extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where().ilike("name", "rob") .query(); diff --git a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java index e7ae20429..b62e40121 100644 --- a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java +++ b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java @@ -1,7 +1,7 @@ package org.tests.quotedidentifier; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.BWithQIdent; @@ -14,11 +14,11 @@ public class TestQuotedIdentifierQuery extends BaseTestCase { bean.setName("foo"); bean.setCODE("bar"); - Ebean.save(bean); + DB.save(bean); if (isMySql()) { - Ebean.find(BWithQIdent.class) + DB.find(BWithQIdent.class) .where() .eq("name", "foo") .raw("t0.`Name` = ?", "foo") @@ -27,7 +27,7 @@ public class TestQuotedIdentifierQuery extends BaseTestCase { } else if (isH2() || isPostgres()) { - Ebean.find(BWithQIdent.class) + DB.find(BWithQIdent.class) .where() .eq("name", "foo") .raw("t0.\"Name\" = ?", "foo") diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 538a950e8..2e188921e 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -24,19 +24,19 @@ public class TestOrderReportTotal extends BaseTestCase { RawSql rawSql = getRawSql(); - Query query = Ebean.createQuery(OrderAggregate.class); + Query query = DB.createQuery(OrderAggregate.class); List list = query.setRawSql(rawSql).findList(); assertNotNull(list); - Query q2 = Ebean.createQuery(OrderAggregate.class).setRawSql(rawSql); + Query q2 = DB.createQuery(OrderAggregate.class).setRawSql(rawSql); q2.where().gt("id", 1); q2.having().gt("totalItems", 1); List l2 = q2.findList(); assertNotNull(l2); - Query q3 = Ebean.createQuery(OrderAggregate.class).setRawSql(rawSql); + Query q3 = DB.createQuery(OrderAggregate.class).setRawSql(rawSql); q3.where().eq("order_id", 1); OrderAggregate orderAggregate = q3.findOne(); @@ -57,7 +57,7 @@ public class TestOrderReportTotal extends BaseTestCase { ResetBasicData.reset(); - int detailsCount = Ebean.find(OrderDetail.class) + int detailsCount = DB.find(OrderDetail.class) .where() .gt("order.id", 2) .istartsWith("order.customer.name", "rob") diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 50395973d..5a8b8e39f 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -35,7 +35,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { .parse("select r.id, r.name || 'hello' as name from o_customer r ") .create(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); @@ -48,7 +48,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { .parse("select r.id, r.name||'hello' as name from o_customer r ") .create(); - query = Ebean.find(Customer.class); + query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); @@ -59,7 +59,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { RawSqlBuilder .parse("select r.id, r.name||'hello' name from o_customer r ") .create(); - query = Ebean.find(Customer.class); + query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); @@ -71,7 +71,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { RawSqlBuilder .parse("select r.id, r.name || 'hello' name from o_customer r ") .create(); - query = Ebean.find(Customer.class); + query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index f383d9f04..645bdaf46 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -25,7 +25,7 @@ public class TestRawSqlCustomerAggregate extends BaseTestCase { "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 query = DB.find(CustomerAggregate.class); query.setRawSql(rawSql); query.where().ge("customer.id", 1); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 0931ed28c..1d7ae564f 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.Customer; @@ -43,7 +43,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .columnMapping("t3.name", "details.product.name") .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .setParameter("maxOrderId", 2) .setParameter("productId", 1) @@ -67,7 +67,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse(rs).create(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .setRawSql(rawSql) .findList(); @@ -89,7 +89,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .tableAliasMapping("ba", "billingAddress") .create(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .setRawSql(rawSql) .findList(); @@ -112,7 +112,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .tableAliasMapping("sa", "shippingAddress") .create(); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .setRawSql(rawSql) .findList(); @@ -139,7 +139,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .tableAliasMapping("p", "details.product") .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .setParameter("maxOrderId", 2) .setParameter("productId", 1) @@ -157,13 +157,13 @@ public class TestRawSqlMasterDetail extends BaseTestCase { basic.setName(name); basic.setStatus(EBasic.Status.ACTIVE); - Ebean.save(basic); + DB.save(basic); String rs = "select b.status, b.name from e_basic b "; RawSql rawSql = RawSqlBuilder.parse(rs).create(); - List list = Ebean.find(EBasic.class) + List list = DB.find(EBasic.class) .setRawSql(rawSql) .where().eq("name", name) .findList(); @@ -172,7 +172,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { EBasic basic1 = list.get(0); basic1.setDescription("insertAfterRawFetch"); - Ebean.save(basic1); + DB.save(basic1); } @Test @@ -185,7 +185,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse(rs) .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .findList(); @@ -204,7 +204,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse(rs) .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .findList(); @@ -227,7 +227,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .tableAliasMapping("o", null) .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .findList(); @@ -256,7 +256,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { .tableAliasMapping("p", "details.product") .create(); - List ordersFromRaw = Ebean.find(Order.class) + List ordersFromRaw = DB.find(Order.class) .setRawSql(rawSql) .findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index 38494aecc..b384ae7a3 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -2,7 +2,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; import io.ebean.CallableSql; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -32,7 +32,7 @@ public class TestRawSqlNamedParams extends BaseTestCase { .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 query = DB.find(Customer.class); query.setRawSql(rawSql); query.setParameter("name", "R%"); query.setParameter("id", 0); @@ -48,29 +48,29 @@ public class TestRawSqlNamedParams extends BaseTestCase { ResetBasicData.reset(); - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { if ("MariaDB connector/J".equals(transaction.getConnection().getMetaData().getDriverName())) { return; // MariaDb only supports callable statements in the form "? = call function x(?)" } - CallableSql callableSql = Ebean.createCallableSql("set @total = 0"); - Ebean.execute(callableSql); + CallableSql callableSql = DB.createCallableSql("set @total = 0"); + DB.getDefault().execute(callableSql); String sql = "select id, @total := 0 + id as total_items from o_order"; - Query query1 = Ebean.findNative(Order.class, sql); + Query query1 = DB.findNative(Order.class, sql); List list = query1.findList(); assertThat(list.get(0).getTotalItems()).isNotNull(); - Ebean.execute(callableSql); + DB.getDefault().execute(callableSql); RawSql rawSql = RawSqlBuilder .parse(sql) .create(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .setRawSql(rawSql); List list1 = query.findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 4f59c0ce0..70e6a086d 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.FutureRowCount; import io.ebean.PagedList; @@ -34,7 +34,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("r.id", "id") .columnMapping("r.name", "name").create(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); @@ -60,7 +60,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse("select id, NAME from O_CUSTOMER ").create(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); @@ -80,7 +80,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("r.name", "name") .create(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); int initialRowCount = query.findCount(); @@ -114,7 +114,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("r.name", "name") .create(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); int initialRowCount = query.findCount(); @@ -145,7 +145,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("o.ship_date", "shipDate") .create(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); query.setRawSql(rawSql); query.setMaxRows(100); @@ -179,7 +179,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("o.ship_date", "shipDate") .create(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); query.setRawSql(rawSql); query.orderById(true); @@ -215,7 +215,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("o.ship_date", "shipDate") .create(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); query.setRawSql(rawSql); query.setMaxRows(100); @@ -247,7 +247,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("o.ship_date", "shipDate") .create(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); query.setRawSql(rawSql); query.setMaxRows(100); @@ -279,7 +279,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { .columnMapping("o.ship_date", "shipDate") .create(); - Query query = Ebean.find(Order.class); + Query query = DB.find(Order.class); query.setRawSql(rawSql); query.setMaxRows(100); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 3b89a8d1c..9e834e98f 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -19,14 +19,14 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase { RawSql rawSql0 = RawSqlBuilder.parse(" select distinct r.id, r.name from o_customer r ") .create(); - Query query0 = Ebean.find(Customer.class); + Query query0 = DB.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(); - Query query = Ebean.find(Customer.class); + Query query = DB.find(Customer.class); query.setRawSql(rawSql); query.where().ilike("name", "r%"); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index cbecd82fc..4149ecd8a 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -34,7 +34,7 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount") .create(); - Query query = Ebean.find(OrderAggregate.class); + Query query = DB.find(OrderAggregate.class); query.setRawSql(rawSql) // .fetch("order.details", new FetchConfig().query()) .where().gt("order.id", 0).having().gt("totalAmount", 20); @@ -44,7 +44,7 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { output(list); - List list2 = Ebean.find(OrderAggregate.class).setRawSql(rawSql) + List list2 = DB.find(OrderAggregate.class).setRawSql(rawSql) // .fetch("order.details", new FetchConfig().query()) .where().gt("order.id", 2).having().gt("totalAmount", 10).findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 2a7b288e1..813e6d917 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; import io.ebean.RawSql; @@ -31,7 +31,7 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount") .create(); - Query query = Ebean.find(OrderAggregate.class); + Query query = DB.find(OrderAggregate.class); query.setRawSql(rawSql).fetchQuery("order", "status,orderDate") .fetch("order.customer", "name").where().gt("order.id", 0).having().gt("totalAmount", 20) .order().desc("totalAmount").setMaxRows(10); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 6fc475bd9..19a8a181e 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -32,7 +32,7 @@ public class TestRawSqlOrmWrapper3 extends BaseTestCase { // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount") .create(); - List list2 = Ebean.find(OrderAggregate.class).setRawSql(rawSql) + List list2 = DB.find(OrderAggregate.class).setRawSql(rawSql) .fetchQuery("order") .fetchQuery("order.details") .where().gt("order.id", 2) diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index c137f64d3..f62281378 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,7 +1,7 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -27,7 +27,7 @@ public class TestRawSqlWithResultSet extends BaseTestCase { PreparedStatement pstmt = null; // Transaction supplies our jdbc Connection - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { pstmt = txn.getConnection().prepareStatement("select id, name, billing_address_id from o_customer"); @@ -36,7 +36,7 @@ public class TestRawSqlWithResultSet extends BaseTestCase { RawSql rawSql = RawSqlBuilder.resultSet(resultSet, "id", "name", "billingAddress.id"); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .setRawSql(rawSql) // also test a secondary query join .fetchQuery("billingAddress") diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index 523f2f2c7..d29a2be12 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -2,7 +2,7 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; @@ -28,17 +28,17 @@ public class ParentQueryTest extends BaseTestCase { ChildA a = new ChildA(1000, "PQT-PA"); a.setData(exampleData); - Ebean.save(a); + DB.save(a); ChildB b = new ChildB(1001, "PQT-PB"); b.setData(exampleData); - Ebean.save(b); + DB.save(b); ChildA c = new ChildA(1002, "PQT-PC"); c.setData(exampleData); - Ebean.save(c); + DB.save(c); - List partial = Ebean.find(Parent.class).where().ge("val", 1001).findList(); + List partial = DB.find(Parent.class).where().ge("val", 1001).findList(); assertNotNull(partial.get(0).getData()); assertThat(partial.get(0).getMore()).startsWith("PQT-"); assertEquals(partial.get(0).getData().get(0).getVal().intValue(), 0); diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index bf8f0c534..38ea00f63 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -1,7 +1,7 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.junit.jupiter.api.BeforeEach; @@ -24,11 +24,11 @@ public class ParentRawSqlTest extends BaseTestCase { @BeforeEach public void clearDb() { - Ebean.deleteAll(Ebean.find(Data.class).findList()); - Ebean.deleteAll(Ebean.find(Parent.class).findList()); + DB.deleteAll(DB.find(Data.class).findList()); + DB.deleteAll(DB.find(Parent.class).findList()); //@rob: this does not work as it does not clear the ManyToMany relations. -// Ebean.find(Data.class).delete(); -// Ebean.find(Parent.class).delete(); +// DB.find(Data.class).delete(); +// DB.find(Parent.class).delete(); } @Test @@ -41,21 +41,21 @@ public class ParentRawSqlTest extends BaseTestCase { ChildA a = new ChildA(0, "PA"); a.setData(exampleData); - Ebean.save(a); + DB.save(a); ChildB b = new ChildB(1, "PB"); b.setData(exampleData); - Ebean.save(b); + DB.save(b); ChildA c = new ChildA(2, "PC"); c.setData(exampleData); - Ebean.save(c); + DB.save(c); RawSql rawSql = RawSqlBuilder .parse("select type, id, val from rawinherit_parent where val > 1") .create(); - List partial = Ebean.find(Parent.class) + List partial = DB.find(Parent.class) .setRawSql(rawSql) .findList(); @@ -73,20 +73,20 @@ public class ParentRawSqlTest extends BaseTestCase { ChildA a = new ChildA(0, "PA"); a.setData(exampleData); - Ebean.save(a); + DB.save(a); ChildB b = new ChildB(1, "PB"); b.setData(exampleData); - Ebean.save(b); + DB.save(b); ChildA c = new ChildA(2, "PC"); c.setData(exampleData); - Ebean.save(c); + DB.save(c); EUncle e1 = new EUncle(); e1.setParent(b); e1.setName("fester"); - Ebean.save(e1); + DB.save(e1); joinToInheritanceHierarchy_withAliasMapping(); joinToInheritanceHierarchy_bug416(); @@ -112,7 +112,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMapping("p_more", "parent.more") .create(); - List uncles = Ebean.find(EUncle.class).setRawSql(rawSql).findList(); + List uncles = DB.find(EUncle.class).setRawSql(rawSql).findList(); assertNotNull(uncles.get(0)); Parent parent = uncles.get(0).getParent(); @@ -129,7 +129,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMapping("p_id", "parent.id") .create(); - List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) + List uncles = DB.find(EUncle.class).setRawSql(rawSql) .fetchQuery("parent") .findList(); @@ -148,7 +148,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMapping("pid", "parent.id") .create(); - List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) + List uncles = DB.find(EUncle.class).setRawSql(rawSql) .fetchQuery("parent") .findList(); @@ -164,7 +164,7 @@ public class ParentRawSqlTest extends BaseTestCase { .tableAliasMapping("p", "parent") .create(); - List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) + List uncles = DB.find(EUncle.class).setRawSql(rawSql) .findList(); assertNotNull(uncles.get(0)); @@ -183,7 +183,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMapping("id", "parent.id") .create(); - List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) + List aggregates = DB.find(ParentAggregate.class).setRawSql(rawSql) .fetchQuery("parent") .findList(); @@ -207,7 +207,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMapping("id", "parent.id") .create(); - List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) + List aggregates = DB.find(ParentAggregate.class).setRawSql(rawSql) .fetchQuery("parent") .findList(); @@ -233,7 +233,7 @@ public class ParentRawSqlTest extends BaseTestCase { .columnMappingIgnore("b") // extra ignore after .create(); - List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) + List aggregates = DB.find(ParentAggregate.class).setRawSql(rawSql) .fetchQuery("parent") .findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 73acc39af..3783860a0 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -22,12 +22,12 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select id, name from o_customer"; - Query query = Ebean.findNative(Customer.class, nativeSql); + Query query = DB.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = Ebean.getBeanState(customers.get(0)); + BeanState beanState = DB.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps()).contains("id", "name"); } @@ -37,12 +37,12 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); String nativeSql = "select * from o_customer"; - Query query = Ebean.findNative(Customer.class, nativeSql); + Query query = DB.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = Ebean.getBeanState(customers.get(0)); + BeanState beanState = DB.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); } @@ -52,7 +52,7 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); String nativeSql = "select c.*, b.city from o_customer c join o_address b on b.id = c.billing_address_id"; - Query query = Ebean.findNative(Customer.class, nativeSql); + Query query = DB.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); @@ -65,13 +65,13 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select id, name from o_customer where id > :some"; - Query query = Ebean.findNative(Customer.class, nativeSql); + Query query = DB.findNative(Customer.class, nativeSql); query.setParameter("some", 1); List customers = query.findList(); assertThat(customers).isNotEmpty(); - Query query2 = Ebean.findNative(Customer.class, nativeSql); + Query query2 = DB.findNative(Customer.class, nativeSql); query2.setParameter("some", 2); List customers2 = query2.findList(); @@ -85,7 +85,7 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select id, name from o_customer where id > :some"; - Query query = Ebean.findNative(Customer.class, nativeSql) + Query query = DB.findNative(Customer.class, nativeSql) .setParameter("some", 1) .setMaxRows(10); @@ -103,7 +103,7 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select id, name from o_customer where id > :some"; - Query query = Ebean.findNative(Customer.class, nativeSql) + Query query = DB.findNative(Customer.class, nativeSql) .setParameter("some", 1) .setFirstRow(20) .setMaxRows(10); @@ -123,7 +123,7 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select id, name from o_customer where id > ?"; - List customers = Ebean.findNative(Customer.class, nativeSql) + List customers = DB.findNative(Customer.class, nativeSql) .setParameter(1) .findList(); @@ -143,7 +143,7 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select o.id, o.status, c.id, c.name, c.version from o_order o join o_customer c on c.id = o.kcustomer_id "; - List orders = Ebean.findNative(Order.class, nativeSql) + List orders = DB.findNative(Order.class, nativeSql) .findList(); for (Order order : orders) { @@ -155,10 +155,10 @@ public class TestNativeSqlBasic extends BaseTestCase { @Test public void partialAssocIncludingOracle() { ResetBasicData.reset(); - DB.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); String nativeSql = "select o.id, o.status, o.kcustomer_id from o_order o"; - List orders = Ebean.findNative(Order.class, nativeSql) + List orders = DB.findNative(Order.class, nativeSql) .findList(); LoggedSqlCollector.start(); @@ -186,14 +186,14 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select * from o_customer where id > ?"; List customers = - Ebean.findNative(Customer.class, nativeSql) + DB.findNative(Customer.class, nativeSql) .setParameter(1) .fetchQuery("contacts") .findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = Ebean.getBeanState(customers.get(0)); + BeanState beanState = DB.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); } @@ -204,12 +204,12 @@ public class TestNativeSqlBasic extends BaseTestCase { String nativeSql = "select c.id, 'foo' as name from o_customer c"; List customers = - Ebean.findNative(Customer.class, nativeSql) + DB.findNative(Customer.class, nativeSql) .findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = Ebean.getBeanState(customers.get(0)); + BeanState beanState = DB.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps()).contains("id", "name"); } } diff --git a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java index 19a489e9c..fcb5b6d1b 100644 --- a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -1,7 +1,7 @@ package org.tests.refresh; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.TransactionalTestCase; @@ -22,23 +22,23 @@ public class TestRefreshWithMany extends TransactionalTestCase { Customer customer = ResetBasicData.createCustomer("refresher", "22 refresh set", "23 fresh", 9); - Ebean.save(customer); + DB.save(customer); assertEquals(3, customer.getContacts().size()); - int rc = Ebean.createSqlUpdate("update o_customer set name = :name where id = :id") + int rc = DB.sqlUpdate("update o_customer set name = :name where id = :id") .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") + int rc2 = DB.sqlUpdate("update contact set first_name = concat(first_name,'-mod') where customer_id = :id") .setParameter("id", customer.getId()) .execute(); assertEquals(1, rc); assertEquals(3, rc2); - Ebean.refresh(customer); + DB.refresh(customer); assertEquals("ref-modified", customer.getName()); assertEquals(3, customer.getContacts().size()); @@ -46,18 +46,18 @@ public class TestRefreshWithMany extends TransactionalTestCase { // now try again when the bean is fully loaded - Customer customer1 = Ebean.find(Customer.class) + Customer customer1 = DB.find(Customer.class) .fetch("contacts") .setId(customer.getId()) .findOne(); - int rcb1 = Ebean.createSqlUpdate("update o_customer set name = :name where id = :id") + int rcb1 = DB.sqlUpdate("update o_customer set name = :name where id = :id") .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") + int rcb2 = DB.sqlUpdate("update contact set first_name = :first, last_name='foo' where customer_id = :id") .setParameter("id", customer.getId()) .setParameter("first", "-alt") .execute(); @@ -72,7 +72,7 @@ public class TestRefreshWithMany extends TransactionalTestCase { assertEquals(1, rcb1); assertEquals(3, rcb2); - Ebean.refresh(customer1); + DB.refresh(customer1); assertEquals("ref-modified-again", customer1.getName()); assertEquals(3, customer1.getContacts().size()); diff --git a/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java b/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java index 5d62f3fd6..f9fc7f59b 100644 --- a/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java +++ b/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java @@ -1,7 +1,7 @@ package org.tests.repository; import io.ebean.BeanRepository; -import io.ebean.EbeanServer; +import io.ebean.Database; import org.tests.model.basic.Customer; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; public class CustomerRepository extends BeanRepository { //@Inject - public CustomerRepository(EbeanServer server) { + public CustomerRepository(Database server) { super(Customer.class, server); } diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java index ff3d868e8..d7e9fc8ba 100644 --- a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java +++ b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -1,7 +1,7 @@ package org.tests.saveassociation; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; @@ -16,14 +16,14 @@ public class TestSaveAssociation extends BaseTestCase { TSMaster m0 = new TSMaster(); m0.setName("master1"); - Ebean.save(m0); + DB.save(m0); m0.addDetail(new TSDetail("master1 detail1")); m0.addDetail(new TSDetail("master1 detail2")); - Ebean.save(m0); + DB.save(m0); - TSMaster m0Check = Ebean.find(TSMaster.class).fetch("details").where().idEq(m0.getId()) + TSMaster m0Check = DB.find(TSMaster.class).fetch("details").where().idEq(m0.getId()) .findOne(); assertEquals(2, m0Check.getDetails().size()); diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 5f76c3fc9..b17942ad3 100644 --- a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.singleTableInheritance.model.PalletLocation; import org.tests.singleTableInheritance.model.PalletLocationExternal; import org.tests.singleTableInheritance.model.Warehouse; @@ -20,18 +20,18 @@ public class TestInheritQuery extends BaseTestCase { public void test() { ZoneExternal zone = new ZoneExternal(); zone.setAttribute("ABC"); - Ebean.save(zone); + DB.save(zone); PalletLocationExternal location = new PalletLocationExternal(); location.setZone(zone); location.setAttribute("123"); - Ebean.save(location); + DB.save(location); // This line should work too: - List locations = Ebean.find(PalletLocation.class).where().eq("zone", zone) + List locations = DB.find(PalletLocation.class).where().eq("zone", zone) .findList(); // List locations = - // Ebean.find(PalletLocation.class).where().eq("zone.id", + // DB.find(PalletLocation.class).where().eq("zone.id", // zone.getId()).findList(); assertNotNull(locations); @@ -48,24 +48,24 @@ public class TestInheritQuery extends BaseTestCase { public void testDiscriminator_bug417() { - Ebean.deleteAll(Ebean.find(Warehouse.class).findList()); - Ebean.deleteAll(Ebean.find(PalletLocation.class).findList()); - Ebean.deleteAll(Ebean.find(Zone.class).findList()); - Ebean.deleteAll(Ebean.find(ZoneInternal.class).findList()); - Ebean.deleteAll(Ebean.find(ZoneInternal.class).findList()); + DB.deleteAll(DB.find(Warehouse.class).findList()); + DB.deleteAll(DB.find(PalletLocation.class).findList()); + DB.deleteAll(DB.find(Zone.class).findList()); + DB.deleteAll(DB.find(ZoneInternal.class).findList()); + DB.deleteAll(DB.find(ZoneInternal.class).findList()); ZoneInternal zoneInt = new ZoneInternal(); zoneInt.setAttribute("some zone 1"); - Ebean.save(zoneInt); + DB.save(zoneInt); ZoneExternal zoneExt = new ZoneExternal(); zoneExt.setAttribute("some zone 2"); - Ebean.save(zoneExt); + DB.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(); + List zones = DB.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%) assertEquals(2, zones.size()); assertTrue(zones.contains(zoneInt)); @@ -73,7 +73,7 @@ public class TestInheritQuery extends BaseTestCase { // query internal zones only // discriminator is in WHERE clause where it belongs - List internalZones = Ebean.find(ZoneInternal.class).where().startsWith("attribute", "some zone").findList(); + List internalZones = DB.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%) assertEquals(1, internalZones.size()); assertTrue(internalZones.contains(zoneInt)); @@ -81,7 +81,7 @@ public class TestInheritQuery extends BaseTestCase { assertTrue(internalZones.get(0) instanceof ZoneInternal); // query external zones only - List externalZones = Ebean.find(ZoneExternal.class).where().startsWith("attribute", "some zone").findList(); + List externalZones = DB.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%) assertEquals(1, externalZones.size()); assertTrue(externalZones.contains(zoneExt)); @@ -93,12 +93,12 @@ public class TestInheritQuery extends BaseTestCase { Warehouse wh = new Warehouse(); wh.setOfficeZone(zoneInt); // many-to-one wh.getShippingZones().add(zoneExt); // many-to-many - Ebean.save(wh); + DB.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()); + Warehouse wh2 = DB.find(Warehouse.class, wh.getId()); assertNotNull(wh2); assertEquals(wh.getId(), wh2.getId()); assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); @@ -120,10 +120,10 @@ public class TestInheritQuery extends BaseTestCase { // set optional concrete to null to set stage for failure wh.setOfficeZone(null); - Ebean.save(wh); + DB.save(wh); // no discriminator here - wh2 = Ebean.find(Warehouse.class) + wh2 = DB.find(Warehouse.class) .where().eq("id", wh.getId()) .findOne(); @@ -134,7 +134,7 @@ public class TestInheritQuery extends BaseTestCase { // 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) + wh2 = DB.find(Warehouse.class) .fetch("officeZone") .where().eq("id", wh.getId()) .findOne(); @@ -143,15 +143,15 @@ public class TestInheritQuery extends BaseTestCase { // clear children to set the stage for left join failure wh.getShippingZones().clear(); - Ebean.save(wh); + DB.save(wh); - wh2 = Ebean.find(Warehouse.class, wh.getId()); + wh2 = DB.find(Warehouse.class, wh.getId()); assertNotNull(wh2); assertEquals(wh.getId(), wh2.getId()); assertEquals(0, wh.getShippingZones().size()); // query with lazy load of abstract children - wh = Ebean.find(Warehouse.class) + wh = DB.find(Warehouse.class) .where().eq("id", wh.getId()) .findOne(); assertNotNull(wh); @@ -159,7 +159,7 @@ public class TestInheritQuery extends BaseTestCase { assertEquals(0, wh.getShippingZones().size()); // query with fetch of abstract children - wh = Ebean.find(Warehouse.class) + wh = DB.find(Warehouse.class) .fetch("shippingZones") .where().eq("id", wh.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index a9cae80f8..472ff8cb9 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -1,7 +1,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import org.tests.model.softdelete.ESoftDelBook; import org.tests.model.softdelete.ESoftDelUser; @@ -18,28 +18,28 @@ public class TestSoftDeleteBook extends BaseTestCase { // Create users ESoftDelUser user1 = new ESoftDelUser("user1"); - Ebean.save(user1); + DB.save(user1); ESoftDelUser user2 = new ESoftDelUser("user2"); - Ebean.save(user2); + DB.save(user2); ESoftDelUser user3 = new ESoftDelUser("user3"); - Ebean.save(user3); + DB.save(user3); // Create books ESoftDelBook book1 = new ESoftDelBook("book1"); book1.setLendBy(user1); book1.setLendBys(Arrays.asList(user2, user3)); - Ebean.save(book1); + DB.save(book1); ESoftDelBook book2 = new ESoftDelBook("book2"); book2.setLendBy(user2); book2.setLendBys(Arrays.asList(user1, user3)); - Ebean.save(book2); + DB.save(book2); // check if everything is stored correctly in DB - book1 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book1").findOne(); - book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findOne(); + book1 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book1").findOne(); + book2 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findOne(); assertThat(book1.getLendBys().size()).isEqualTo(2); assertThat(book2.getLendBys().size()).isEqualTo(2); @@ -47,11 +47,11 @@ public class TestSoftDeleteBook extends BaseTestCase { assertThat(book2.getLendBy().getUserName()).isEqualTo("user2"); // delete user 1 - Ebean.delete(user1); + DB.delete(user1); // check if everything is still stored correctly in DB (softdeletes included) - book1 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book1").setIncludeSoftDeletes().findOne(); - book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").setIncludeSoftDeletes().findOne(); + book1 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book1").setIncludeSoftDeletes().findOne(); + book2 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book2").setIncludeSoftDeletes().findOne(); assertThat(book1.getLendBys().size()).isEqualTo(2); assertThat(book2.getLendBys().size()).isEqualTo(2); @@ -60,8 +60,8 @@ public class TestSoftDeleteBook extends BaseTestCase { // check without softdeletes included - book1 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book1").findOne(); - book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findOne(); + book1 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book1").findOne(); + book2 = DB.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findOne(); assertThat(book1.getLendBys().size()).isEqualTo(2); // user2 & user3 assertThat(book2.getLendBys().size()).isEqualTo(1); // user1 (deleted) & user3 @@ -83,21 +83,21 @@ public class TestSoftDeleteBook extends BaseTestCase { // Create users ESoftDelUser user1 = new ESoftDelUser("user1"); - Ebean.save(user1); + DB.save(user1); ESoftDelUser user2 = new ESoftDelUser("user2"); - Ebean.save(user2); + DB.save(user2); // Create books ESoftDelBook book1 = new ESoftDelBook("book3"); book1.setLendBy(user1); book1.setLendBys(Arrays.asList(user1, user2)); - Ebean.save(book1); + DB.save(book1); - Ebean.delete(user1); - Ebean.delete(user2); + DB.delete(user1); + DB.delete(user2); - Query query = Ebean.find(ESoftDelBook.class) + Query query = DB.find(ESoftDelBook.class) .setId(book1.getId()) .fetch("lendBys"); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 06fd33447..ab2f2bdbd 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -1,7 +1,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; import org.ebeantest.LoggedSqlCollector; @@ -19,18 +19,18 @@ public class TestSoftDeleteManyToMany extends BaseTestCase { ESoftDelRole role1 = new ESoftDelRole("role1"); ESoftDelRole role2 = new ESoftDelRole("role2"); - Ebean.save(role1); - Ebean.save(role2); + DB.save(role1); + DB.save(role2); ESoftDelUser user1 = new ESoftDelUser("user1"); user1.getRoles().add(role1); user1.getRoles().add(role2); - Ebean.save(user1); + DB.save(user1); LoggedSqlCollector.start(); - Ebean.delete(user1); + DB.delete(user1); List loggedSql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 99dcc20dd..9ae327ca5 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -2,7 +2,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; @@ -21,9 +21,9 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { public void testFindWhenNullRelationship() { ESoftDelMid mid1 = new ESoftDelMid(null, "mid1"); - Ebean.save(mid1); + DB.save(mid1); - ESoftDelMid bean = Ebean.find(ESoftDelMid.class) + ESoftDelMid bean = DB.find(ESoftDelMid.class) .setId(mid1.getId()) .fetch("top") .findOne(); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index ca0dfc089..81720abc0 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -1,7 +1,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelOneA; @@ -22,13 +22,13 @@ public class TestSoftDeleteOtoCascade extends BaseTestCase { a.setOneb(b); b.setOnea(a); - Ebean.save(a); + DB.save(a); LoggedSqlCollector.start(); // delete doesn't cascade to ESoftDelOneB as this is a // soft delete and ESoftDelOneB doesn't have soft delete flag - Ebean.delete(a); + DB.delete(a); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index 8fd4862d0..c34b75ef8 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -1,7 +1,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; import org.junit.jupiter.api.Test; @@ -20,10 +20,10 @@ public class TestSoftDeleteTop extends BaseTestCase { public void testDeletePermanent() { ESoftDelUp up1 = new ESoftDelUp("up1"); - Ebean.save(up1); + DB.save(up1); - Ebean.delete(up1); - Ebean.deletePermanent(up1); + DB.delete(up1); + DB.deletePermanent(up1); } @@ -31,15 +31,15 @@ public class TestSoftDeleteTop extends BaseTestCase { public void testSoftDeleteJdbcBatch() { ESoftDelUp up1 = new ESoftDelUp("upBatch1"); - Ebean.save(up1); + DB.save(up1); ESoftDelUp up2 = new ESoftDelUp("upBatch2"); - Ebean.save(up2); + DB.save(up2); - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { transaction.setBatchMode(true); - Ebean.delete(up1); - Ebean.delete(up2); + DB.delete(up1); + DB.delete(up2); transaction.commit(); } finally { transaction.end(); @@ -49,7 +49,7 @@ public class TestSoftDeleteTop extends BaseTestCase { list.add(up1); list.add(up2); - Ebean.deleteAllPermanent(list); + DB.deleteAllPermanent(list); } @Test @@ -63,9 +63,9 @@ public class TestSoftDeleteTop extends BaseTestCase { list.add(up2); // by default uses JDBC for the 'all' methods - Ebean.saveAll(list); - Ebean.deleteAll(list); - Ebean.deleteAllPermanent(list); + DB.saveAll(list); + DB.deleteAll(list); + DB.deleteAllPermanent(list); } @@ -84,11 +84,11 @@ public class TestSoftDeleteTop extends BaseTestCase { mid2.addDown("down3"); mid2.addDown("down4"); - Ebean.save(top1); + DB.save(top1); - Ebean.delete(top1); + DB.delete(top1); - Ebean.deletePermanent(top1); + DB.deletePermanent(top1); } @Test @@ -98,9 +98,9 @@ public class TestSoftDeleteTop extends BaseTestCase { top1.addMids("mid1"); top1.addMids("mid2"); - Ebean.save(top1); + DB.save(top1); - Query query = Ebean.find(ESoftDelTop.class) + Query query = DB.find(ESoftDelTop.class) .where().isEmpty("mids") .query(); diff --git a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index 1d4a262d6..4d7d4188c 100644 --- a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -2,7 +2,7 @@ package org.tests.sp; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.sp.model.car.Car; @@ -57,8 +57,8 @@ public class TestManyToManySaveTwice extends BaseTestCase { transaction.commit(); } - c0 = Ebean.find(Car.class, c0.getId()); - c1 = Ebean.find(Car.class, c1.getId()); + c0 = DB.find(Car.class, c0.getId()); + c1 = DB.find(Car.class, c1.getId()); assertThat(c0.getWheels()).hasSize(2); assertThat(c0.getDoors()).hasSize(1); @@ -113,10 +113,10 @@ public class TestManyToManySaveTwice extends BaseTestCase { DB.save(c); // NOTE 2ND SAVE - List allCars = Ebean.find(Car.class).findList(); + List allCars = DB.find(Car.class).findList(); assertEquals(1, allCars.size()); - List allWheels = Ebean.find(Wheel.class).findList(); + List allWheels = DB.find(Wheel.class).findList(); assertEquals(4, allWheels.size()); } diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java index 19fb84364..7380fec7c 100644 --- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java @@ -1,8 +1,8 @@ package org.tests.test; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.InheritInfo; @@ -23,7 +23,7 @@ public class TestInheritWithMany extends BaseTestCase { @Test public void test() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); assertNotNull(server); SpiEbeanServer spiServer = (SpiEbeanServer) server; @@ -64,7 +64,7 @@ public class TestInheritWithMany extends BaseTestCase { relate.setName(string); relate.setOwner(owner); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); server.save(relate); } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index dab45d3cb..9dbe34d57 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -3,7 +3,7 @@ package org.tests.text.json; import com.fasterxml.jackson.core.JsonParser; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -22,7 +22,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { @Test public void test() throws IOException { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); @@ -36,7 +36,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { assertEquals(Integer.valueOf(123), customer.getId()); assertEquals("Hello rob", customer.getName()); - BeanState beanState = Ebean.getBeanState(customer); + BeanState beanState = DB.getBeanState(customer); Set loadedProps = beanState.getLoadedProps(); assertEquals(2, loadedProps.size()); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index 17219fe5e..f07c31d65 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.BeanWithTimeZone; @@ -26,15 +26,15 @@ public class TestJsonBeanWithTimeZone extends BaseTestCase { bean.setName("foo"); bean.setTimezone(TimeZone.getDefault()); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); String jsonContent = jsonContext.toJson(bean); BeanWithTimeZone bean2 = jsonContext.toBean(BeanWithTimeZone.class, jsonContent); assertEquals(bean.getTimezone(), bean2.getTimezone()); - Ebean.save(bean); - BeanWithTimeZone bean3 = Ebean.find(BeanWithTimeZone.class, bean.getId()); + DB.save(bean); + BeanWithTimeZone bean3 = DB.find(BeanWithTimeZone.class, bean.getId()); assertEquals(bean.getTimezone(), bean3.getTimezone()); } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 7c0975d02..19ac15925 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; @@ -21,9 +21,9 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase { Cat cat = new Cat(); cat.setName("Gemma"); - Ebean.save(cat); + DB.save(cat); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); String jsonContent = json.toJson(cat); Cat cat2 = json.toBean(Cat.class, jsonContent); @@ -44,9 +44,9 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase { dog.setRegistrationNumber("ABC123"); dog.setDateOfBirth(new Date(System.currentTimeMillis())); - Ebean.save(dog); + DB.save(dog); - List animals = Ebean.find(Animal.class).findList(); + List animals = DB.find(Animal.class).findList(); String listJson = json.toJson(animals); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java index 0495d4afb..4b8279bae 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; @@ -22,9 +22,9 @@ public class TestJsonMap extends BaseTestCase { ResetBasicData.reset(); - List customers = Ebean.find(Customer.class).findList(); + List customers = DB.find(Customer.class).findList(); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); JsonWriteOptions jsonWriteOptions = JsonWriteOptions.parsePath("(id,status,name)"); String jsonString = jsonContext.toJson(customers, jsonWriteOptions); @@ -41,9 +41,9 @@ public class TestJsonMap extends BaseTestCase { ResetBasicData.reset(); - Map map = Ebean.find(Customer.class).findMap(); + Map map = DB.find(Customer.class).findMap(); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); JsonWriteOptions options = JsonWriteOptions.parsePath("(id,status,name)"); jsonContext.toJson(map, options); @@ -66,11 +66,11 @@ public class TestJsonMap extends BaseTestCase { PathProperties pathProperties = PathProperties.parse("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))"); - List customers = Ebean.find(Customer.class) + List customers = DB.find(Customer.class) .apply(pathProperties) .findList(); - Ebean.json().toJson(customers, pathProperties); + DB.json().toJson(customers, pathProperties); // Assert.assertTrue(jsonString.indexOf("{\"1\":") > -1); // Assert.assertTrue(jsonString.indexOf("{\"id\":1,\"status\":\"NEW\",\"name\":\"Rob\"},") diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java index a00e95829..f635d926b 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ public class TestJsonSimple extends BaseTestCase { m.put("hello", "rob"); m.put("test", "me"); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); jsonContext.toJson(m); String s = "{\"parishId\":\"18\",\"contentId\":null,\"contentStatus\":null,\"contentType\":\"pg-hello\",\"content\":\"asd\"}"; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 0d0f84a21..656391b05 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.SomeEnum; @@ -21,7 +21,7 @@ public class TestJsonSomeEnumWithToString extends BaseTestCase { bean.setName("Some name"); bean.setSomeEnum(SomeEnum.ALPHA); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); String jsonContent = json.toJson(bean); SomeEnumBean bean2 = json.toBean(SomeEnumBean.class, jsonContent); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index b67112308..2d1d5df3a 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -20,14 +20,14 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .select("id, name, status, shippingAddress") .fetch("billingAddress", "line1, city") .fetch("billingAddress.country", "*") .fetch("contacts", "firstName,email") .order().desc("id").findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); String s = json.toJson(list); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 2ee1393f6..00dbae51a 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -31,7 +31,7 @@ public class TestTextJsonCompoundType extends BaseTestCase { // p.setSalary(new Money("12200")); // p.setCmoney(new CMoney(new Money("12"), NZD)); // -// JsonContext jsonContext = Ebean.createJsonContext(); +// JsonContext jsonContext = DB.json(); // // String jsonString = jsonContext.toJson(p, true); // System.out.println(jsonString); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index d27d28098..70feaf335 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.util.StringHelper; import org.junit.jupiter.api.Test; @@ -19,25 +19,25 @@ public class TestTextJsonInsertUpdate extends BaseTestCase { String json0 = "{\"name\":\"InsJson\",\"status\":\"NEW\"}"; - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); // insert Customer c0 = jsonContext.toBean(Customer.class, json0); - Ebean.save(c0); + DB.save(c0); // update with optimistic concurrency checking String j0 = jsonContext.toJson(c0); String j1 = StringHelper.replace(j0, "InsJson", "Mod1"); Customer c1 = jsonContext.toBean(Customer.class, j1); - Ebean.update(c1); + DB.update(c1); // update with no optimistic concurrency checking String j2 = "{\"id\":" + c0.getId() + ",\"name\":\"ModIns\",\"status\":\"ACTIVE\"}"; Customer c2 = jsonContext.toBean(Customer.class, j2); - Ebean.update(c2); + DB.update(c2); // cleanup - Ebean.delete(Customer.class, c0.getId()); + DB.delete(Customer.class, c0.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index 345cd390a..bc7ff3251 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.junit.jupiter.api.BeforeEach; @@ -23,11 +23,11 @@ public class TestTextJsonInvokeLazy extends BaseTestCase { public void test() throws IOException { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("name").findList(); + List list = DB.find(Customer.class).select("name").findList(); JsonWriteOptions opt = JsonWriteOptions.parsePath("name, status"); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); jsonContext.toJson(list, opt); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index 6fe78b3d1..c73264234 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; @@ -21,10 +21,10 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("id, status, shippingAddress").order() + List list = DB.find(Customer.class).select("id, status, shippingAddress").order() .desc("id").findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); // test that lazy loading on PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))"); @@ -41,10 +41,10 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("id, status, shippingAddress") + List list = DB.find(Customer.class).select("id, status, shippingAddress") .fetch("contacts").order().desc("id").findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); // test that lazy loading on PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))"); @@ -61,11 +61,11 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("id, name, status, shippingAddress") + List list = DB.find(Customer.class).select("id, name, status, shippingAddress") // .fetch("contacts") .order().desc("id").findList(); - JsonContext json = Ebean.json(); + JsonContext json = DB.json(); // test that lazy loading on PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))"); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index ce1734ce5..d84d4ba06 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -2,7 +2,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; @@ -26,13 +26,13 @@ public class TestTextJsonReferenceBean extends BaseTestCase { ResetBasicData.reset(); - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); - Product product = Ebean.getReference(Product.class, 1); + Product product = DB.getReference(Product.class, 1); - BeanState beanState0 = Ebean.getBeanState(product); + BeanState beanState0 = DB.getBeanState(product); if (!beanState0.isReference()) { // got a cached value from beanCache @@ -46,7 +46,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { EntityBean eb = (EntityBean) refProd; prodDesc.isReference(eb._ebean_getIntercept()); - BeanState beanState = Ebean.getBeanState(refProd); + BeanState beanState = DB.getBeanState(refProd); assertTrue(beanState.isNew()); String name = refProd.getName(); @@ -58,7 +58,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { assertNotNull(name2); } - List orders = Ebean.find(Order.class) + List orders = DB.find(Order.class) // .setUseCache(false) .select("status, orderDate, shipDate, customer").fetch("details", "*") // .fetch("details.product","id") diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java index 5ea710bbc..3f4da80e7 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -1,8 +1,8 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; @@ -62,13 +62,13 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .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); + Database server = DB.getDefault(); JsonContext json = server.json(); @@ -100,11 +100,11 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .select("id, name") .order().desc("id").findList(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); JsonContext json = server.json(); @@ -123,11 +123,11 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class) + List list = DB.find(Customer.class) .select("id, name") .order().desc("id").findList(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); JsonContext json = server.json(); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index 7e6b13f0f..f0f41ba10 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -1,8 +1,8 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -20,10 +20,10 @@ public class TestTextJsonSuperSimple extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).select("id, name").order().desc("id") + List list = DB.find(Customer.class).select("id, name").order().desc("id") .findList(); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); JsonContext json = server.json(); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index 6569cae2b..c43c96a98 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -1,7 +1,7 @@ package org.tests.text.json; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.TransactionalTestCase; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { Customer c0 = ResetBasicData.createCustAndOrder("Test Json"); - Customer c2 = Ebean.getReference(Customer.class, c0.getId()); + Customer c2 = DB.getReference(Customer.class, c0.getId()); List orders = c2.getOrders(); assertEquals(1, orders.size()); @@ -30,7 +30,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { assertTrue(size >= 3); - Customer cref = Ebean.getReference(Customer.class, c0.getId()); + Customer cref = DB.getReference(Customer.class, c0.getId()); order.setCustomer(cref); order.setStatus(Status.SHIPPED); @@ -42,12 +42,12 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { OrderDetail removedDetail = order.getDetails().remove(2); assertNotNull(removedDetail); - Product p = Ebean.getReference(Product.class, 1); + Product p = DB.getReference(Product.class, 1); OrderDetail newDetail = new OrderDetail(p, 899, 12.12d); // newDetail.setOrder(order); order.addDetail(newDetail); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); JsonContext jsonContext = server.json(); String jsonString = jsonContext.toJson(order); @@ -58,15 +58,15 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { MRole r1 = new MRole(); r1.setRoleName("rolej1"); - Ebean.save(r1); + DB.save(r1); MRole r2 = new MRole(); r2.setRoleName("rolej2"); - Ebean.save(r2); + DB.save(r2); MRole r3 = new MRole(); r3.setRoleName("rolej3"); - Ebean.save(r3); + DB.save(r3); MUser u0 = new MUser(); u0.setUserName("userj1"); @@ -74,7 +74,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { u0.addRole(r2); u0.addRole(r3); - Ebean.save(u0); + DB.save(u0); jsonContext.toJson(u0); diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java index beef2fbc9..41fdca140 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java @@ -1,6 +1,6 @@ package org.tests.timezone; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ public class TimezoneTests { private void fetch() throws SQLException { try ( - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); Connection connection = transaction.getConnection(); PreparedStatement statement = connection.prepareStatement("select * from tztest"); ResultSet resultSet = statement.executeQuery()) { @@ -79,7 +79,7 @@ public class TimezoneTests { } try ( - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); Connection connection = transaction.getConnection(); PreparedStatement statement = connection.prepareStatement(insert)) { statement.setString(1, zone); diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java index c9d3c93d3..7c4739d4f 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java @@ -1,6 +1,6 @@ package org.tests.timezone; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -59,7 +59,7 @@ public class TzBeanTests { bean.setTs(nowTs); bean.setTstz(nowTs); - Ebean.save(bean); + DB.save(bean); } /** @@ -77,7 +77,7 @@ public class TzBeanTests { // set the Calendar time zone to use in JDBC calls System.setProperty("ebean.dataTimeZone", "UTC"); - List list = Ebean.find(TzBean.class) + List list = DB.find(TzBean.class) .findList(); for (TzBean bean : list) { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 05c64077a..2c5978b17 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; @@ -36,7 +36,7 @@ public class TestBatchModelFlush extends BaseTestCase { bean2.db().flush(); new MnyB("TestBatchModelFlush_4").save(); - Ebean.flush(); + DB.flush(); // the rest is flushed on commit new MnyB("TestBatchModelFlush_5").save(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 3d86b9976..bd0cb17d8 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -25,7 +25,7 @@ public class TestBatchPersistCascade extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void test() { - EbeanServer ebeanServer = Ebean.getServer(null); + Database ebeanServer = DB.getDefault(); LoggedSqlCollector.start(); @@ -58,7 +58,7 @@ public class TestBatchPersistCascade extends BaseTestCase { private void testUpdates() { - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); List list = server.find(UTMaster.class).fetch("details").findList(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java index 754ed3359..5727e721d 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; @@ -37,7 +37,7 @@ public class TestBeanStateReset extends BaseTestCase { } catch (PersistenceException e) { logger.info("expected error " + e.getMessage()); - Ebean.getBeanState(b).resetForInsert(); + DB.getBeanState(b).resetForInsert(); b.getCs().clear(); LoggedSqlCollector.start(); @@ -60,7 +60,7 @@ public class TestBeanStateReset extends BaseTestCase { MnyB b = new MnyB(); b.getCs().add(c); - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { // turn off cascade ... transaction.setPersistCascade(false); @@ -92,7 +92,7 @@ public class TestBeanStateReset extends BaseTestCase { } // assert our insert prior to the commitAndContinue succeeded - MnyB madeIt = Ebean.find(MnyB.class, b.getId()); + MnyB madeIt = DB.find(MnyB.class, b.getId()); assertNotNull(madeIt); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index e70a636bc..2e0d05ef9 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; import org.junit.jupiter.api.Test; @@ -28,9 +28,9 @@ public class TestBeginTransactionWithExisting extends BaseTestCase { assertEquals(Transaction.READ_COMMITTED, Connection.TRANSACTION_READ_COMMITTED); assertThrows(PersistenceException.class, () -> { - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { - try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) { + try (Transaction txn2 = DB.beginTransaction(TxIsolation.READ_COMMITED)) { fail("Expected persitenceException here"); } } finally { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java index 641adbcaf..144d8f5e3 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -30,7 +30,7 @@ public class TestCommitAndContinue extends BaseTestCase { a.save(); // commit at this point - Ebean.currentTransaction().commitAndContinue(); + DB.currentTransaction().commitAndContinue(); try { b.save(); @@ -40,10 +40,10 @@ public class TestCommitAndContinue extends BaseTestCase { } catch (IllegalStateException e) { // mark the transaction as rollback - Ebean.currentTransaction().setRollbackOnly(); + DB.currentTransaction().setRollbackOnly(); // use a different transaction to assert - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); try (Transaction anotherTxn = server.createTransaction()) { // success prior to commitAndContinue assertNotNull(server.find(MnyB.class, a.getId(), anotherTxn)); @@ -63,7 +63,7 @@ public class TestCommitAndContinue extends BaseTestCase { MnyB a = new MnyB("a100"); MnyB b = new MnyB("b200"); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { a.save(); @@ -111,7 +111,7 @@ public class TestCommitAndContinue extends BaseTestCase { a.save(); // commit at this point - Ebean.currentTransaction().commitAndContinue(); + DB.currentTransaction().commitAndContinue(); try { b.save(); @@ -121,10 +121,10 @@ public class TestCommitAndContinue extends BaseTestCase { } catch (IllegalStateException e) { // mark the transaction as rollback - Ebean.currentTransaction().setRollbackOnly(); + DB.currentTransaction().setRollbackOnly(); // use a different transaction to do something useful - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Transaction txn2 = server.createTransaction(); try { server.save(c, txn2); @@ -136,7 +136,7 @@ public class TestCommitAndContinue extends BaseTestCase { // asserts - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); try (Transaction txnForAssert = server.createTransaction()) { // success prior to commitAndContinue assertNotNull(server.find(MnyB.class, a.getId(), txnForAssert)); @@ -156,7 +156,7 @@ public class TestCommitAndContinue extends BaseTestCase { MnyB b = new MnyB("b"); MnyB c = new MnyB("c"); - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { a.save(); txn.commitAndContinue(); @@ -181,7 +181,7 @@ public class TestCommitAndContinue extends BaseTestCase { new MnyB("a100").save(); new MnyB("a101").save(); - Ebean.currentTransaction().commitAndContinue(); + DB.currentTransaction().commitAndContinue(); new MnyB("a200").save(); new MnyB("a201").save(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index 6e5afa823..aff263bbd 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -8,7 +8,7 @@ public class TestCreateTransactionWithIsolation extends BaseTestCase { @Test public void test() { -// EbeanServer server = Ebean.getServer(null); +// Database server = DB.getDefault(); // Transaction txn = server.createTransaction(TxIsolation.SERIALIZABLE); // txn.end(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index e3f6572af..124f32bc5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebeaninternal.api.SpiTransaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.ResetBasicData; @@ -19,37 +19,37 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { ResetBasicData.reset(); EBasicVer bean = new EBasicVer("Please Delete Me"); - Ebean.save(bean); + DB.save(bean); - SpiTransaction transaction = (SpiTransaction) Ebean.beginTransaction(); + SpiTransaction transaction = (SpiTransaction) DB.beginTransaction(); try { - EBasicVer bean2 = Ebean.find(EBasicVer.class, bean.getId()); + EBasicVer bean2 = DB.find(EBasicVer.class, bean.getId()); assertNotSame(bean, bean2); - EBasicVer bean3 = Ebean.find(EBasicVer.class, bean.getId()); + EBasicVer bean3 = DB.find(EBasicVer.class, bean.getId()); // same instance from PersistenceContext assertSame(bean2, bean3); Object bean4 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); assertSame(bean2, bean4); - Ebean.delete(bean2); + DB.delete(bean2); Object bean5 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); assertNull(bean5); - Ebean.commitTransaction(); + DB.commitTransaction(); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } - EBasicVer bean6 = Ebean.find(EBasicVer.class).where().eq("id", bean.getId()).findOne(); + EBasicVer bean6 = DB.find(EBasicVer.class).where().eq("id", bean.getId()).findOne(); assertNull(bean6); awaitL2Cache(); - EBasicVer bean7 = Ebean.find(EBasicVer.class, bean.getId()); + EBasicVer bean7 = DB.find(EBasicVer.class, bean.getId()); assertNull(bean7); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index 979794ced..a69b91087 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.BBookmark; import org.tests.model.basic.BBookmarkUser; import org.junit.jupiter.api.Test; @@ -30,6 +30,6 @@ public class TestInsertManyAndRef extends BaseTestCase { bookmarks.add(b1); bookmarks.add(b2); - Ebean.saveAll(bookmarks); + DB.saveAll(bookmarks); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNested.java b/ebean-core/src/test/java/org/tests/transaction/TestNested.java index 5fb05152b..1993c90be 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNested.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; @@ -15,7 +15,7 @@ public class TestNested extends BaseTestCase { public void testRunnableFail() { try { - Ebean.execute(this::willFail); + DB.execute(this::willFail); } catch (PersistenceException e) { assertThat(e.getMessage()).contains("test runnable rollback"); } @@ -25,20 +25,20 @@ public class TestNested extends BaseTestCase { public void testCallableFail() { try { - Ebean.execute(this::willFailCallable); + DB.execute(this::willFailCallable); } catch (PersistenceException e) { assertThat(e.getMessage()).contains("test callable rollback"); } } private void willFail() { - Ebean.executeCall(() -> { + DB.executeCall(() -> { throw new RuntimeException("test runnable rollback"); }); } private void willFailCallable() { - Ebean.executeCall((Callable) () -> { + DB.executeCall((Callable) () -> { throw new Exception("test callable rollback"); }); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 87487c305..093f360eb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.TxScope; import org.tests.model.basic.Country; @@ -16,7 +16,7 @@ public class TestNestedBeginRequired extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestNestedBeginRequired.class); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 89a50aca0..17afc712f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.TxScope; import org.tests.model.basic.Country; @@ -17,7 +17,7 @@ public class TestNestedBeginRequiredWithFailure extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestNestedBeginRequiredWithFailure.class); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 5232b3e3a..62d726ca9 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.TxScope; import org.tests.model.basic.Country; @@ -16,7 +16,7 @@ public class TestNestedBeginRequiresNew extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestNestedBeginRequiresNew.class); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 4a44cecf5..2755f81a1 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.TxScope; import org.tests.model.basic.Country; @@ -16,7 +16,7 @@ public class TestNestedBeginRequiresNewWithFailure extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestNestedBeginRequiresNewWithFailure.class); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java index b290e8938..a1409cd32 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; @@ -40,7 +40,7 @@ public class TestNestedMandatory extends BaseTestCase { @Transactional(label = "outer") void doOuter() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("outer start ...{}", outerTxn); new Inner().doInner(); @@ -52,7 +52,7 @@ public class TestNestedMandatory extends BaseTestCase { @Transactional(type = TxType.MANDATORY) void doInner() { - Transaction innerTxn = Ebean.currentTransaction(); + Transaction innerTxn = DB.currentTransaction(); log.info("inner ...{}", innerTxn); assertThat(innerTxn).isSameAs(outerTxn); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index ca0da6828..ffa089eb1 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.PersistenceContextScope; import io.ebean.Transaction; import io.ebean.TxScope; @@ -24,7 +24,7 @@ public class TestNestedSubTransaction extends BaseTestCase { @Test public void ebeanServer_commitTransaction_expect_sameAsTransactionCommit() { - EbeanServer server = server(); + Database server = server(); EBasic bean = new EBasic("x1"); @@ -46,7 +46,7 @@ public class TestNestedSubTransaction extends BaseTestCase { try (Transaction txn2 = server.beginTransaction()) { bean.setName("barney"); - Ebean.save(bean); + DB.save(bean); //txn2.commit(); server.commitTransaction(); } @@ -69,7 +69,7 @@ public class TestNestedSubTransaction extends BaseTestCase { @Test public void nestedUseSavepoint_doubleNested_rollbackCommit() { - EbeanServer server = server(); + Database server = server(); EBasic bean = new EBasic("start2"); @@ -85,7 +85,7 @@ public class TestNestedSubTransaction extends BaseTestCase { try (Transaction txn2 = server.beginTransaction()) { bean.setName("barney"); - Ebean.save(bean); + DB.save(bean); txn2.commit(); } @@ -106,7 +106,7 @@ public class TestNestedSubTransaction extends BaseTestCase { @Test public void nestedUseSavepoint_doubleNested_commitRollback() { - EbeanServer server = server(); + Database server = server(); EBasic bean = new EBasic("start3"); @@ -122,7 +122,7 @@ public class TestNestedSubTransaction extends BaseTestCase { try (Transaction txn2 = server.beginTransaction()) { bean.setName("barney3"); - Ebean.save(bean); + DB.save(bean); txn2.rollback(); } @@ -143,7 +143,7 @@ public class TestNestedSubTransaction extends BaseTestCase { @Test public void nestedUseSavepoint_nested_RequiresNew() { - EbeanServer server = server(); + Database server = server(); EBasic bean = new EBasic("start4"); @@ -179,7 +179,7 @@ public class TestNestedSubTransaction extends BaseTestCase { @Test public void nestedUseSavepoint() { - EbeanServer server = server(); + Database server = server(); EBasic bean = new EBasic("start1"); @@ -201,7 +201,7 @@ public class TestNestedSubTransaction extends BaseTestCase { try (Transaction txn2 = server.beginTransaction()) { bean.setName("barney"); - Ebean.save(bean); + DB.save(bean); txn2.rollback(); } @@ -219,6 +219,6 @@ public class TestNestedSubTransaction extends BaseTestCase { } private void cleanup(EBasic bean) { - Ebean.delete(EBasic.class, bean.getId()); + DB.delete(EBasic.class, bean.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java index f52639c6f..5bc880902 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,28 +20,28 @@ public class TestNestedTransaction extends BaseTestCase { @BeforeEach public void init() { bean = new EBasic("new"); - Ebean.save(bean); + DB.save(bean); } private void assertClean() { - EBasic myBean = Ebean.find(EBasic.class, bean.getId()); + EBasic myBean = DB.find(EBasic.class, bean.getId()); assertThat(myBean.getName()).isEqualTo("new"); } private void assertModified() { - EBasic myBean = Ebean.find(EBasic.class, bean.getId()); + EBasic myBean = DB.find(EBasic.class, bean.getId()); assertThat(myBean.getName()).isEqualTo("modified"); } private void modify() { bean.setName("modified"); - Ebean.save(bean); + DB.save(bean); } // ===== level 0 ======= @Test public void testNested_0() { - try (Transaction txn0 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { modify(); // no commit } @@ -50,7 +50,7 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_1() { - try (Transaction txn0 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { modify(); txn0.commit(); } @@ -60,8 +60,8 @@ public class TestNestedTransaction extends BaseTestCase { // ===== level 1 ======= @Test public void testNested_00() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { modify(); // no commit } @@ -72,8 +72,8 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_01() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { modify(); // no commit } @@ -93,8 +93,8 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_10() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { modify(); txn1.commit(); } @@ -105,8 +105,8 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_11() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { modify(); txn1.commit(); } @@ -118,9 +118,9 @@ public class TestNestedTransaction extends BaseTestCase { // ===== level 2 ======= @Test public void testNested_000() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); // no commit } @@ -133,9 +133,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_001() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); // no commit } @@ -148,9 +148,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_010() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); // no commit } @@ -163,9 +163,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_011() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); // no commit } @@ -178,9 +178,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_100() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); txn2.commit(); } @@ -193,9 +193,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_101() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); txn2.commit(); } @@ -208,9 +208,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_110() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); txn2.commit(); } @@ -223,9 +223,9 @@ public class TestNestedTransaction extends BaseTestCase { @Test public void testNested_111() { - try (Transaction txn0 = Ebean.beginTransaction()) { - try (Transaction txn1 = Ebean.beginTransaction()) { - try (Transaction txn2 = Ebean.beginTransaction()) { + try (Transaction txn0 = DB.beginTransaction()) { + try (Transaction txn1 = DB.beginTransaction()) { + try (Transaction txn2 = DB.beginTransaction()) { modify(); txn2.commit(); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java index 53b774231..ef990e899 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; @@ -24,7 +24,7 @@ public class TestPersistContextClear extends BaseTestCase { Order order0 = null; - Transaction t = Ebean.beginTransaction(); + Transaction t = DB.beginTransaction(); try { ResetBasicData.createOrderCustAndOrder("testPc"); SpiTransaction spiTxn = (SpiTransaction) t; @@ -34,7 +34,7 @@ public class TestPersistContextClear extends BaseTestCase { assertEquals(0, pc.size(Order.class)); assertEquals(0, pc.size(Customer.class)); - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); List list = server.find(Order.class).fetch("customer").fetch("details").findList(); int orderSize = list.size(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java index 9b2ea86ad..b167ba6f9 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; @@ -22,21 +22,21 @@ public class TestSavepoint extends BaseTestCase { EBasicVer basicVer = new EBasicVer("save1"); basicVer.setOther("other1"); - Ebean.save(basicVer); + DB.save(basicVer); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { Connection connection = transaction.getConnection(); Savepoint savepoint = connection.setSavepoint(); basicVer.setOther("changeOther"); - Ebean.save(basicVer); + DB.save(basicVer); connection.rollback(savepoint); transaction.commit(); } - EBasicVer found = Ebean.find(EBasicVer.class, basicVer.getId()); + EBasicVer found = DB.find(EBasicVer.class, basicVer.getId()); assertThat(found.getOther()).isEqualTo("other1"); } @@ -47,18 +47,18 @@ public class TestSavepoint extends BaseTestCase { EBasicVer basicVer = new EBasicVer("save2"); basicVer.setOther("other2"); - Ebean.save(basicVer); + DB.save(basicVer); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { transaction.setRollbackOnly(); basicVer.setOther("changeOther"); - Ebean.save(basicVer); + DB.save(basicVer); transaction.commit(); } - EBasicVer found = Ebean.find(EBasicVer.class, basicVer.getId()); + EBasicVer found = DB.find(EBasicVer.class, basicVer.getId()); assertThat(found.getOther()).isEqualTo("other2"); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java index d75ed5dc2..18174625e 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -22,7 +22,7 @@ public class TestSqlServerBatch extends BaseTestCase { @Test public void testBasicIdentityBatch() { - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { txn.setBatchMode(true); txn.setBatchSize(3); @@ -30,7 +30,7 @@ public class TestSqlServerBatch extends BaseTestCase { for (int i = 0; i < 10; i++) { ESimple model = new ESimple(); model.setName("baz " + i); - Ebean.save(model); + DB.save(model); } txn.commit(); @@ -43,7 +43,7 @@ public class TestSqlServerBatch extends BaseTestCase { @Test public void testAggressiveBatch() { - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { txn.setBatchMode(true); txn.setBatchSize(3); @@ -61,7 +61,7 @@ public class TestSqlServerBatch extends BaseTestCase { for (int i = 0; i < 10; i++) { ESimple model = new ESimple(); model.setName(i % 2 == 0 ? null : "foobar"); - Ebean.save(model); + DB.save(model); } // do not commit diff --git a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index 3d7629dc8..1573e65fa 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; @@ -14,26 +14,26 @@ public class TestStatelessUpdateClearPC extends BaseTestCase { public void test() { - Ebean.beginTransaction(); + DB.beginTransaction(); try { EBasic newUser = new EBasic(); newUser.setName("any@email.com"); - Ebean.save(newUser); + DB.save(newUser); // load the bean into the persistence context - EBasic dummyLoadedUser = Ebean.find(EBasic.class, newUser.getId()); // This row is added + EBasic dummyLoadedUser = DB.find(EBasic.class, newUser.getId()); // This row is added assertNotNull(dummyLoadedUser); // stateless update (should clear the bean from the persistence context) EBasic updateUser = new EBasic(); updateUser.setId(newUser.getId()); updateUser.setName("anyNew@email.com"); - Ebean.update(updateUser); + DB.update(updateUser); - EBasic loadedUser = Ebean.find(EBasic.class, newUser.getId()); + EBasic loadedUser = DB.find(EBasic.class, newUser.getId()); assertEquals("anyNew@email.com", loadedUser.getName()); } finally { - Ebean.rollbackTransaction(); + DB.rollbackTransaction(); } } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java index 305a878b5..dc426cf36 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; @@ -22,14 +22,14 @@ public class TestTransactionRollbackOnly { doVia_currentTransaction(); assertThat(one.getId()).isNotNull(); - assertThat(Ebean.find(EBasic.class, one.getId())).isNull(); + assertThat(DB.find(EBasic.class, one.getId())).isNull(); } @Transactional protected void doVia_currentTransaction() { one = new EBasic("WillNotSave"); - Ebean.save(one); + DB.save(one); Transaction transaction = Transaction.current(); assertFalse(transaction.isRollbackOnly()); @@ -44,15 +44,15 @@ public class TestTransactionRollbackOnly { do_Ebean_setRollbackOnly(); assertThat(two.getId()).isNotNull(); - assertThat(Ebean.find(EBasic.class, two.getId())).isNull(); + assertThat(DB.find(EBasic.class, two.getId())).isNull(); } @Transactional protected void do_Ebean_setRollbackOnly() { two = new EBasic("WillNotSave"); - Ebean.save(two); + DB.save(two); - Ebean.setRollbackOnly(); + DB.setRollbackOnly(); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index 3f2483138..a48ec72ec 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.CacheMode; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class TestTransactionSkipCache extends BaseTestCase { private void findUseQueryCache() { - Ebean.find(Customer.class) + DB.find(Customer.class) .setUseQueryCache(true) .setBeanCacheMode(CacheMode.PUT) .where().startsWith("name", "Rob") @@ -35,7 +35,7 @@ public class TestTransactionSkipCache extends BaseTestCase { setup(); - Transaction transaction = Ebean.beginTransaction(); + Transaction transaction = DB.beginTransaction(); try { transaction.setSkipCache(true); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java index 179c099cb..60c2d9bd1 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DuplicateKeyException; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -24,7 +24,7 @@ public class TestTransactionTryResources extends BaseTestCase { Document doc = new Document(); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { doc.setTitle("tryWithResources"); doc.setBody("stuff"); @@ -37,14 +37,14 @@ public class TestTransactionTryResources extends BaseTestCase { assertThat(document.isDraft()).isTrue(); // cleanup - Ebean.delete(document); + DB.delete(document); } @Test @IgnorePlatform(Platform.ORACLE) // does not support uncommited reads public void tryWithResources_catch() { Document doc = null; - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { doc = new Document(); doc.setTitle("tryWithResources_catch"); @@ -75,8 +75,8 @@ public class TestTransactionTryResources extends BaseTestCase { assertThat(docs).hasSize(1); assertThat(doc).isNotNull(); // Cleanup - Ebean.delete(Document.class, doc.getId()); - Ebean.delete(Document.class, doc3.getId()); + DB.delete(Document.class, doc.getId()); + DB.delete(Document.class, doc3.getId()); } } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java index e633c216c..f6bf776a8 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; @@ -34,7 +34,7 @@ public class TestTransactionalNever extends BaseTestCase { @Transactional(type = TxType.NEVER) void doStuff() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("currentTransaction ...{}", outerTxn); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index a5053881e..14b9c1f7e 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; @@ -34,9 +34,9 @@ public class TestTransactionalNotSupports extends BaseTestCase { public void withOuterTransaction_expect_currentTransaction_null_and_originalTxnRestored() { outerTxn = null; - Ebean.beginTransaction(); + DB.beginTransaction(); try { - currentTxn = Ebean.currentTransaction(); + currentTxn = DB.currentTransaction(); assertNotNull(currentTxn); new SomeTransactionalWithNotSupported().doStuff(); @@ -44,10 +44,10 @@ public class TestTransactionalNotSupports extends BaseTestCase { assertNull(outerTxn); // the original transaction was restored - Transaction restored = Ebean.currentTransaction(); + Transaction restored = DB.currentTransaction(); assertSame(currentTxn, restored); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } @@ -55,7 +55,7 @@ public class TestTransactionalNotSupports extends BaseTestCase { @Transactional(type = TxType.NOT_SUPPORTED) void doStuff() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("outer ...{}", outerTxn); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java index 920db0b69..3fedd0ab5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; @@ -26,11 +26,11 @@ public class TestTransactionalRequired extends BaseTestCase { outerTxn = null; - assertNull(Ebean.currentTransaction()); + assertNull(DB.currentTransaction()); new OuterTransactionalWithRequired().doOuter(); - assertNull(Ebean.currentTransaction()); + assertNull(DB.currentTransaction()); assertNotNull(outerTxn); assertNotNull(innerTxn); @@ -42,34 +42,34 @@ public class TestTransactionalRequired extends BaseTestCase { public void withOuterBegin() { outerTxn = null; - Ebean.beginTransaction(); + DB.beginTransaction(); try { - currentTxn = Ebean.currentTransaction(); + currentTxn = DB.currentTransaction(); assertNotNull(currentTxn); new OuterTransactionalWithRequired().doOuter(); // the original transaction was restored - Transaction restored = Ebean.currentTransaction(); + Transaction restored = DB.currentTransaction(); assertSame(currentTxn, restored); assertSame(currentTxn, innerTxn); assertSame(currentTxn, outerTxn); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } - assertNull(Ebean.currentTransaction()); + assertNull(DB.currentTransaction()); } class OuterTransactionalWithRequired { @Transactional(type = TxType.REQUIRED) void doOuter() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("outer ...{}", outerTxn); new InTransactionalWithRequired().doInner(); - Transaction current = Ebean.currentTransaction(); + Transaction current = DB.currentTransaction(); assertSame(outerTxn, current); } @@ -79,7 +79,7 @@ public class TestTransactionalRequired extends BaseTestCase { @Transactional(type = TxType.REQUIRED) void doInner() { - innerTxn = Ebean.currentTransaction(); + innerTxn = DB.currentTransaction(); log.info("inner ...{}", innerTxn); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index cfdbeda77..23d80eab1 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import io.ebean.TxScope; import io.ebean.annotation.Transactional; @@ -30,11 +30,11 @@ public class TestTransactionalRequiresNew extends BaseTestCase { public void basic() { outerTxn = null; - assertNull(Ebean.currentTransaction()); + assertNull(DB.currentTransaction()); new OuterTransactionalWithRequired().doOuter(); - assertNull(Ebean.currentTransaction()); + assertNull(DB.currentTransaction()); assertNotNull(outerTxn); } @@ -43,14 +43,14 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Transactional void doOuter() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("outer before ...{}", outerTxn); outerConn = outerTxn.getConnection(); new InTransactionalWithRequiresNew().doInner(); // restore the outerTxn - Transaction current = Ebean.currentTransaction(); + Transaction current = DB.currentTransaction(); log.info("outer after ...{}", current); assertSame(outerConn, current.getConnection()); } @@ -61,7 +61,7 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Transactional(type = TxType.REQUIRES_NEW) void doInner() { - Transaction innerTxn = Ebean.currentTransaction(); + Transaction innerTxn = DB.currentTransaction(); log.info("inner ...{} {}", innerTxn); Connection connection = innerTxn.getConnection(); @@ -71,14 +71,14 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Test public void testDifferentCreation1() { - EbeanServer server = server(); + Database server = server(); try(Transaction txn = server.beginTransaction()) { String txnName = txn.toString(); - Ebean.beginTransaction(TxScope.requiresNew()); + DB.beginTransaction(TxScope.requiresNew()); try { - Ebean.commitTransaction(); + DB.commitTransaction(); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } assertThat(txn.toString()).isEqualTo(txnName); } @@ -86,7 +86,7 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Test public void testDifferentCreation2() { - EbeanServer server = server(); + Database server = server(); try (Transaction txn = server.beginTransaction()) { String txnName = txn.toString(); server.beginTransaction(TxScope.requiresNew()); @@ -101,10 +101,10 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Test public void testDifferentCreation3() { - EbeanServer server = server(); + Database server = server(); try (Transaction txn = server.beginTransaction()) { String txnName = txn.toString(); - Transaction txn2 = Ebean.beginTransaction(TxScope.requiresNew()); + Transaction txn2 = DB.beginTransaction(TxScope.requiresNew()); try { txn2.commit(); } finally { @@ -116,7 +116,7 @@ public class TestTransactionalRequiresNew extends BaseTestCase { @Test public void testDifferentCreation4() { - EbeanServer server = server(); + Database server = server(); try (Transaction txn = server.beginTransaction()) { String txnName = txn.toString(); server.beginTransaction(TxScope.requiresNew()); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java index 1fa65483b..53b55b6bb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; @@ -33,12 +33,12 @@ public class TestTransactionalSupports extends BaseTestCase { public void withOuterTransaction_expect_currentTransactionAvailable() { outerTxn = null; - Ebean.beginTransaction(); + DB.beginTransaction(); try { new SomeTransactionalWithSupports().doStuff(); assertNotNull(outerTxn); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } } @@ -53,7 +53,7 @@ public class TestTransactionalSupports extends BaseTestCase { @Transactional(type = TxType.SUPPORTS) void doStuff() { - outerTxn = Ebean.currentTransaction(); + outerTxn = DB.currentTransaction(); log.info("outer ...{}", outerTxn); } } @@ -68,7 +68,7 @@ public class TestTransactionalSupports extends BaseTestCase { basic.setName("checkSupports"); // effective creates a transaction replacing the 'No active transaction' placeholder - Ebean.save(basic); + DB.save(basic); return 42; } diff --git a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index 738f01f75..0aeb45f26 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -30,7 +30,7 @@ public class TransactionNotTerminatedAfterRollback { } catch (PersistenceException pe) { LOG.error("e: " + pe); } - List users = Ebean.find(User.class).findList(); + List users = DB.find(User.class).findList(); LOG.debug("users: {}", users); assertThat(users).isEmpty(); } @@ -38,8 +38,8 @@ public class TransactionNotTerminatedAfterRollback { @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 + DB.save(i); + DB.save(new User(1L, "Peter")); // make it throw exception and rollback } } diff --git a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java index a75b286b3..4fdeaea07 100644 --- a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java +++ b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java @@ -1,7 +1,7 @@ package org.tests.types; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; @@ -25,7 +25,7 @@ public class TestEncryptedString extends BaseTestCase { model.save(); - model = Ebean.find(PasswordStoreModel.class, model.getId()); + model = DB.find(PasswordStoreModel.class, model.getId()); assertThat(model.getEnc1().getEncryptedData()).isNotEqualTo("Hello"); assertThat(model.getEnc2().getEncryptedData()).isNotEqualTo("World"); diff --git a/ebean-core/src/test/java/org/tests/types/TestFileType.java b/ebean-core/src/test/java/org/tests/types/TestFileType.java index 8988c00bd..c99b57c2e 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileType.java @@ -1,7 +1,7 @@ package org.tests.types; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.model.types.SomeFileBean; @@ -37,7 +37,7 @@ public class TestFileType extends BaseTestCase { SomeFileBean bean0 = new SomeFileBean(); bean0.setName("tempBeanUnbatched"); bean0.setContent(tempFile); - Ebean.save(bean0); + DB.save(bean0); assertTrue(tempFile.delete()); } @@ -48,13 +48,13 @@ public class TestFileType extends BaseTestCase { SomeFileBean bean0 = new SomeFileBean(); bean0.setName("tempBeanUnbatched"); bean0.setContent(newTempFile()); - Ebean.save(bean0); + DB.save(bean0); File updateFile = newTempFile(); bean0.setName("tempBeanModified"); bean0.setContent(updateFile); - Ebean.save(bean0); + DB.save(bean0); assertTrue(updateFile.delete()); } @@ -65,18 +65,18 @@ public class TestFileType extends BaseTestCase { SomeFileBean bean0 = new SomeFileBean(); bean0.setName("tempBeanUnbatched"); bean0.setContent(newTempFile()); - Ebean.save(bean0); + DB.save(bean0); File tempFile = newTempFile(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchSize(30); txn.setBatchMode(true); bean0.setName("tempBeanBatchedModified"); bean0.setContent(tempFile); - Ebean.save(bean0); + DB.save(bean0); txn.commit(); } @@ -89,14 +89,14 @@ public class TestFileType extends BaseTestCase { File tempFile = newTempFile(); - try (Transaction txn = Ebean.beginTransaction()) { + try (Transaction txn = DB.beginTransaction()) { txn.setBatchSize(30); txn.setBatchMode(true); SomeFileBean bean0 = new SomeFileBean(); bean0.setName("tempBeanBatched"); bean0.setContent(tempFile); - Ebean.save(bean0); + DB.save(bean0); txn.commit(); } @@ -112,9 +112,9 @@ public class TestFileType extends BaseTestCase { SomeFileBean bean0 = new SomeFileBean(); bean0.setName("afile"); - Ebean.save(bean0); + DB.save(bean0); - SomeFileBean bean1 = Ebean.find(SomeFileBean.class) + SomeFileBean bean1 = DB.find(SomeFileBean.class) .select("name, file") .setId(bean0.getId()) .findOne(); @@ -123,16 +123,16 @@ public class TestFileType extends BaseTestCase { assertNull(bean1.getContent()); bean1.setContent(file); - Ebean.save(bean1); + DB.save(bean1); - SomeFileBean bean2 = Ebean.find(SomeFileBean.class) + SomeFileBean bean2 = DB.find(SomeFileBean.class) .select("name, file") .setId(bean0.getId()) .findOne(); assertEquals("afile", bean2.getName()); assertNotNull(bean2.getContent()); - Ebean.delete(bean1); + DB.delete(bean1); } @Test @@ -145,9 +145,9 @@ public class TestFileType extends BaseTestCase { bean0.setName("afile"); bean0.setContent(file); - Ebean.save(bean0); + DB.save(bean0); - SomeFileBean bean1 = Ebean.find(SomeFileBean.class) + SomeFileBean bean1 = DB.find(SomeFileBean.class) .select("name, file") .setId(bean0.getId()) .findOne(); @@ -159,10 +159,10 @@ public class TestFileType extends BaseTestCase { bean1.setName("mod-file"); bean1.setContent(file2); // update to file2 - Ebean.save(bean1); + DB.save(bean1); - SomeFileBean bean2 = Ebean.find(SomeFileBean.class) + SomeFileBean bean2 = DB.find(SomeFileBean.class) .select("name, file") .setId(bean0.getId()) .findOne(); @@ -172,9 +172,9 @@ public class TestFileType extends BaseTestCase { // update to null bean2.setContent(null); bean2.setName("setNull"); - Ebean.save(bean2); + DB.save(bean2); - SomeFileBean bean3 = Ebean.find(SomeFileBean.class) + SomeFileBean bean3 = DB.find(SomeFileBean.class) .select("name, file") .setId(bean0.getId()) .findOne(); @@ -182,9 +182,9 @@ public class TestFileType extends BaseTestCase { assertNull(bean3.getContent()); bean3.setName("changeOnlyName"); - Ebean.save(bean3); + DB.save(bean3); - Ebean.delete(bean3); + DB.delete(bean3); } private File getFile(String resource) { diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 53289d93b..9855d66e3 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -2,7 +2,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.BeanState; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.types.SomeFileBean; import org.junit.jupiter.api.Test; @@ -25,13 +25,13 @@ public class TestFileTypeFetching extends BaseTestCase { SomeFileBean bean0 = new SomeFileBean(); bean0.setName("one"); bean0.setContent(file); - Ebean.save(bean0); + DB.save(bean0); - SomeFileBean bean1 = Ebean.find(SomeFileBean.class) + SomeFileBean bean1 = DB.find(SomeFileBean.class) .setId(bean0.getId()) .findOne(); - BeanState beanState = Ebean.getBeanState(bean1); + BeanState beanState = DB.getBeanState(bean1); Set loadedProps = beanState.getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); @@ -45,16 +45,16 @@ public class TestFileTypeFetching extends BaseTestCase { statelessUpdateBean.setContent(file2); // perform stateless update (handy) - Ebean.update(statelessUpdateBean); + DB.update(statelessUpdateBean); - SomeFileBean bean2 = Ebean.find(SomeFileBean.class) + SomeFileBean bean2 = DB.find(SomeFileBean.class) .select("file") .setId(bean0.getId()) .findOne(); assertEquals(file2.length(), bean2.getContent().length()); - Ebean.delete(bean1); + DB.delete(bean1); } private File getFile(String resource) { diff --git a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java index 5b4b4b2df..e398e85bb 100644 --- a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java +++ b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java @@ -1,7 +1,7 @@ package org.tests.types; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.types.SomePeriodBean; @@ -20,19 +20,19 @@ public class TestPeriodType extends BaseTestCase { SomePeriodBean bean = new SomePeriodBean(); bean.setAnniversary(MonthDay.of(4, 29)); - Ebean.save(bean); + DB.save(bean); - SomePeriodBean bean1 = Ebean.find(SomePeriodBean.class, bean.getId()); + SomePeriodBean bean1 = DB.find(SomePeriodBean.class, bean.getId()); assertEquals(bean.getAnniversary(), bean1.getAnniversary()); // insert fetch null value SomePeriodBean bean2 = new SomePeriodBean(); - Ebean.save(bean2); + DB.save(bean2); - SomePeriodBean bean3 = Ebean.find(SomePeriodBean.class, bean2.getId()); + SomePeriodBean bean3 = DB.find(SomePeriodBean.class, bean2.getId()); assertNull(bean3.getAnniversary()); - List anniversaryList = Ebean.find(SomePeriodBean.class) + List anniversaryList = DB.find(SomePeriodBean.class) .where() .eq("anniversary", MonthDay.of(4, 29)) .findList(); @@ -41,7 +41,7 @@ public class TestPeriodType extends BaseTestCase { // must use year 2000 for range predicates // ... using 2001 here so not finding anything - anniversaryList = Ebean.find(SomePeriodBean.class) + anniversaryList = DB.find(SomePeriodBean.class) .where() .gt("anniversary", Date.valueOf(LocalDate.of(2001, 4, 29))) .findList(); @@ -50,15 +50,15 @@ public class TestPeriodType extends BaseTestCase { // can use year 2000 for range predicates // ... and can use LocalDate to bind - anniversaryList = Ebean.find(SomePeriodBean.class) + anniversaryList = DB.find(SomePeriodBean.class) .where() .gt("anniversary", MonthDay.of(4, 22)) .findList(); assertEquals(1, anniversaryList.size()); - Ebean.delete(bean); - Ebean.delete(bean2); + DB.delete(bean); + DB.delete(bean2); } } diff --git a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java index 1afe4dd76..f4f0c9522 100644 --- a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -1,7 +1,7 @@ package org.tests.unidirectional; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class TestUniDirectional extends BaseTestCase { m.addDetail(new UTDetail("d12", 3, 5.50)); m.addDetail(new UTDetail("d13", 5, 1.0)); - Ebean.save(m); + DB.save(m); assertNotNull(m.getId()); assertNotNull(m.getVersion()); @@ -36,18 +36,18 @@ public class TestUniDirectional extends BaseTestCase { UTDetail d4 = new UTDetail("d14", 2, 3.0); m.addDetail(d4); - Ebean.save(m); + DB.save(m); assertNotNull(d4.getId()); Integer d4ver = d4.getVersion(); assertNotNull(d4ver); d4.setName("d14Upd"); - Ebean.save(d4); + DB.save(d4); Integer d4ver2 = d4.getVersion(); assertNotNull(d4ver2); assertEquals((d4ver + 1), d4ver2.intValue()); - Ebean.delete(d4); + DB.delete(d4); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index ca2de36b3..1e3f1601a 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -1,7 +1,7 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.ENullCollection; import org.tests.model.basic.ENullCollectionDetail; @@ -18,9 +18,9 @@ public class TestNullCollectionSet extends BaseTestCase { public void test() { ENullCollection c = new ENullCollection(); - Ebean.save(c); + DB.save(c); - ENullCollection c2 = Ebean.find(ENullCollection.class, c.getId()); + ENullCollection c2 = DB.find(ENullCollection.class, c.getId()); assertNotNull(c2); diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index d598d1e03..a7a42cdbb 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -1,7 +1,7 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.xtra.DummyDao; @@ -42,7 +42,7 @@ public class TestTxTypeOnTransactional extends BaseTestCase { logger.info("-- testOptimisticException"); EBasicVer v = new EBasicVer("occ"); v.setDescription("blah"); - Ebean.save(v); + DB.save(v); logger.info("-- OptimisticLockExceptionThrowingDao"); OptimisticLockExceptionThrowingDao dao = new OptimisticLockExceptionThrowingDao(); diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 18991a4b6..10a3b8ed3 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -1,7 +1,7 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.EVanillaCollection; import org.tests.model.basic.EVanillaCollectionDetail; @@ -19,9 +19,9 @@ public class TestVanillaCollectionSet extends BaseTestCase { EVanillaCollection c = new EVanillaCollection(); - Ebean.save(c); + DB.save(c); - EVanillaCollection c2 = Ebean.find(EVanillaCollection.class, c.getId()); + EVanillaCollection c2 = DB.find(EVanillaCollection.class, c.getId()); assertNotNull(c2); diff --git a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 7f2dbd91a..410eac1cb 100644 --- a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; @@ -24,20 +24,20 @@ public class TestEmbeddedRefreshUpdate extends BaseTestCase { outer.setDatePeriod(embeddedBean); - Ebean.save(outer); + DB.save(outer); - EEmbOuter loaded = Ebean.find(EEmbOuter.class).where().idEq(outer.getId()).findOne(); + EEmbOuter loaded = DB.find(EEmbOuter.class).where().idEq(outer.getId()).findOne(); // if commented Ebean saves correctly - Ebean.refresh(loaded); + DB.refresh(loaded); loaded.getDatePeriod().setDate2(new Date()); // BUG 343 - Ebean.save(loaded); + DB.save(loaded); // See BUG 344 - Ebean.find(EEmbInner.class).fetch("outer").orderBy("outer.datePeriod.date1").findList(); + DB.find(EEmbInner.class).fetch("outer").orderBy("outer.datePeriod.date1").findList(); } @@ -50,14 +50,14 @@ public class TestEmbeddedRefreshUpdate extends BaseTestCase { embeddedBean.setDate1(new Date()); outer.setDatePeriod(embeddedBean); - Ebean.save(outer); + DB.save(outer); assertThat(outer.getUpdateCount()).isEqualTo(1); Date d = new Date(); d.setTime(1L); outer.getDatePeriod().setDate1(d); - Ebean.save(outer); + DB.save(outer); assertThat(outer.getUpdateCount()).isEqualTo(2); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index d4b38366c..502ddbb34 100644 --- a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.UUOne; @@ -20,17 +20,17 @@ public class TestJsonStatelessUpdate extends BaseTestCase { UUOne one = new UUOne(); one.setName("oneName"); - Ebean.save(one); + DB.save(one); UUTwo two = new UUTwo(); two.setMaster(one); two.setName("twoName"); - Ebean.save(two); + DB.save(two); - UUTwo twoX = Ebean.find(UUTwo.class, two.getId()); + UUTwo twoX = DB.find(UUTwo.class, two.getId()); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); JsonWriteOptions writeOptions = JsonWriteOptions.parsePath("(id,name,master(*))"); String jsonString = jsonContext.toJson(twoX, writeOptions); @@ -48,12 +48,12 @@ public class TestJsonStatelessUpdate extends BaseTestCase { // 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); + DB.update(two2); awaitL2Cache(); // confirm the properties where updated as expected - UUTwo twoConfirm = Ebean.find(UUTwo.class, two.getId()); + UUTwo twoConfirm = DB.find(UUTwo.class, two.getId()); assertEquals("twoNameModified", twoConfirm.getName()); assertEquals("oneNameModified", twoConfirm.getMaster().getName()); diff --git a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java index ef8f618df..3b1b845d3 100644 --- a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class TestMarkAsDirty extends BaseTestCase { public void test() throws InterruptedException { EBasicVer bean = new EBasicVer("markAsDirty"); - Ebean.save(bean); + DB.save(bean); Timestamp lastUpdate = bean.getLastUpdate(); assertNotNull(lastUpdate); @@ -24,8 +24,8 @@ public class TestMarkAsDirty extends BaseTestCase { Thread.sleep(100); // ensure the update occurs and version property is updated/incremented - Ebean.markAsDirty(bean); - Ebean.save(bean); + DB.markAsDirty(bean); + DB.save(bean); Timestamp lastUpdate2 = bean.getLastUpdate(); assertNotNull(lastUpdate2); diff --git a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java index 371336e36..f8d32bcca 100644 --- a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java +++ b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -7,7 +7,7 @@ public class TestPostgresTruncate extends BaseTestCase { @Test public void test() { - // EbeanServer server = Ebean.getServer(null); + // Database server = DB.getDefault(); // // EBasic e = new EBasic(); // e.setName("something"); @@ -18,12 +18,12 @@ public class TestPostgresTruncate extends BaseTestCase { // // server.beginTransaction(); // Integer oriC = - // Ebean.createSqlQuery("select count(*) as c from e_basic").findOne().getInteger("c"); - // int rows = Ebean.createSqlUpdate("truncate e_basic cascade").execute(); + // DB.sqlQuery("select count(*) as c from e_basic").findOne().getInteger("c"); + // int rows = DB.sqlUpdate("truncate e_basic cascade").execute(); // Integer currentC = - // Ebean.createSqlQuery("select count(*) as c from e_basic").findOne().getInteger("c"); + // DB.sqlQuery("select count(*) as c from e_basic").findOne().getInteger("c"); // server.commitTransaction(); - // //Ebean.getServerCacheManager().clearAll(); + // //DB.cacheManager().clearAll(); // System.out.println("table : ori="+oriC+", delC="+rows+", currentC="+currentC); } diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index f343e4ab0..73fc6d8db 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.meta.MetaTimedMetric; @@ -21,7 +21,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { String sql = " this\nis\ntrimmed "; - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); assertThat(sqlUpdate.getSql()).isEqualTo(sql.trim()); } @@ -33,7 +33,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { // and table effected (so no automatic L2 cache invalidation) String sql = "CHECKPOINT SYNC"; - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); sqlUpdate.execute(); assertThat(sqlUpdate.getSql()).isEqualTo(sql.trim()); @@ -45,10 +45,10 @@ public class TestSqlUpdateInTxn extends BaseTestCase { LoggedSqlCollector.start(); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(true); - SqlUpdate sqlUpdate = Ebean.createSqlUpdate("update audit_log set description = description where id = ?") + SqlUpdate sqlUpdate = DB.sqlUpdate("update audit_log set description = description where id = ?") .setParameter(1, 999999); int row = sqlUpdate.execute(); @@ -72,10 +72,10 @@ public class TestSqlUpdateInTxn extends BaseTestCase { LoggedSqlCollector.start(); - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(false); - SqlUpdate sqlUpdate = Ebean.createSqlUpdate("update audit_log set description = description where id = ?") + SqlUpdate sqlUpdate = DB.sqlUpdate("update audit_log set description = description where id = ?") .setParameter(1, 999999); int row0 = sqlUpdate.execute(); @@ -97,10 +97,10 @@ public class TestSqlUpdateInTxn extends BaseTestCase { @Test public void testExecuteNow_inTransaction_withBatch() { - try (Transaction transaction = Ebean.beginTransaction()) { + try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(true); - int row = Ebean.createSqlUpdate("update audit_log set description = description where id = ?") + int row = DB.sqlUpdate("update audit_log set description = description where id = ?") .setParameter(1, 999999) .executeNow(); @@ -118,7 +118,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { resetAllMetrics(); - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql).setLabel("auditLargeUpdate"); + SqlUpdate sqlUpdate = DB.sqlUpdate(sql).setLabel("auditLargeUpdate"); sqlUpdate.execute(); assertThat(sqlUpdate.getSql()).isEqualTo(sql.trim()); @@ -135,65 +135,65 @@ public class TestSqlUpdateInTxn extends BaseTestCase { AuditLog otherLog = new AuditLog(); otherLog.setDescription("foo"); - Ebean.save(otherLog); + DB.save(otherLog); AuditLog log = new AuditLog(); log.setDescription("foo"); - Ebean.save(log); + DB.save(log); - AuditLog log2 = Ebean.find(AuditLog.class, log.getId()); + AuditLog log2 = DB.find(AuditLog.class, log.getId()); 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 sqlUpdate = DB.sqlUpdate(updateDml); sqlUpdate.setParameter("desc", "foo2"); sqlUpdate.setParameter("id", id); sqlUpdate.execute(); - SqlUpdate updateMod = Ebean.createSqlUpdate(updateModDml); + SqlUpdate updateMod = DB.sqlUpdate(updateModDml); updateMod.setParameter("desc", "mod0"); updateMod.execute(); - AuditLog log3 = Ebean.find(AuditLog.class, log.getId()); + AuditLog log3 = DB.find(AuditLog.class, log.getId()); assertEquals("foo2", log3.getDescription()); assertEquals("mod0", log3.getModifiedDescription()); - Ebean.execute(() -> { - SqlUpdate update = Ebean.createSqlUpdate(updateDml); + DB.execute(() -> { + SqlUpdate update = DB.sqlUpdate(updateDml); update.setParameter("desc", "foo3"); update.setParameter("id", id); update.execute(); - SqlUpdate updateMod1 = Ebean.createSqlUpdate(updateModDml); + SqlUpdate updateMod1 = DB.sqlUpdate(updateModDml); updateMod1.setParameter("desc", "mod1"); updateMod1.execute(); }); - AuditLog log4 = Ebean.find(AuditLog.class, log.getId()); + AuditLog log4 = DB.find(AuditLog.class, log.getId()); assertEquals("foo3", log4.getDescription()); assertEquals("mod1", log4.getModifiedDescription()); - Ebean.beginTransaction(); + DB.beginTransaction(); try { - SqlUpdate update = Ebean.createSqlUpdate(updateDml); + SqlUpdate update = DB.sqlUpdate(updateDml); update.setParameter("desc", "foo4"); update.setParameter("id", id); update.execute(); - updateMod = Ebean.createSqlUpdate(updateModDml); + updateMod = DB.sqlUpdate(updateModDml); updateMod.setParameter("desc", "mod2"); updateMod.execute(); - Ebean.commitTransaction(); + DB.commitTransaction(); } finally { - Ebean.endTransaction(); + DB.endTransaction(); } - AuditLog log5 = Ebean.find(AuditLog.class, log.getId()); + AuditLog log5 = DB.find(AuditLog.class, log.getId()); assertEquals("foo4", log5.getDescription()); assertEquals("mod2", log5.getModifiedDescription()); diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index ee7f10283..8397615f9 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -2,7 +2,7 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; @@ -26,7 +26,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { .setParameter(true) .executeGetKey(); - EPersonOnline found = Ebean.find(EPersonOnline.class, key); + EPersonOnline found = DB.find(EPersonOnline.class, key); assertThat(found).isNotNull(); assertThat(found.getEmail()).isEqualTo(email); assertThat(found.isOnlineStatus()).isTrue(); @@ -34,7 +34,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { Thread.sleep(50); // have to wait some millis here String sqlNamed = "merge into e_person_online (email, online_status, when_updated) key(email) values (:email, :online, now())"; - SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed) + SqlUpdate sqlUpdate2 = DB.sqlUpdate(sqlNamed) .setGetGeneratedKeys(true) .setParameter("email", email) .setParameter("online", false); @@ -43,7 +43,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { assertThat(key2).isNull(); - EPersonOnline found2 = Ebean.find(EPersonOnline.class).where().eq("email", email).findOne(); + EPersonOnline found2 = DB.find(EPersonOnline.class).where().eq("email", email).findOne(); assertThat(found2).isNotNull(); assertThat(found2.getId()).isEqualTo(key); assertThat(found2.getEmail()).isEqualTo(email); @@ -66,7 +66,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { .setParameter(3, true) .executeGetKey(); - EPersonOnline found = Ebean.find(EPersonOnline.class, key); + EPersonOnline found = DB.find(EPersonOnline.class, key); assertThat(found).isNotNull(); assertThat(found.getEmail()).isEqualTo("foo@one.com"); assertThat(found.isOnlineStatus()).isTrue(); @@ -80,7 +80,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { Object key2 = sqlUpdate2.executeGetKey(); - EPersonOnline found2 = Ebean.find(EPersonOnline.class, key2); + EPersonOnline found2 = DB.find(EPersonOnline.class, key2); assertThat(found2).isNotNull(); assertThat(found2.getId()).isEqualTo(key); assertThat(found2.getEmail()).isEqualTo("foo@one.com"); @@ -96,7 +96,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { String email = "bar@one.com"; String sql = "insert into e_person_online (email, online_status, when_updated) values (?, ?, current_time) on duplicate key update when_updated=current_time, online_status = ?"; - SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql) + SqlUpdate sqlUpdate = DB.sqlUpdate(sql) .setGetGeneratedKeys(true) .setParameter(1, email) .setParameter(2, true) @@ -105,14 +105,14 @@ public class TestSqlUpdateUpsert extends BaseTestCase { Object key = sqlUpdate.executeGetKey(); assertThat(key).isNotNull(); - EPersonOnline found = Ebean.find(EPersonOnline.class, key); + EPersonOnline found = DB.find(EPersonOnline.class, key); assertThat(found).isNotNull(); assertThat(found.getEmail()).isEqualTo("bar@one.com"); assertThat(found.isOnlineStatus()).isTrue(); String sqlNamed = "insert into e_person_online (email, online_status, when_updated) values (:email, :online, current_time) on duplicate key update when_updated=current_time, online_status = :online"; - SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed) + SqlUpdate sqlUpdate2 = DB.sqlUpdate(sqlNamed) .setGetGeneratedKeys(true) .setParameter("email", email) .setParameter("online", false); @@ -120,7 +120,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { sqlUpdate2.execute(); Object key2 = sqlUpdate2.getGeneratedKey(); - EPersonOnline found2 = Ebean.find(EPersonOnline.class, key2); + EPersonOnline found2 = DB.find(EPersonOnline.class, key2); assertThat(found2).isNotNull(); assertThat(found2.getId().toString()).isEqualTo(key.toString()); assertThat(found2.getEmail()).isEqualTo("bar@one.com"); diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 9939fe905..c852c335b 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -1,8 +1,8 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; import org.junit.jupiter.api.Test; @@ -21,14 +21,14 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { EBasicVer basic1 = new EBasicVer("basic1"); basic1.setDescription("aaa"); - Ebean.save(basic1); + DB.save(basic1); EBasicVer basic2 = new EBasicVer("basic2"); basic1.setDescription("bbb"); - Ebean.save(basic2); + DB.save(basic2); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); try (Transaction txn = server.beginTransaction()) { txn.setUpdateAllLoadedProperties(true); @@ -62,7 +62,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { ids.add(id1); ids.add(id2); - List beans = Ebean.find(EBasicVer.class) + List beans = DB.find(EBasicVer.class) .select("name, other") .where().idIn(ids) .order().asc("id") @@ -73,18 +73,18 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { LoggedSqlCollector.start(); - Transaction txn = Ebean.beginTransaction(); + Transaction txn = DB.beginTransaction(); try { txn.setUpdateAllLoadedProperties(true); EBasicVer basic1 = beans.get(0); basic1.setName("jim"); - Ebean.save(basic1); + DB.save(basic1); EBasicVer basic2 = beans.get(1); basic2.setName("john"); basic2.setOther("otherDesc"); - Ebean.save(basic2); + DB.save(basic2); txn.commit(); diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java index 7727d1a86..cfdd8b1cf 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tests.update.objects.Child; @@ -20,19 +20,19 @@ public class TestUpdateCircularSave extends BaseTestCase { long aId = createA(); modifyPropertyToTrue(aId); - SiblingA siblingA = Ebean.find(SiblingA.class, aId); + SiblingA siblingA = DB.find(SiblingA.class, aId); assert siblingA != null; assertTrue(siblingA.getSiblingB().isTestProperty()); } private void modifyPropertyToTrue(long aId) { - SiblingA siblingA = Ebean.find(SiblingA.class, aId); + SiblingA siblingA = DB.find(SiblingA.class, aId); assert siblingA != null; final SiblingB siblingB = siblingA.getSiblingB(); siblingB.setTestProperty(true); // Will get optimistic lock as version is increased twice on B - Ebean.save(siblingB); + DB.save(siblingB); } private long createA() { @@ -40,7 +40,7 @@ public class TestUpdateCircularSave extends BaseTestCase { SiblingB siblingB = new SiblingB(); siblingA.setSiblingB(siblingB); - Ebean.save(siblingA); + DB.save(siblingA); return siblingA.getId(); } @@ -50,18 +50,18 @@ public class TestUpdateCircularSave extends BaseTestCase { long childId = createParentAndChild().getChild().getId(); - Child child = Ebean.find(Child.class, childId); + Child child = DB.find(Child.class, childId); assert child != null; child.setTestProperty(true); final Parent parent = child.getParent(); - Ebean.save(parent); + DB.save(parent); assertChildModified(childId); } private void assertChildModified(long childId) { - Parent parent = Ebean.find(Parent.class, childId); + Parent parent = DB.find(Parent.class, childId); assert parent != null; // Fails here because D was not saved even though C has cascade = ALL assertTrue(parent.getChild().isTestProperty()); @@ -73,7 +73,7 @@ public class TestUpdateCircularSave extends BaseTestCase { Child child = new Child(); parent.setChild(child); - Ebean.save(parent); + DB.save(parent); return parent; } @@ -82,11 +82,11 @@ public class TestUpdateCircularSave extends BaseTestCase { public void testFetchParentModifyChildSaveParent() { long parentId = createParentAndChild().getId(); - Parent parent = Ebean.find(Parent.class, parentId); + Parent parent = DB.find(Parent.class, parentId); assert parent != null; parent.getChild().setTestProperty(true); - Ebean.save(parent); + DB.save(parent); assertChildModified(parent.getChild().getId()); } diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java index 6c723d576..b6feec344 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java @@ -2,7 +2,7 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -20,10 +20,10 @@ public class TestUpdatePartial extends BaseTestCase { c.setStatus(Customer.Status.ACTIVE); c.setSmallnote("a note"); - Ebean.save(c); + DB.save(c); checkDbStatusValue(c.getId(), "A"); - Customer c2 = Ebean.find(Customer.class) + Customer c2 = DB.find(Customer.class) .setUseCache(false) .select("status, smallnote") .setId(c.getId()) @@ -32,10 +32,10 @@ public class TestUpdatePartial extends BaseTestCase { c2.setStatus(Customer.Status.INACTIVE); c2.setSmallnote("2nd note"); - Ebean.save(c2); + DB.save(c2); checkDbStatusValue(c.getId(), "I"); - Customer c3 = Ebean.find(Customer.class) + Customer c3 = DB.find(Customer.class) .setUseCache(false) .select("status") .setId(c.getId()) @@ -44,11 +44,11 @@ public class TestUpdatePartial extends BaseTestCase { c3.setStatus(Customer.Status.NEW); c3.setSmallnote("3rd note"); - Ebean.save(c3); + DB.save(c3); checkDbStatusValue(c.getId(), "N"); // cleanup - Ebean.delete(Customer.class, c.getId()); + DB.delete(Customer.class, c.getId()); } private void checkDbStatusValue(Integer custId, String dbStatus) { @@ -68,15 +68,15 @@ public class TestUpdatePartial extends BaseTestCase { Customer customer = new Customer(); customer.setName("something"); - Ebean.save(customer); + DB.save(customer); - Customer customerWithoutChanges = Ebean.find(Customer.class, customer.getId()); - Ebean.save(customerWithoutChanges); + Customer customerWithoutChanges = DB.find(Customer.class, customer.getId()); + DB.save(customerWithoutChanges); assertThat(customerWithoutChanges.getUpdtime()).isEqualToIgnoringMillis(customer.getUpdtime()); // cleanup - Ebean.delete(customerWithoutChanges); + DB.delete(customerWithoutChanges); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index af80300d4..bf6a52680 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import org.junit.jupiter.api.Test; @@ -16,13 +16,13 @@ public class TestUpdatePartialNoVer extends BaseTestCase { b.setStatus(Status.ACTIVE); b.setDescription("description"); - Ebean.save(b); + DB.save(b); - EBasic basic = Ebean.find(EBasic.class).select("status, name").setId(b.getId()).findOne(); + EBasic basic = DB.find(EBasic.class).select("status, name").setId(b.getId()).findOne(); basic.setName("modiName"); - Ebean.save(basic); + DB.save(basic); } diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties index 49aae2a31..776912381 100644 --- a/ebean-core/src/test/resources/ebean.properties +++ b/ebean-core/src/test/resources/ebean.properties @@ -22,7 +22,7 @@ ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} ebean.packages=org.tests -datasource.default=h2 +datasource.default=sqlserver #datasource.h2.capturestacktrace=true ebean.dumpMetricsOnShutdown=true diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 48d8c226d..6a8dc32ba 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -39,14 +39,14 @@ public class ClusterTest { Person foo = new Person("Someone"); foo.save(); - DB.getServerCacheManager().clearAll(); + DB.cacheManager().clearAll(); DB.getDefault().metaInfo().resetAllMetrics(); other.metaInfo().resetAllMetrics(); Person fooA = DB.find(Person.class, foo.getId()); Person fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().beanCache(Person.class); + DuelCache dualCacheA = (DuelCache) DB.cacheManager().beanCache(Person.class); assertCounts(dualCacheA, 0, 1, 0, 1); fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 1, 1, 0, 1); diff --git a/ebean-redis/src/test/java/org/integration/IntegrationTest.java b/ebean-redis/src/test/java/org/integration/IntegrationTest.java index 343978d6f..646229d65 100644 --- a/ebean-redis/src/test/java/org/integration/IntegrationTest.java +++ b/ebean-redis/src/test/java/org/integration/IntegrationTest.java @@ -63,7 +63,7 @@ public class IntegrationTest { System.out.println("one2 " + one2); - DB.getServerCacheManager().clear(Person.class); + DB.cacheManager().clear(Person.class); System.out.println("done"); } From aafde53b81eba0735c36369334cebe0cd95ee627 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 18:11:51 +1200 Subject: [PATCH 067/102] #2357 - Update tests to use beanState() --- .../test/java/io/ebean/TestUnsetLoadedProperties.java | 10 +++++----- .../deploy/TestReferenceWithConstructorProperties.java | 2 +- .../java/org/tests/basic/TestBeanReferenceRefresh.java | 6 +++--- .../basic/TestEnhancementCollectionInitialisation.java | 2 +- .../test/java/org/tests/basic/TestLazyLoadInCache.java | 2 +- .../org/tests/basic/TestSharedInstancePropagation.java | 10 +++++----- .../test/java/org/tests/batchload/TestBasicLazy.java | 4 ++-- .../org/tests/batchload/TestBatchLazyWithDeleted.java | 2 +- .../test/java/org/tests/batchload/TestQueryJoin.java | 4 ++-- .../src/test/java/org/tests/cache/TestCacheBasic.java | 8 ++++---- .../cache/TestCacheInterceptSaveWhenLazyLoaded.java | 4 ++-- .../org/tests/cache/TestL2DirtyFlagOnLazyLoad.java | 2 +- .../src/test/java/org/tests/cache/TestQueryCache.java | 2 +- .../org/tests/contructor/TestProtectedConstructor.java | 2 +- .../test/java/org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../test/java/org/tests/json/TestJsonNodeBasic.java | 2 +- .../src/test/java/org/tests/json/TestJsonNodeBlob.java | 2 +- .../test/java/org/tests/json/TestJsonNodeJsonb.java | 2 +- .../test/java/org/tests/json/TestJsonNodeVarchar.java | 2 +- .../org/tests/model/prnt/TestPrinterStateIssue.java | 2 +- .../org/tests/model/selfref/TestTextJsonSelfRef.java | 2 +- .../java/org/tests/query/TestDefaultFetchLazy.java | 2 +- .../java/org/tests/query/TestQueryFindReadOnly.java | 8 ++++---- .../java/org/tests/query/TestRefToLazyLoadMany.java | 4 ++-- .../org/tests/rawsql/nativesql/TestNativeSqlBasic.java | 8 ++++---- .../tests/text/json/TestJsonBeanDescriptorParse.java | 2 +- .../org/tests/text/json/TestTextJsonReferenceBean.java | 4 ++-- .../java/org/tests/transaction/TestBeanStateReset.java | 2 +- .../java/org/tests/types/TestFileTypeFetching.java | 2 +- 29 files changed, 53 insertions(+), 53 deletions(-) diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index 86f6af933..5065d89b9 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -30,7 +30,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); - BeanState beanState = DB.getBeanState(user); + BeanState beanState = DB.beanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); @@ -54,7 +54,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = DB.getBeanState(user); + BeanState beanState = DB.beanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); // unset the loaded state for email @@ -72,7 +72,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = DB.getBeanState(user); + BeanState beanState = DB.beanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); @@ -89,10 +89,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setName("name mod"); user.setEmail("change@junk.com"); - BeanState beanState = DB.getBeanState(user); + BeanState beanState = DB.beanState(user); assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); - DB.getBeanState(user).setPropertyLoaded("email", false); + DB.beanState(user).setPropertyLoaded("email", false); assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 8accecf82..2d03fdac0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -25,7 +25,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { ResetBasicData.reset(); Order order = DB.getReference(Order.class, 1); - BeanState beanState = DB.getBeanState(order); + BeanState beanState = DB.beanState(order); Set loadedProps = beanState.getLoadedProps(); assertEquals(1, loadedProps.size()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 778825a58..d8cfe9157 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -25,7 +25,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Order order = DB.getReference(Order.class, 1); - assertTrue(DB.getBeanState(order).isReference()); + assertTrue(DB.beanState(order).isReference()); // invoke lazy loading Date orderDate = order.getOrderDate(); @@ -34,10 +34,10 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Customer customer = order.getCustomer(); assertNotNull(customer); - assertFalse(DB.getBeanState(order).isReference()); + assertFalse(DB.beanState(order).isReference()); assertNotNull(order.getStatus()); assertNotNull(order.getDetails()); - assertNull(DB.getBeanState(order).getLoadedProps()); + assertNull(DB.beanState(order).getLoadedProps()); Status status = order.getStatus(); assertTrue(status != Order.Status.SHIPPED); diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 109d4c5f8..11d94f3d2 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -17,7 +17,7 @@ public class TestEnhancementCollectionInitialisation extends BaseTestCase { @Test public void testListInitialisation() { Customer customer = new Customer(); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); if (beanState != null) { List orders = customer.getOrders(); assertNotNull(orders); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 2ebcd02e6..78bf40e61 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -42,7 +42,7 @@ public class TestLazyLoadInCache extends BaseTestCase { assertTrue(cust1 != cust1B); - Set loadedProps = DB.getBeanState(cust1).getLoadedProps(); + Set loadedProps = DB.beanState(cust1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("status")); diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index 246dbed07..23d1f1a68 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -34,7 +34,7 @@ public class TestSharedInstancePropagation extends BaseTestCase { assertNotNull(order); - assertTrue(DB.getBeanState(order).isReadOnly()); + assertTrue(DB.beanState(order).isReadOnly()); List details = order.getDetails(); BeanCollection bc = (BeanCollection) details; @@ -48,16 +48,16 @@ public class TestSharedInstancePropagation extends BaseTestCase { assertTrue(!bc.isEmpty()); OrderDetail detail = details.get(0); - assertTrue(DB.getBeanState(detail).isReadOnly()); - assertFalse(DB.getBeanState(detail).isReference()); + assertTrue(DB.beanState(detail).isReadOnly()); + assertFalse(DB.beanState(detail).isReference()); Product product = detail.getProduct(); - assertTrue(DB.getBeanState(product).isReadOnly()); + assertTrue(DB.beanState(product).isReadOnly()); // lazy load product.getName(); - assertFalse(DB.getBeanState(product).isReference()); + assertFalse(DB.beanState(product).isReference()); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java index a0540b63a..1bfcf92ef 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -83,7 +83,7 @@ public class TestBasicLazy extends BaseTestCase { final Customer customer = order.getCustomer(); assertNotNull(customer); - assertTrue(DB.getBeanState(customer).isReference()); + assertTrue(DB.beanState(customer).isReference()); final Throwable throwables[] = new Throwable[2]; Thread t1 = new Thread() { @@ -120,7 +120,7 @@ public class TestBasicLazy extends BaseTestCase { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0; } - assertFalse(DB.getBeanState(customer).isReference()); + assertFalse(DB.beanState(customer).isReference()); if (throwables[0] != null) { throw throwables[0]; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 46614dac7..dbb650815 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -58,7 +58,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { for (UUTwo u : list) { u.getMaster(); - //BeanState beanState = DB.getBeanState(master); + //BeanState beanState = DB.beanState(master); //assertTrue(beanState.isReference()); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 73f51607e..971c4e7cc 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -36,7 +36,7 @@ public class TestQueryJoin extends BaseTestCase { // list.get(0).getShipDate(); Order order = list.get(0); - BeanState beanStateOrder = DB.getBeanState(order); + BeanState beanStateOrder = DB.beanState(order); assertNotNull(beanStateOrder.getLoadedProps()); // assertTrue(beanStateOrder.getLoadedProps().contains("id")); assertTrue(beanStateOrder.getLoadedProps().contains("status")); @@ -44,7 +44,7 @@ public class TestQueryJoin extends BaseTestCase { assertTrue(beanStateOrder.getLoadedProps().contains("customer")); Customer customer = order.getCustomer(); - BeanState beanStateCustomer = DB.getBeanState(customer); + BeanState beanStateCustomer = DB.beanState(customer); assertTrue(beanStateCustomer.isReference()); customer.getName(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 46e3be975..097f13c20 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -91,7 +91,7 @@ public class TestCacheBasic extends BaseTestCase { // assertTrue("these 2 are different",c5 != c6); // // // by default readOnly based on deployment annotation - // assertTrue("read only",DB.getBeanState(c6).isReadOnly()); + // assertTrue("read only",DB.beanState(c6).isReadOnly()); // // try { // // can't modify a readOnly bean @@ -107,7 +107,7 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Explicitly NOT readOnly - // assertFalse("NOT read only",DB.getBeanState(c8).isReadOnly()); + // assertFalse("NOT read only",DB.beanState(c8).isReadOnly()); // // assertEquals("1 countries in cache", 1, countryCache.size()); // c8.setName("Nu Zilund"); @@ -122,12 +122,12 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Find loads cache ... - // assertFalse(DB.getBeanState(c9).isReadOnly()); + // assertFalse(DB.beanState(c9).isReadOnly()); // assertTrue(countryCache.size() > 0); // // Country c10 = DB.find(Country.class,"NZ"); // - // assertTrue(DB.getBeanState(c10).isReadOnly()); + // assertTrue(DB.beanState(c10).isReadOnly()); // assertTrue(countryCache.size() > 0); // // DB.cacheManager().clear(Country.class); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index 1ac26bf40..a71f52130 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -34,7 +34,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { .findOne(); foundOrder.setStatus(Order.Status.APPROVED); - assertTrue(DB.getBeanState(foundOrder).isDirty()); + assertTrue(DB.beanState(foundOrder).isDirty()); Customer foundCustomer = DB.find(Customer.class) .where().eq("id", customer.getId()) @@ -46,7 +46,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { Order order1 = foundCustomer.getOrders().get(0); assertSame(foundOrder, order1); - assertTrue(DB.getBeanState(foundOrder).isDirty()); + assertTrue(DB.beanState(foundOrder).isDirty()); } finally { DB.endTransaction(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index fceb16e79..8c70e5922 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -44,7 +44,7 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { assertNotNull(bean2); assertEquals("findById", bean2.getName()); bean2.setName("something"); - BeanState beanState = DB.getBeanState(bean2); + BeanState beanState = DB.beanState(bean2); assertTrue(beanState.isDirty()); //bean2.getChildren().size(); bean2.someRichObjectMethod(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index 4c84f6f22..71ecc925d 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -251,7 +251,7 @@ public class TestQueryCache extends BaseTestCase { assertTrue(list3.size() > 0); // TODO: At this stage setReadOnly(false) does create a shallow copy of the List/Set/Map, but does not // change the read only state in the entities. - // assertFalse(DB.getBeanState(list3.get(0)).isReadOnly()); + // assertFalse(DB.beanState(list3.get(0)).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java index cbd70ce07..0c4a56d67 100644 --- a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -29,7 +29,7 @@ public class TestProtectedConstructor extends BaseTestCase { Object newBeanInstance = entityBean._ebean_newInstance(); assertNotNull(newBeanInstance); - BeanState beanState = DB.getBeanState(newBeanInstance); + BeanState beanState = DB.beanState(newBeanInstance); assertTrue(beanState.isNew()); assertNotSame(entityBean, newBeanInstance); diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 5b723b5dc..8bc90c208 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -24,7 +24,7 @@ public class TestInsertQueryUpdate extends BaseTestCase { .setId(e0.getId()) .findOne(); - BeanState beanState = DB.getBeanState(e1); + BeanState beanState = DB.beanState(e1); Set loadedProps = beanState.getLoadedProps(); assertFalse(loadedProps.contains("description")); //lastUpdate diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index a1c74ef4e..da2ad82b6 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -101,7 +101,7 @@ public class TestJsonNodeBasic extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index 1e11adc54..1d497dbc7 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -58,7 +58,7 @@ public class TestJsonNodeBlob extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 867917605..8a809453f 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -58,7 +58,7 @@ public class TestJsonNodeJsonb extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 10546eeb7..7881a7d1d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -58,7 +58,7 @@ public class TestJsonNodeVarchar extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.getBeanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index 692f79f44..0ad676aa6 100644 --- a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -54,7 +54,7 @@ public class TestPrinterStateIssue extends BaseTestCase { state1.setFlags(7L); -// BeanState beanState = DB.getBeanState(printer1); +// BeanState beanState = DB.beanState(printer1); // Set changedProps = beanState.getChangedProps(); // System.out.println("changed: "+changedProps); diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index de4b88393..5715204c5 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -39,7 +39,7 @@ public class TestTextJsonSelfRef extends BaseTestCase { // Check that there are no 'reference' beans here for (SelfRefCustomer cust : customers) { - BeanState beanState = DB.getBeanState(cust); + BeanState beanState = DB.beanState(cust); assertFalse(beanState.isReference()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 3c9d43b02..aef260910 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -27,7 +27,7 @@ public class TestDefaultFetchLazy extends BaseTestCase { MyLobSize myLobSize = DB.find(MyLobSize.class, m.getId()); - BeanState beanState = DB.getBeanState(myLobSize); + BeanState beanState = DB.beanState(myLobSize); Set loadedProps = beanState.getLoadedProps(); assertNotNull(loadedProps); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java index c9b2663f8..78be3b140 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -25,24 +25,24 @@ public class TestQueryFindReadOnly extends BaseTestCase { Article ar1 = DB.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne(); assertNotNull(ar1); - assertTrue(DB.getBeanState(ar1).isReadOnly()); + assertTrue(DB.beanState(ar1).isReadOnly()); List
    ar1sections = ar1.getSections(); assertEquals(1, ar1sections.size()); Section s2 = ar1sections.get(0); - assertTrue(DB.getBeanState(s2).isReadOnly()); + assertTrue(DB.beanState(s2).isReadOnly()); DB.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList(); Article ar0 = DB.find(Article.class, a0.getId()); assertNotNull(ar0); - assertFalse(DB.getBeanState(ar0).isReadOnly()); + assertFalse(DB.beanState(ar0).isReadOnly()); List
    ar0sections = ar0.getSections(); Section s1 = ar0sections.get(0); - assertFalse(DB.getBeanState(s1).isReadOnly()); + assertFalse(DB.beanState(s1).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 328cf521a..d37a9cef4 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -23,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { Customer c = custList.get(0); List contacts2 = c.getContacts(); - assertEquals(3, DB.getBeanState(c).getLoadedProps().size()); + assertEquals(3, DB.beanState(c).getLoadedProps().size()); // now lazy load the contacts contacts2.size(); @@ -32,7 +32,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { // we only "loaded" the contacts BeanList and not all of c2 List contacts = c2.getContacts(); - // Set loadedProps = DB.getBeanState(c2).getLoadedProps(); + // Set loadedProps = DB.beanState(c2).getLoadedProps(); // assertEquals(1, loadedProps.size()); // now lazy load the contacts diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 3783860a0..2874a4bf3 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -27,7 +27,7 @@ public class TestNativeSqlBasic extends BaseTestCase { List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = DB.getBeanState(customers.get(0)); + BeanState beanState = DB.beanState(customers.get(0)); assertThat(beanState.getLoadedProps()).contains("id", "name"); } @@ -42,7 +42,7 @@ public class TestNativeSqlBasic extends BaseTestCase { List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = DB.getBeanState(customers.get(0)); + BeanState beanState = DB.beanState(customers.get(0)); assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); } @@ -193,7 +193,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); - BeanState beanState = DB.getBeanState(customers.get(0)); + BeanState beanState = DB.beanState(customers.get(0)); assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); } @@ -209,7 +209,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); - BeanState beanState = DB.getBeanState(customers.get(0)); + BeanState beanState = DB.beanState(customers.get(0)); assertThat(beanState.getLoadedProps()).contains("id", "name"); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index 9dbe34d57..ef82e31f8 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -36,7 +36,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { assertEquals(Integer.valueOf(123), customer.getId()); assertEquals("Hello rob", customer.getName()); - BeanState beanState = DB.getBeanState(customer); + BeanState beanState = DB.beanState(customer); Set loadedProps = beanState.getLoadedProps(); assertEquals(2, loadedProps.size()); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index d84d4ba06..c92e83be9 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -32,7 +32,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { Product product = DB.getReference(Product.class, 1); - BeanState beanState0 = DB.getBeanState(product); + BeanState beanState0 = DB.beanState(product); if (!beanState0.isReference()) { // got a cached value from beanCache @@ -46,7 +46,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { EntityBean eb = (EntityBean) refProd; prodDesc.isReference(eb._ebean_getIntercept()); - BeanState beanState = DB.getBeanState(refProd); + BeanState beanState = DB.beanState(refProd); assertTrue(beanState.isNew()); String name = refProd.getName(); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java index 5727e721d..fc173c957 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -37,7 +37,7 @@ public class TestBeanStateReset extends BaseTestCase { } catch (PersistenceException e) { logger.info("expected error " + e.getMessage()); - DB.getBeanState(b).resetForInsert(); + DB.beanState(b).resetForInsert(); b.getCs().clear(); LoggedSqlCollector.start(); diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 9855d66e3..78d641a1a 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -31,7 +31,7 @@ public class TestFileTypeFetching extends BaseTestCase { .setId(bean0.getId()) .findOne(); - BeanState beanState = DB.getBeanState(bean1); + BeanState beanState = DB.beanState(bean1); Set loadedProps = beanState.getLoadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); From e95442d8ec04276e1cbbf825febda973a2d1d1c5 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 18:13:03 +1200 Subject: [PATCH 068/102] #2357 - Update tests to use reference() --- .../core/DefaultServer_getReferenceTest.java | 8 ++++---- .../TestReferenceWithConstructorProperties.java | 2 +- .../java/org/tests/basic/TestBatchLazyMany.java | 2 +- .../tests/basic/TestBeanReferenceRefresh.java | 2 +- .../java/org/tests/basic/TestManyLazyLoad.java | 4 ++-- .../org/tests/basic/TestPersistenceContext.java | 2 +- .../java/org/tests/basic/TestQueryWithCache.java | 6 +++--- .../tests/basic/delete/TestDeleteByIdList.java | 2 +- .../basic/delete/TestDeleteCascadeById.java | 2 +- .../batchload/TestLazyLoadNonExistantBean.java | 2 +- .../batchload/TestLazyLoadNonExistentBean.java | 2 +- .../java/org/tests/cache/TestCacheBasic.java | 8 ++++---- .../java/org/tests/cache/TestCacheCustomer.java | 2 +- .../java/org/tests/ddl/TestForeignKeyModes.java | 2 +- .../TestDeleteWithoutOptimisticLocking.java | 10 +++++----- .../tests/inheritance/TestInheritanceOnMany.java | 6 +++--- .../org/tests/inheritance/TestIntInherit.java | 2 +- .../inheritance/cache/TestInheritanceCache.java | 4 ++-- .../insert/TestInsertDataIntegrityException.java | 2 +- .../org/tests/model/basic/ResetBasicData.java | 16 ++++++++-------- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../java/org/tests/model/pview/TestPview.java | 2 +- .../java/org/tests/o2o/TestReferenceSave.java | 2 +- .../java/org/tests/query/TestManyWhereJoin.java | 4 ++-- .../org/tests/query/TestRefToLazyLoadMany.java | 2 +- .../query/orderby/TestOrderByWithDistinct.java | 2 +- .../text/json/TestTextJsonReferenceBean.java | 2 +- .../text/json/TestTextJsonUpdateCascade.java | 6 +++--- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index 9978e816d..bbf2786b4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -15,7 +15,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { @Test public void getReference_noPC() { - DB.getReference(Customer.class, 42); + DB.reference(Customer.class, 42); } @Test @@ -25,7 +25,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { DB.execute(() -> { Customer loaded = DB.find(Customer.class, 1); - Customer reference = DB.getReference(Customer.class, 1); + Customer reference = DB.reference(Customer.class, 1); assertThat(loaded).isSameAs(reference); }); } @@ -38,7 +38,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { car.setDriver("TestForRef"); DB.save(car); - Vehicle reference = DB.getReference(Vehicle.class, car.getId()); + Vehicle reference = DB.reference(Vehicle.class, car.getId()); assertThat(reference).isInstanceOf(Car.class); assertThat(reference.getId()).isSameAs(car.getId()); @@ -56,7 +56,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { DB.execute(() -> { Vehicle loaded = DB.find(Vehicle.class, car.getId()); - Vehicle reference = DB.getReference(Vehicle.class, car.getId()); + Vehicle reference = DB.reference(Vehicle.class, car.getId()); assertThat(reference).isSameAs(loaded); } ); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 2d03fdac0..43243f2c4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -23,7 +23,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { public void test() { ResetBasicData.reset(); - Order order = DB.getReference(Order.class, 1); + Order order = DB.reference(Order.class, 1); BeanState beanState = DB.beanState(order); Set loadedProps = beanState.getLoadedProps(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java index e89da100d..1823cc8f1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -13,7 +13,7 @@ public class TestBatchLazyMany extends BaseTestCase { ResetBasicData.reset(); - Order order2 = DB.getReference(Order.class, 1); + Order order2 = DB.reference(Order.class, 1); order2.getOrderDate(); // List list = DB.find(Order.class) diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index d8cfe9157..1ed9ffc14 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -23,7 +23,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase { ServerCache beanCache = DB.cacheManager().beanCache(Order.class); beanCache.clear(); - Order order = DB.getReference(Order.class, 1); + Order order = DB.reference(Order.class, 1); assertTrue(DB.beanState(order).isReference()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java index ca55ea535..00aac40f4 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -28,7 +28,7 @@ public class TestManyLazyLoad extends BaseTestCase { Order order = list.get(0); // get it as a reference - Order order1 = DB.getReference(Order.class, order.getId()); + Order order1 = DB.reference(Order.class, order.getId()); assertNotNull(order1); Date orderDate = order1.getOrderDate(); @@ -48,7 +48,7 @@ public class TestManyLazyLoad extends BaseTestCase { DB.find(OrderDetail.class, orderDetail.getId()); // change order... list before a scalar property - Order order2 = DB.getReference(Order.class, order.getId()); + Order order2 = DB.reference(Order.class, order.getId()); assertNotNull(order2); List details2 = order2.getDetails(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java index c9c282ec3..9d9d8becd 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -37,7 +37,7 @@ public class TestPersistenceContext extends BaseTestCase { // finds an existing bean in the persistence context // ... so doesn't even execute a query Order o2 = DB.find(Order.class, 1); - Order o3 = DB.getReference(Order.class, 1); + Order o3 = DB.reference(Order.class, 1); // all the same instance assertTrue(order == o2); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 078c2eb43..681c7807f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -36,15 +36,15 @@ public class TestQueryWithCache extends BaseTestCase { ServerCache beanCache = serverCacheManager.beanCache(Country.class); assertEquals(0, beanCache.size()); - Country nz1 = DB.getReference(Country.class, "NZ"); + Country nz1 = DB.reference(Country.class, "NZ"); assertEquals(0, beanCache.size()); // has the effect of loading the cache via lazy loading nz1.getName(); assertEquals(1, beanCache.size()); - Country nz2 = DB.getReference(Country.class, "NZ"); - Country nz2b = DB.getReference(Country.class, "NZ"); + Country nz2 = DB.reference(Country.class, "NZ"); + Country nz2b = DB.reference(Country.class, "NZ"); Country nz3 = DB.find(Country.class, "NZ"); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index bb8c0c554..095b192de 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -21,7 +21,7 @@ public class TestDeleteByIdList extends BaseTestCase { ResetBasicData.reset(); - OrderDetail dummy = DB.getReference(OrderDetail.class, 1); + OrderDetail dummy = DB.reference(OrderDetail.class, 1); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 2b7129050..ead179968 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -21,7 +21,7 @@ public class TestDeleteCascadeById extends BaseTestCase { ResetBasicData.reset(); - OrderDetail dummy = DB.getReference(OrderDetail.class, 1); + OrderDetail dummy = DB.reference(OrderDetail.class, 1); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 31e399015..8137164a1 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -16,7 +16,7 @@ public class TestLazyLoadNonExistantBean extends BaseTestCase { public void testSimple() { UUID uuid = UUID.randomUUID(); - UUOne one = DB.getReference(UUOne.class, uuid); + UUOne one = DB.reference(UUOne.class, uuid); try { // invoke lazy loading diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 43b12bee9..7e20c0990 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -16,7 +16,7 @@ public class TestLazyLoadNonExistentBean extends BaseTestCase { public void testSimple() { UUID uuid = UUID.randomUUID(); - UUOne one = DB.getReference(UUOne.class, uuid); + UUOne one = DB.reference(UUOne.class, uuid); try { // invoke lazy loading diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 097f13c20..042c02d51 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -26,13 +26,13 @@ public class TestCacheBasic extends BaseTestCase { // reset the statistics countryCache.statistics(true); - Country c0 = DB.getReference(Country.class, "NZ"); + Country c0 = DB.reference(Country.class, "NZ"); ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); assertEquals(1, hc); assertNotNull(c0); - // Country c1 = DB.getReference(Country.class, "NZ"); + // Country c1 = DB.reference(Country.class, "NZ"); // assertEquals(2, countryCache.getStatistics(false).getHitCount()); // //assertEquals(100, // countryCache.getStatistics(false).getHitRatio()); @@ -62,7 +62,7 @@ public class TestCacheBasic extends BaseTestCase { // // assertTrue(countryCache.getStatistics(false).getHitCount() > 0); // - // //Country c3 = DB.getReference(Country.class, "NZ"); + // //Country c3 = DB.reference(Country.class, "NZ"); // //Country c4 = DB.find(Country.class, "NZ"); // // @@ -134,7 +134,7 @@ public class TestCacheBasic extends BaseTestCase { // assertEquals("0 country in cache", 0, countryCache.size()); // // // reference doesn't load cache yet - // Country c11 = DB.getReference(Country.class, "NZ"); + // Country c11 = DB.reference(Country.class, "NZ"); // // // still 0 in cache // assertEquals("0 country in cache", 0, countryCache.size()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java index 32f2a3c40..bb3c01e6e 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -21,7 +21,7 @@ public class TestCacheCustomer extends BaseTestCase { ResetBasicData.reset(); - Country nz = DB.getReference(Country.class, "NZ"); + Country nz = DB.reference(Country.class, "NZ"); Address address = new Address(); address.setLine1("Some Place"); address.setCity("Auckland"); diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java index de6e66ad1..791bfef69 100644 --- a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -53,7 +53,7 @@ public class TestForeignKeyModes extends BaseTestCase { @Test public void noneViaManyToMany() { - DfkOne one = DB.getReference(DfkOne.class, 999L); + DfkOne one = DB.reference(DfkOne.class, 999L); DfkNoneViaMtoM none = new DfkNoneViaMtoM("none2"); none.getOnes().add(one); diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index d78015f5d..ff6dd9c33 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -17,13 +17,13 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { public void testSimpleBeanDelete_missingBean_returnsFalse() { // delete by by without version loaded ... should not throw OptimisticLockException - Contact ref = DB.getReference(Contact.class, 999999); + Contact ref = DB.reference(Contact.class, 999999); assertThat(DB.delete(ref)).isFalse(); assertThat(DB.delete(Contact.class, 999999)).isEqualTo(0); // same as above but using Model.delete() - Group modelRef = DB.getReference(Group.class, 999999); + Group modelRef = DB.reference(Group.class, 999999); assertThat(modelRef.delete()).isFalse(); } @@ -33,7 +33,7 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { EBasicVer basic = new EBasicVer("DelTest"); DB.save(basic); - EBasicVer basicRef = DB.getReference(EBasicVer.class, basic.getId()); + EBasicVer basicRef = DB.reference(EBasicVer.class, basic.getId()); assertThat(DB.delete(basicRef)).isTrue(); } @@ -50,10 +50,10 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { transaction.setBatchMode(true); // returns true even though the delete has not occurred yet - assertThat(server.delete(DB.getReference(EBasicVer.class, basic.getId()), transaction)).isTrue(); + assertThat(server.delete(DB.reference(EBasicVer.class, basic.getId()), transaction)).isTrue(); // returns true even though the bean does not exist - assertThat(server.delete(DB.getReference(EBasicVer.class, 999999), transaction)).isTrue(); + assertThat(server.delete(DB.reference(EBasicVer.class, 999999), transaction)).isTrue(); transaction.commit(); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index fb25b01d8..587d935d2 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -64,7 +64,7 @@ public class TestInheritanceOnMany extends BaseTestCase { LoggedSqlCollector.start(); // Dog is concrete so we return as Dog even though // it could be a BigDog (so we are trusting the caller) - Dog ref = DB.getReference(Dog.class, dog.getId()); + Dog ref = DB.reference(Dog.class, dog.getId()); List sql = LoggedSqlCollector.stop(); assertThat(sql).isEmpty(); @@ -83,7 +83,7 @@ public class TestInheritanceOnMany extends BaseTestCase { DB.save(bd); LoggedSqlCollector.start(); - BigDog bigDog = DB.getReference(BigDog.class, bd.getId()); + BigDog bigDog = DB.reference(BigDog.class, bd.getId()); List sql = LoggedSqlCollector.stop(); assertThat(sql).isEmpty(); @@ -95,7 +95,7 @@ public class TestInheritanceOnMany extends BaseTestCase { LoggedSqlCollector.start(); // Animal is abstract so we hit the DB - Animal animal = DB.getReference(Animal.class, bd.getId()); + Animal animal = DB.reference(Animal.class, bd.getId()); sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java index 421e51504..438f18cb3 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -37,7 +37,7 @@ public class TestIntInherit extends BaseTestCase { TIntRoot result1 = DB.find(TIntRoot.class, r.getId()); assertTrue(result1 instanceof TIntRoot); - TIntRoot ref3 = DB.getReference(TIntRoot.class, c1.getId()); + TIntRoot ref3 = DB.reference(TIntRoot.class, c1.getId()); assertTrue(ref3 instanceof TIntRoot); TIntRoot result3 = DB.find(TIntRoot.class, c1.getId()); diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index b01f37f71..a87ebd3ff 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -33,10 +33,10 @@ public class TestInheritanceCache extends BaseTestCase { assertThat(gotOneFromCache).isInstanceOf(CInhOne.class); - CInhRoot refOne = DB.getReference(CInhRoot.class, one.getId()); + CInhRoot refOne = DB.reference(CInhRoot.class, one.getId()); assertThat(refOne).isInstanceOf(CInhOne.class); - CInhRoot refOneSub = DB.getReference(CInhOne.class, one.getId()); + CInhRoot refOneSub = DB.reference(CInhOne.class, one.getId()); assertThat(refOneSub).isNotNull(); } } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index e645e3248..c4c0095df 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -24,7 +24,7 @@ public class TestInsertDataIntegrityException extends BaseTestCase { ResetBasicData.reset(); // an invalid foreign key value - Customer invalidCustomer = DB.getReference(Customer.class, 900000); + Customer invalidCustomer = DB.reference(Customer.class, 900000); Order order = new Order(); order.setStatus(Order.Status.NEW); diff --git a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java b/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java index cac700f04..6a01db649 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java @@ -237,7 +237,7 @@ public class ResetBasicData { shippingAddr.setLine1(shippingStreet); shippingAddr.setLine2("Sandringham"); shippingAddr.setCity("Auckland"); - shippingAddr.setCountry(DB.getReference(Country.class, "NZ")); + shippingAddr.setCountry(DB.reference(Country.class, "NZ")); c.setShippingAddress(shippingAddr); } @@ -247,7 +247,7 @@ public class ResetBasicData { billingAddr.setLine1(billingStreet); billingAddr.setLine2("St Lukes"); billingAddr.setCity("Auckland"); - billingAddr.setCountry(DB.getReference(Country.class, "NZ")); + billingAddr.setCountry(DB.reference(Country.class, "NZ")); c.setBillingAddress(billingAddr); } @@ -257,9 +257,9 @@ public class ResetBasicData { private Order createOrder1(Customer customer) { - Product product1 = DB.getReference(Product.class, 1); - Product product2 = DB.getReference(Product.class, 2); - Product product3 = DB.getReference(Product.class, 3); + Product product1 = DB.reference(Product.class, 1); + Product product2 = DB.reference(Product.class, 2); + Product product3 = DB.reference(Product.class, 3); Order order = new Order(); @@ -281,7 +281,7 @@ public class ResetBasicData { private void createOrder2(Customer customer) { - Product product1 = DB.getReference(Product.class, 1); + Product product1 = DB.reference(Product.class, 1); Order order = new Order(); order.setStatus(Status.SHIPPED); @@ -299,8 +299,8 @@ public class ResetBasicData { private void createOrder3(Customer customer) { - Product product1 = DB.getReference(Product.class, 1); - Product product3 = DB.getReference(Product.class, 3); + Product product1 = DB.reference(Product.class, 1); + Product product3 = DB.reference(Product.class, 3); Order order = new Order(); order.setStatus(Status.COMPLETE); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index c29d5cdf3..234deee5f 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -24,7 +24,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { DB.getDefault().cacheManager().clearAll(); - Country nz = DB.getReference(Country.class, "NZ"); + Country nz = DB.reference(Country.class, "NZ"); EAddr addr = new EAddr("Foo", "Bar", nz); EPerAddr perAddr = new EPerAddr("Embed", addr); diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java index 7bc0c2c1c..72d885173 100644 --- a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java @@ -14,7 +14,7 @@ public class TestPview extends BaseTestCase { @Test public void test() { - Wview wview = DB.getReference(Wview.class, UUID.randomUUID()); + Wview wview = DB.reference(Wview.class, UUID.randomUUID()); Query query = DB.find(Paggview.class); query.select("amount"); diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java index 31369ca77..9c4e53fcb 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -19,7 +19,7 @@ public class TestReferenceSave { LoggedSqlCollector.start(); - EPersonOnline bean = DB.getReference(EPersonOnline.class, 1L); + EPersonOnline bean = DB.reference(EPersonOnline.class, 1L); DB.save(bean); List sql = LoggedSqlCollector.current(); diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java index 44c8eeb19..d33edf7bb 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -118,7 +118,7 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Product product = DB.getReference(Product.class, 1L); + Product product = DB.reference(Product.class, 1L); Query query = DB.find(Order.class) //.fetch("details") @@ -152,7 +152,7 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); - Product product = DB.getReference(Product.class, 1L); + Product product = DB.reference(Product.class, 1L); Query query = DB.find(Order.class) .fetch("details") diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index d37a9cef4..fba33585a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -28,7 +28,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { // now lazy load the contacts contacts2.size(); - Customer c2 = DB.getReference(Customer.class, c.getId()); + Customer c2 = DB.reference(Customer.class, c.getId()); // we only "loaded" the contacts BeanList and not all of c2 List contacts = c2.getContacts(); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index be0852516..4d32e02ab 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -43,7 +43,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { @IgnorePlatform({Platform.MYSQL, Platform.MARIADB, Platform.SQLSERVER, Platform.NUODB}) // do not support nulls first/last public void testDistinctOn() { - MRole role = DB.getReference(MRole.class, 1); + MRole role = DB.reference(MRole.class, 1); Query query = DB.find(MUser.class) .where() diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index c92e83be9..610a2c424 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -30,7 +30,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { JsonContext jsonContext = DB.json(); - Product product = DB.getReference(Product.class, 1); + Product product = DB.reference(Product.class, 1); BeanState beanState0 = DB.beanState(product); if (!beanState0.isReference()) { diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index c43c96a98..1106d660f 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -20,7 +20,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { Customer c0 = ResetBasicData.createCustAndOrder("Test Json"); - Customer c2 = DB.getReference(Customer.class, c0.getId()); + Customer c2 = DB.reference(Customer.class, c0.getId()); List orders = c2.getOrders(); assertEquals(1, orders.size()); @@ -30,7 +30,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { assertTrue(size >= 3); - Customer cref = DB.getReference(Customer.class, c0.getId()); + Customer cref = DB.reference(Customer.class, c0.getId()); order.setCustomer(cref); order.setStatus(Status.SHIPPED); @@ -42,7 +42,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { OrderDetail removedDetail = order.getDetails().remove(2); assertNotNull(removedDetail); - Product p = DB.getReference(Product.class, 1); + Product p = DB.reference(Product.class, 1); OrderDetail newDetail = new OrderDetail(p, 899, 12.12d); // newDetail.setOrder(order); order.addDetail(newDetail); From 66143280fa106b751dfbfb5867cdc4f188b18aea Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 21:44:07 +1200 Subject: [PATCH 069/102] #2357 - Update tests to move away from deprecated methods --- .../BinaryTransactionEventReadWriteTest.java | 11 +++-------- .../java/org/tests/basic/TestM2MVanilla.java | 2 +- .../tests/basic/encrypt/TestEncryptBinary.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 2 +- .../model/basic/mapsuper/MapSuperNoId.java | 4 ++-- .../basic/xtra/TestDeleteUnloadedChildren.java | 4 ++-- .../tests/model/embedded/UserInterestLive.java | 4 ++-- .../org/tests/model/joda/BasicJodaEntity.java | 8 ++++---- .../java/org/tests/model/noid/NoIdBean.java | 4 ++-- .../o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../org/tests/query/TestQueryFindNative.java | 2 +- .../src/test/java/io/ebean/BaseTestCase.java | 18 +++++++++--------- .../ddlgeneration/BaseDdlHandlerTest.java | 11 +++++------ .../platform/BaseTableDdlTest.java | 10 ++++------ .../platform/H2HistoryDdlTest.java | 10 +++++----- .../PlatformDdl_dropUniqueConstraintTest.java | 18 +++++++++--------- .../model/build/ModelBuildBeanVisitorTest.java | 2 +- .../company/domain/TestInheritAbstract.java | 7 +++---- .../tests/model/basic/test/BaseTestCase.java | 2 +- 19 files changed, 57 insertions(+), 66 deletions(-) diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index c6bb66196..8ca823b84 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.cluster.binarymessage; import io.ebean.BaseTestCase; -import io.ebean.Database; import io.ebean.EbeanServer; import io.ebeaninternal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; @@ -26,11 +25,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class BinaryTransactionEventReadWriteTest extends BaseTestCase { - private BeanDescriptor customerBeanDescriptor = getBeanDescriptor(Customer.class); - - private TDEbeanServer mockEbeanServer = new TDEbeanServer(); - - private BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup()); + private final BeanDescriptor customerBeanDescriptor = getBeanDescriptor(Customer.class); + private final TDEbeanServer mockEbeanServer = new TDEbeanServer(); + private final BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup()); @Override protected BeanDescriptor getBeanDescriptor(Class cls) { @@ -80,7 +77,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase { @Test public void readWrite_RemoteTableMod() throws IOException { - RemoteTransactionEvent event = new RemoteTransactionEvent("db"); Set tables = new HashSet<>(); @@ -96,7 +92,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase { } class TDServerLookup implements ServerLookup { - @Override public EbeanServer getServer(String name) { return mockEbeanServer; diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java index 8137cf2fa..1f4e09106 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -17,7 +17,7 @@ public class TestM2MVanilla extends BaseTestCase { @Test public void testVanilla() { - DB.createSqlUpdate("delete from mrole_muser").execute(); + DB.sqlUpdate("delete from mrole_muser").execute(); DB.sqlUpdate("delete from mrole").execute(); DB.sqlUpdate("delete from muser").execute(); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 3265bf574..6c26ee0fe 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -24,7 +24,7 @@ public class TestEncryptBinary extends BaseTestCase { DB.save(e); - SqlRow row = DB.createSqlQuery("select * from e_basicenc_bin where id = :id") + SqlRow row = DB.sqlQuery("select * from e_basicenc_bin where id = :id") .setParameter("id", e.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index f19c9ad52..5798beb57 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -30,7 +30,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { Transaction txn = server().beginTransaction(); try { EBasicWithUniqueCon v2 = createEntityWithName("conflict", "after"); - txn.flushBatch(); + txn.flush(); Savepoint sp = txn.getConnection().setSavepoint(); try { server().save(v2); // unique key violation diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index 22b535c86..d9781a5cb 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -1,6 +1,6 @@ package org.tests.model.basic.mapsuper; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.MappedSuperclass; import javax.persistence.Version; @@ -9,7 +9,7 @@ import java.sql.Timestamp; @MappedSuperclass public class MapSuperNoId { - @CreatedTimestamp + @WhenCreated Timestamp whenCreated; @Version diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index c29334653..6b553e01a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -17,11 +17,11 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { SqlUpdate delete; sql = "delete from td_child"; - delete = DB.createSqlUpdate(sql); + delete = DB.sqlUpdate(sql); delete.execute(); sql = "delete from td_parent"; - delete = DB.createSqlUpdate(sql); + delete = DB.sqlUpdate(sql); delete.execute(); EdParent parent = new EdParent(); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java index 286ef97fb..341f0670e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -1,7 +1,7 @@ package org.tests.model.embedded; import io.ebean.Model; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.EmbeddedId; import javax.persistence.Entity; @@ -13,7 +13,7 @@ public class UserInterestLive extends Model { @EmbeddedId private final UserInterestLiveKey key; - @CreatedTimestamp + @WhenCreated private Date createdAt; public UserInterestLive(UserInterestLiveKey key) { diff --git a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java index 78ce42408..66bb6db7a 100644 --- a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java +++ b/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -1,7 +1,7 @@ package org.tests.model.joda; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; @@ -19,10 +19,10 @@ public class BasicJodaEntity { String name; - @CreatedTimestamp + @WhenCreated LocalDateTime created; - @UpdatedTimestamp + @WhenModified DateTime updated; Period period; diff --git a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java index 129f33757..b43c344a5 100644 --- a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java +++ b/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java @@ -1,6 +1,6 @@ package org.tests.model.noid; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.Entity; import javax.persistence.Table; @@ -14,7 +14,7 @@ public class NoIdBean { String subject; - @CreatedTimestamp + @WhenCreated Timestamp whenCreated; public String getName() { diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 560f86ee9..3a3a158a4 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -50,7 +50,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { long intersectionRows = DB.sqlQuery("select count(*) as total from troop_monkey where troop_pid = ?") .setParameter(1, troop.getPid()) - .findSingleLong(); + .mapToScalar(Long.class).findOne(); assertThat(intersectionRows).isEqualTo(2L); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java index 35693707e..eea920c75 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java @@ -124,7 +124,7 @@ public class TestQueryFindNative extends BaseTestCase { List ids = DB.sqlQuery(sql) .setParameter(1, "J%") - .findSingleAttributeList(Integer.class); + .mapToScalar(Integer.class).findList(); List idsScalar = server() diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 1d7d8d057..29a0bb78f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -158,7 +158,7 @@ public abstract class BaseTestCase { } public boolean isPlatformCaseSensitive() { - return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation(); + return spiEbeanServer().databasePlatform().isCaseSensitiveCollation(); } /** @@ -206,7 +206,7 @@ public abstract class BaseTestCase { } public boolean isPlatformBooleanNative() { - return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType(); + return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType(); } public boolean isPlatformOrderNullsSupport() { @@ -214,11 +214,11 @@ public abstract class BaseTestCase { } public boolean isPlatformSupportsDeleteTableAlias() { - return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias(); + return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias(); } public boolean isPersistBatchOnCascade() { - return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } /** @@ -237,19 +237,19 @@ public abstract class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().databasePlatform().getPlatform().base(); } protected IdType idType() { - return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType(); + return spiEbeanServer().databasePlatform().getDbIdentity().getIdType(); } protected SpiEbeanServer spiEbeanServer() { return (SpiEbeanServer) DB.getDefault(); } - protected EbeanServer server() { - return Ebean.getDefaultServer(); + protected Database server() { + return DB.getDefault(); } /** @@ -283,7 +283,7 @@ public abstract class BaseTestCase { } protected String concat(String property0, String separator, String property1, String suffix) { - DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform()); + DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); return dbExpressionHandler.concat(property0, separator, property1, suffix); } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index cef125750..6065448bc 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.ddlgeneration; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.config.ServerConfig; +import io.ebean.DB; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class BaseDdlHandlerTest extends BaseTestCase { - private ServerConfig serverConfig = new ServerConfig(); + private final DatabaseConfig serverConfig = new DatabaseConfig(); private DdlHandler handler(DatabasePlatform platform) { return PlatformDdlBuilder.create(platform).createDdlHandler(serverConfig); @@ -227,7 +227,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { @Test public void generateChangeSetFromModel() throws Exception { - SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault(); ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet(); @@ -246,8 +246,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { @Disabled @Test public void generateChangeSetFromModel_given_postgresTypes() throws Exception { - - SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault(); ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index b087803db..d6af52969 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java @@ -1,18 +1,18 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.oracle.OraclePlatform; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; import io.ebeaninternal.dbmigration.ddlgeneration.Helper; +import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateTable; -import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -24,13 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class BaseTableDdlTest { - private ServerConfig serverConfig = new ServerConfig(); - - private PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform()); + private final DatabaseConfig serverConfig = new DatabaseConfig(); + private final PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform()); @Test public void testAlterColumn() throws IOException { - BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl); DdlWrite write = new DdlWrite(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 62b0f535c..a23a7ad79 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -1,14 +1,14 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; +import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.dbmigration.model.MConfiguration; import io.ebeaninternal.dbmigration.model.ModelContainer; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -19,7 +19,7 @@ public class H2HistoryDdlTest { @Test public void testRegenerateHistoryTriggers() throws Exception { - SpiEbeanServer ebeanServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer ebeanServer = (SpiEbeanServer) DB.getDefault(); HistoryTableUpdate update = new HistoryTableUpdate("c_user"); update.add(HistoryTableUpdate.Change.ADD, "one"); @@ -32,7 +32,7 @@ public class H2HistoryDdlTest { H2Platform h2Platform = new H2Platform(); PlatformDdl h2Ddl = PlatformDdlBuilder.create(h2Platform); - h2Ddl.configure(ebeanServer.getServerConfig()); + h2Ddl.configure(ebeanServer.config()); h2Ddl.regenerateHistoryTriggers(write, update); assertThat(write.applyHistoryView().isEmpty()).isFalse(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java index 0139565dd..00a6e271d 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; @@ -14,12 +14,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class PlatformDdl_dropUniqueConstraintTest { - private PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform()); - private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform()); - private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform()); - private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform()); - private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform()); - private PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); + private final PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform()); + private final PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform()); + private final PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform()); + private final PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform()); + private final PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform()); + private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); @Test public void test() throws Exception { @@ -39,8 +39,8 @@ public class PlatformDdl_dropUniqueConstraintTest { sql = mysqlDdl.alterTableDropUniqueConstraint("mytab", "uq_name"); assertEquals("alter table mytab drop index uq_name", sql); - ServerConfig serverConfig = new ServerConfig(); - hanaDdl.configure(serverConfig); + DatabaseConfig config = new DatabaseConfig(); + hanaDdl.configure(config); sql = hanaDdl.alterTableDropUniqueConstraint("mytab", "uq_name"); assertEquals("delimiter $$\n" + "do\n" + diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java index 70c0d70e1..7c2e32b9d 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java @@ -34,7 +34,7 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase { ModelContainer model = new ModelContainer(); - DbConstraintNaming constraintNaming = defaultServer.getServerConfig().getConstraintNaming(); + DbConstraintNaming constraintNaming = defaultServer.config().getConstraintNaming(); constraintNaming.setMaxLength(new DefaultConstraintMaxLength(60)); ModelBuildContext ctx = new ModelBuildContext(model, new H2Platform(), constraintNaming, true); diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 46596e2a3..1fa9faf7b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import java.util.List; @@ -13,8 +13,7 @@ public class TestInheritAbstract { @Test public void testMe() { - - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); List list0 = server.find(AbstractBar.class) .findList(); diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java index 39427f5da..047c4a143 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java @@ -11,7 +11,7 @@ public class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().platform().base(); } protected SpiEbeanServer spiEbeanServer() { From 3ac8d6e1d325120994430df900075e6ca8a71a18 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 7 Sep 2021 21:45:23 +1200 Subject: [PATCH 070/102] #2357 - Modify ddl-generator CurrentModel away from deprecated methods --- .../dbmigration/DefaultDbMigration.java | 4 ++-- .../dbmigration/model/CurrentModel.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index 5bb40fa08..a7a3703d7 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -128,7 +128,7 @@ public class DefaultDbMigration implements DbMigration { @Override public void setServer(Database database) { this.server = (SpiEbeanServer) database; - setServerConfig(server.getServerConfig()); + setServerConfig(server.config()); } @Override @@ -677,7 +677,7 @@ public class DefaultDbMigration implements DbMigration { } if (vanillaPlatform || databasePlatform == null) { // not explicitly set so use the platform of the server - databasePlatform = server.getDatabasePlatform(); + databasePlatform = server.databasePlatform(); } if (databaseConfig != null) { if (strictMode != null) { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java index 0ff9a9bc4..e5c8743d2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java @@ -42,7 +42,7 @@ public class CurrentModel { * Construct with a given EbeanServer instance for DDL create all generation, not migration. */ public CurrentModel(SpiEbeanServer server) { - this(server, server.getServerConfig().getConstraintNaming(), true); + this(server, server.config().getConstraintNaming(), true); } /** @@ -58,11 +58,11 @@ public class CurrentModel { private CurrentModel(SpiEbeanServer server, DbConstraintNaming constraintNaming, boolean platformTypes) { this.server = server; - this.databasePlatform = server.getDatabasePlatform(); + this.databasePlatform = server.databasePlatform(); this.constraintNaming = constraintNaming; this.platformTypes = platformTypes; - this.ddlHeader = server.getServerConfig().getDdlHeader(); - this.jaxbPresent = Detect.isJAXBPresent(server.getServerConfig()); + this.ddlHeader = server.config().getDdlHeader(); + this.jaxbPresent = Detect.isJAXBPresent(server.config()); } public DdlOptions getDdlOptions() { @@ -139,7 +139,7 @@ public class CurrentModel { if (extraDdl != null) { List ddlScript = extraDdl.getDdlScript(); for (DdlScript script : ddlScript) { - if (script.isInit() && matchPlatform(server.getDatabasePlatform().getPlatform(), script.getPlatforms())) { + if (script.isInit() && matchPlatform(server.platform(), script.getPlatforms())) { ddl.append(prefix).append(script.getName()).append('\n'); ddl.append(script.getValue()); } @@ -181,7 +181,7 @@ public class CurrentModel { * Return the platform specific DdlHandler (to generate DDL). */ private DdlHandler handler() { - return PlatformDdlBuilder.create(databasePlatform).createDdlHandler(server.getServerConfig()); + return PlatformDdlBuilder.create(databasePlatform).createDdlHandler(server.config()); } /** From 01e07dd2be6b7c3e448d57eb3dac785aaa2c4264 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 10:30:18 +1200 Subject: [PATCH 071/102] #2358 - Rename BeanState methods with deprecation --- .../src/main/java/io/ebean/BeanState.java | 56 ++++++++++++++++--- .../server/core/DefaultBeanState.java | 10 ++-- .../java/io/ebean/TestDirtyProperties.java | 12 ++-- .../io/ebean/TestUnsetLoadedProperties.java | 16 +++--- .../java/io/ebean/event/BeanPostLoadTest.java | 2 +- ...estReferenceWithConstructorProperties.java | 2 +- .../tests/basic/TestBeanReferenceRefresh.java | 4 +- .../org/tests/basic/TestLazyLoadInCache.java | 9 ++- .../org/tests/batchload/TestBeanState.java | 20 +++---- .../org/tests/batchload/TestQueryJoin.java | 18 +++--- .../org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../org/tests/json/TestDbJson_Jackson3.java | 24 ++++---- .../java/org/tests/json/TestDbJson_List.java | 10 +--- .../org/tests/json/TestJsonNodeBasic.java | 6 +- .../java/org/tests/json/TestJsonNodeBlob.java | 6 +- .../org/tests/json/TestJsonNodeJsonb.java | 6 +- .../org/tests/json/TestJsonNodeVarchar.java | 7 +-- .../java/org/tests/json/TestOldValue.java | 7 +-- .../org/tests/query/TestDefaultFetchLazy.java | 2 +- .../tests/query/TestRefToLazyLoadMany.java | 2 +- ...stFindPartialWithConstructorSetFields.java | 11 ++-- .../rawsql/nativesql/TestNativeSqlBasic.java | 8 +-- .../json/TestJsonBeanDescriptorParse.java | 2 +- .../org/tests/types/TestFileTypeFetching.java | 2 +- .../org/tests/update/TestStatelessUpdate.java | 3 +- .../src/test/resources/ebean.properties | 2 +- 26 files changed, 133 insertions(+), 116 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/BeanState.java b/ebean-api/src/main/java/io/ebean/BeanState.java index daf163cc7..20aa0f8e4 100644 --- a/ebean-api/src/main/java/io/ebean/BeanState.java +++ b/ebean-api/src/main/java/io/ebean/BeanState.java @@ -57,7 +57,7 @@ public interface BeanState { * * // set loaded state on the email property to false so that * // the email property is not included in a stateless update - * DB.getBeanState(user).setPropertyLoaded("email", false); + * DB.beanState(user).setPropertyLoaded("email", false); * * user.update(); * @@ -72,25 +72,47 @@ public interface BeanState { * bean. *

    * Accessing another property will cause lazy loading to occur. - *

    */ - Set getLoadedProps(); + Set loadedProps(); + + /** + * Deprecated migrate to loadedProps(). + */ + @Deprecated + default Set getLoadedProps() { + return loadedProps(); + } /** * Return the set of changed properties. */ - Set getChangedProps(); + Set changedProps(); + + /** + * Deprecated migrate to changedProps(). + */ + @Deprecated + default Set getChangedProps() { + return changedProps(); + } /** * Return a map of the updated properties and their new and old values. */ - Map getDirtyValues(); + Map dirtyValues(); + + /** + * Deprecated migrate to dirtyValues(). + */ + @Deprecated + default Map getDirtyValues() { + return dirtyValues(); + } /** * Return true if the bean is readOnly. *

    * If a setter is called on a readOnly bean it will throw an exception. - *

    */ boolean isReadOnly(); @@ -114,13 +136,29 @@ public interface BeanState { void resetForInsert(); /** - * Returns a map with load erros. + * Returns a map with load errors. */ @Nullable - Map getLoadErrors(); + Map loadErrors(); + + /** + * Deprecated migrate to loadErrors(). + */ + @Deprecated + default Map getLoadErrors() { + return loadErrors(); + } /** * Return the sort order value for an order column. */ - int getSortOrder(); + int sortOrder(); + + /** + * Deprecated migrate to sortOrder(). + */ + @Deprecated + default int getSortOrder() { + return sortOrder(); + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java index 5bedf1355..725fe75e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java @@ -45,17 +45,17 @@ public final class DefaultBeanState implements BeanState { } @Override - public Set getLoadedProps() { + public Set loadedProps() { return intercept.getLoadedPropertyNames(); } @Override - public Set getChangedProps() { + public Set changedProps() { return intercept.getDirtyPropertyNames(); } @Override - public Map getDirtyValues() { + public Map dirtyValues() { return intercept.getDirtyValues(); } @@ -90,12 +90,12 @@ public final class DefaultBeanState implements BeanState { } @Override - public Map getLoadErrors() { + public Map loadErrors() { return intercept.getLoadErrors(); } @Override - public int getSortOrder() { + public int sortOrder() { return intercept.getSortOrder(); } } diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java index 2e01111cc..019469533 100644 --- a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java @@ -35,11 +35,11 @@ public class TestDirtyProperties extends BaseTestCase { DefaultBeanState beanState = new DefaultBeanState(eb); - Set changedProps = beanState.getChangedProps(); + Set changedProps = beanState.changedProps(); assertEquals(1, changedProps.size()); assertThat(changedProps).contains("name"); - Map dirtyValues = beanState.getDirtyValues(); + Map dirtyValues = beanState.dirtyValues(); assertEquals(1, dirtyValues.size()); assertThat(dirtyValues.keySet()).contains("name"); @@ -51,11 +51,11 @@ public class TestDirtyProperties extends BaseTestCase { Eembeddable embeddableRead = emain.getEmbeddable(); embeddableRead.setDescription("embChanged"); - Set changedProps2 = beanState.getChangedProps(); + Set changedProps2 = beanState.changedProps(); assertEquals(2, changedProps2.size()); assertThat(changedProps2).contains("name", "embeddable.description"); - Map dirtyValues2 = beanState.getDirtyValues(); + Map dirtyValues2 = beanState.dirtyValues(); assertEquals(2, dirtyValues2.size()); assertThat(dirtyValues2.keySet()).contains("name", "embeddable.description"); @@ -92,13 +92,13 @@ public class TestDirtyProperties extends BaseTestCase { DefaultBeanState beanState = new DefaultBeanState(eb); - Set changedProps2 = beanState.getChangedProps(); + Set changedProps2 = beanState.changedProps(); assertEquals(2, changedProps2.size()); assertThat(changedProps2).contains("name"); assertThat(changedProps2).contains("embeddable"); - Map dirtyValues2 = beanState.getDirtyValues(); + Map dirtyValues2 = beanState.dirtyValues(); assertEquals(2, dirtyValues2.size()); assertThat(dirtyValues2.keySet()).contains("name", "embeddable"); diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index 5065d89b9..dd21c5f99 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -31,11 +31,11 @@ public class TestUnsetLoadedProperties extends BaseTestCase { BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); LoggedSqlCollector.start(); user.update(); @@ -55,12 +55,12 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); // unset the loaded state for email ((EntityBean) user)._ebean_getIntercept().setPropertyLoaded("email", false); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } @Test @@ -73,11 +73,11 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } @Test @@ -90,10 +90,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); DB.beanState(user).setPropertyLoaded("email", false); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } /** diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java index 3fdfdb51f..bba31ad7b 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -37,7 +37,7 @@ public class BeanPostLoadTest extends BaseTestCase { assertThat(postLoad.methodsCalled).hasSize(1); assertThat(postLoad.methodsCalled).containsExactly("postLoad"); - assertThat(postLoad.beanState.getLoadedProps()).containsExactly("id", "name", "other"); + assertThat(postLoad.beanState.loadedProps()).containsExactly("id", "name", "other"); assertThat(postLoad.bean).isSameAs(found); db.delete(bean); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 43243f2c4..92efbc603 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -26,7 +26,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { Order order = DB.reference(Order.class, 1); BeanState beanState = DB.beanState(order); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertEquals(1, loadedProps.size()); assertTrue(beanState.isReference()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 1ed9ffc14..76d170d6f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -37,10 +37,10 @@ public class TestBeanReferenceRefresh extends BaseTestCase { assertFalse(DB.beanState(order).isReference()); assertNotNull(order.getStatus()); assertNotNull(order.getDetails()); - assertNull(DB.beanState(order).getLoadedProps()); + assertNull(DB.beanState(order).loadedProps()); Status status = order.getStatus(); - assertTrue(status != Order.Status.SHIPPED); + assertNotSame(status, Status.SHIPPED); order.setStatus(Order.Status.SHIPPED); DB.refresh(order); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 78bf40e61..6db645e15 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -12,8 +12,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestLazyLoadInCache extends BaseTestCase { @@ -29,7 +28,7 @@ public class TestLazyLoadInCache extends BaseTestCase { .order().asc("id") .findMap(); - assertTrue(!map.isEmpty()); + assertFalse(map.isEmpty()); Object id = map.keySet().iterator().next(); @@ -40,9 +39,9 @@ public class TestLazyLoadInCache extends BaseTestCase { .setId(id) .findOne(); - assertTrue(cust1 != cust1B); + assertNotSame(cust1, cust1B); - Set loadedProps = DB.beanState(cust1).getLoadedProps(); + Set loadedProps = DB.beanState(cust1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("status")); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java index 5dc8c59ee..2f244435e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java @@ -33,11 +33,11 @@ public class TestBeanState extends BaseTestCase { assertFalse(beanState.isNew()); assertFalse(beanState.isDirty()); assertFalse(beanState.isNewOrDirty()); - assertNotNull(beanState.getLoadedProps()); + assertNotNull(beanState.loadedProps()); customer.setName("dirtyNameProp"); assertTrue(beanState.isDirty()); - assertThat(beanState.getChangedProps()).containsOnly("name"); + assertThat(beanState.changedProps()).containsOnly("name"); EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept(); boolean[] dirtyProperties = ebi.getDirtyProperties(); @@ -51,7 +51,7 @@ public class TestBeanState extends BaseTestCase { customer.setStatus(Customer.Status.INACTIVE); assertTrue(beanState.isDirty()); - assertThat(beanState.getChangedProps()).containsOnly("name", "status"); + assertThat(beanState.changedProps()).containsOnly("name", "status"); } @Test @@ -80,10 +80,10 @@ public class TestBeanState extends BaseTestCase { Customer customer = DB.find(Customer.class).order("id").setMaxRows(1).findOne(); BeanState beanState = DB.beanState(customer); - assertThat(beanState.getChangedProps()).isEmpty(); + assertThat(beanState.changedProps()).isEmpty(); customer.setContacts(new ArrayList<>()); - assertThat(beanState.getChangedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).containsOnly("contacts"); } @Test @@ -92,18 +92,18 @@ public class TestBeanState extends BaseTestCase { Customer customer = new Customer(); BeanState beanState = DB.beanState(customer); - assertThat(beanState.getChangedProps()).isEmpty(); + assertThat(beanState.changedProps()).isEmpty(); // when new state, then loaded customer.setContacts(new ArrayList<>()); - assertThat(beanState.getChangedProps()).isEmpty(); - assertThat(beanState.getLoadedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).isEmpty(); + assertThat(beanState.loadedProps()).containsOnly("contacts"); // set loaded state, then marked as changed beanState.setLoaded(); customer.setContacts(new ArrayList<>()); - assertThat(beanState.getLoadedProps()).containsOnly("contacts"); - assertThat(beanState.getChangedProps()).containsOnly("contacts"); + assertThat(beanState.loadedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).containsOnly("contacts"); } @Test diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 971c4e7cc..4f5e38abf 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestQueryJoin extends BaseTestCase { @@ -37,29 +38,24 @@ public class TestQueryJoin extends BaseTestCase { Order order = list.get(0); BeanState beanStateOrder = DB.beanState(order); - assertNotNull(beanStateOrder.getLoadedProps()); + assertNotNull(beanStateOrder.loadedProps()); // assertTrue(beanStateOrder.getLoadedProps().contains("id")); - assertTrue(beanStateOrder.getLoadedProps().contains("status")); - assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); - assertTrue(beanStateOrder.getLoadedProps().contains("customer")); + assertThat(beanStateOrder.loadedProps()).contains("status", "shipments", "customer"); Customer customer = order.getCustomer(); BeanState beanStateCustomer = DB.beanState(customer); assertTrue(beanStateCustomer.isReference()); customer.getName(); - assertNotNull(beanStateCustomer.getLoadedProps()); - assertTrue(beanStateCustomer.getLoadedProps().contains("name")); - assertTrue(beanStateCustomer.getLoadedProps().contains("status")); - assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); + assertNotNull(beanStateCustomer.loadedProps()); + assertThat(beanStateCustomer.loadedProps()).contains("name", "status"); + assertThat(beanStateCustomer.loadedProps()).doesNotContain("billingAddress"); customer.getName(); Address billingAddress = customer.getBillingAddress(); - System.out.println(billingAddress); billingAddress.getLine1(); - assertTrue(!list.isEmpty()); - + assertFalse(list.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 8bc90c208..306f1cdbc 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -25,7 +25,7 @@ public class TestInsertQueryUpdate extends BaseTestCase { .findOne(); BeanState beanState = DB.beanState(e1); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertFalse(loadedProps.contains("description")); //lastUpdate diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index bfe594afa..0a4bd2022 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -96,13 +96,13 @@ public class TestDbJson_Jackson3 extends BaseTestCase { found.setBeanList(null); BeanState state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("name", "beanList"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("name", "beanList"); - ValuePair pair = state.getDirtyValues().get("name"); + ValuePair pair = state.dirtyValues().get("name"); assertThat(pair.getNewValue()).isEqualTo("p1-mod"); assertThat(pair.getOldValue()).isEqualTo("p1"); - pair = state.getDirtyValues().get("beanList"); + pair = state.dirtyValues().get("beanList"); assertThat(pair.getNewValue()).isEqualTo(null); assertThat((List) pair.getOldValue()).hasSize(1) .extracting(PlainBean::getName).containsExactly("a"); @@ -123,8 +123,8 @@ public class TestDbJson_Jackson3 extends BaseTestCase { assertThat(DB.beanState(found).isDirty()).isTrue(); state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean"); - pair = state.getDirtyValues().get("plainBean"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("plainBean"); + pair = state.dirtyValues().get("plainBean"); assertThat(pair.getNewValue()).hasToString("name:b"); assertThat(pair.getOldValue()).hasToString("name:a"); @@ -156,7 +156,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { found.getBeanList().get(0).setName("p1-mod"); BeanState state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("beanList"); } @IgnorePlatform(Platform.MYSQL) @@ -176,7 +176,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { // a new bean is not considered as dirty (thus have no changed props) assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isTrue(); - assertThat(state.getChangedProps()).isEmpty(); + assertThat(state.changedProps()).isEmpty(); bean.save(); @@ -185,19 +185,19 @@ public class TestDbJson_Jackson3 extends BaseTestCase { // a fresh loaded bean is also not considered as dirty assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isFalse(); - assertThat(state.getChangedProps()).isEmpty(); + assertThat(state.changedProps()).isEmpty(); bean.getPlainValue().setName("a"); // has SOURCE assertThat(state.isDirty()).isTrue(); - assertThat(state.getChangedProps()).containsExactly("plainValue"); + assertThat(state.changedProps()).containsExactly("plainValue"); bean.getPlainValue2().setName("b"); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2"); bean.getPlainValue3().setName("c"); // has mutationDetection = NONE - Map dirtyValues = state.getDirtyValues(); + Map dirtyValues = state.dirtyValues(); assertThat(dirtyValues).hasSize(2).containsKeys("plainValue", "plainValue2"); assertThat(dirtyValues.get("plainValue")).hasToString("name:a,name:x"); // SOURCE -> origValue present @@ -237,7 +237,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { bean.setPlainValue2(null); bean.setPlainValue3(null); // already null BeanState state = DB.beanState(bean); - assertThat(state.getDirtyValues()).hasSize(1).containsKey("plainValue2"); + assertThat(state.dirtyValues()).hasSize(1).containsKey("plainValue2"); } private void expectedSql(int i, String s) { diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index 30499053e..7f2a6a0db 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -18,10 +18,7 @@ import java.util.Map; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestDbJson_List extends BaseTestCase { @@ -202,8 +199,7 @@ public class TestDbJson_List extends BaseTestCase { .setId(bean.getId()) .findOne(); - // never get here - assertTrue(false); + fail("never get here"); } catch (PersistenceException e) { // query fails due to error loading invalid JSON content @@ -215,7 +211,7 @@ public class TestDbJson_List extends BaseTestCase { .setAllowLoadErrors() // allow invalid JSON content .findOne(); - Map errors = server().beanState(bean).getLoadErrors(); + Map errors = server().beanState(bean).loadErrors(); assertThat(errors).containsKey("beanMap").hasSize(1); assertThat(errors.values().iterator().next()) diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index da2ad82b6..48a78a3ce 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -101,13 +101,11 @@ public class TestJsonNodeBasic extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } @Test diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index 1d497dbc7..c910a5115 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -58,12 +58,10 @@ public class TestJsonNodeBlob extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 8a809453f..292dc2807 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -58,12 +58,10 @@ public class TestJsonNodeJsonb extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 7881a7d1d..105e0eacd 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -36,7 +36,6 @@ public class TestJsonNodeVarchar extends BaseTestCase { assertEquals(bean.getContent().path("contentType").asText(), bean1.getContent().path("contentType").asText()); assertEquals(18L, bean1.getContent().get("docId").asLong()); - } @Test @@ -58,12 +57,10 @@ public class TestJsonNodeVarchar extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java index 549063869..63a7cda22 100644 --- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java @@ -48,7 +48,7 @@ public class TestOldValue extends BaseTestCase { bean.getIntMap().put("ik2",2006); ((ArrayNode)bean.getJsonNode()).add("Bar"); - Map dirty = DB.beanState(bean).getDirtyValues(); + Map dirty = DB.beanState(bean).dirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(10); @@ -83,7 +83,7 @@ public class TestOldValue extends BaseTestCase { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test @Disabled("Old value detection does not work for @DbArray") - public void testDbArrayOldValue() throws Exception { + public void testDbArrayOldValue() { EBasicOldValue bean = new EBasicOldValue(); bean.getStringArr().add("sa1"); @@ -94,7 +94,7 @@ public class TestOldValue extends BaseTestCase { bean.getStringArr().add("sa2"); - Map dirty = DB.beanState(bean).getDirtyValues(); + Map dirty = DB.beanState(bean).dirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(1); @@ -102,6 +102,5 @@ public class TestOldValue extends BaseTestCase { softly.assertThat((List)dirty.get("stringArr").getNewValue()).containsExactly("sa1", "sa2"); softly.assertAll(); - } } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index aef260910..92d3de1d3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -28,7 +28,7 @@ public class TestDefaultFetchLazy extends BaseTestCase { MyLobSize myLobSize = DB.find(MyLobSize.class, m.getId()); BeanState beanState = DB.beanState(myLobSize); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertNotNull(loadedProps); assertTrue(loadedProps.contains("id")); diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index fba33585a..bb1a9f94a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -23,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { Customer c = custList.get(0); List contacts2 = c.getContacts(); - assertEquals(3, DB.beanState(c).getLoadedProps().size()); + assertEquals(3, DB.beanState(c).loadedProps().size()); // now lazy load the contacts contacts2.size(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 118ca213a..13784f672 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -10,8 +10,7 @@ import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestFindPartialWithConstructorSetFields extends BaseTestCase { @@ -31,10 +30,10 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { // assert first bean is partially loaded Order order0 = list.get(0); BeanState beanState = DB.beanState(order0); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertTrue(loadedProps.contains("shipDate")); - assertTrue(!loadedProps.contains("status")); - assertTrue(!loadedProps.contains("orderDate")); + assertFalse(loadedProps.contains("status")); + assertFalse(loadedProps.contains("orderDate")); // invoke lazy loading order0.getStatus(); @@ -44,7 +43,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { for (int i = 1; i < list.size(); i++) { Order order1 = list.get(1); beanState = DB.beanState(order1); - loadedProps = beanState.getLoadedProps(); + loadedProps = beanState.loadedProps(); assertNull(loadedProps); } diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 2874a4bf3..dac2ee7ae 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -28,7 +28,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps()).contains("id", "name"); + assertThat(beanState.loadedProps()).contains("id", "name"); } @Test @@ -43,7 +43,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); + assertThat(beanState.loadedProps().size()).isGreaterThan(10); } @Test @@ -194,7 +194,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); + assertThat(beanState.loadedProps().size()).isGreaterThan(10); } @Test @@ -210,6 +210,6 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps()).contains("id", "name"); + assertThat(beanState.loadedProps()).contains("id", "name"); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index ef82e31f8..e96af4aec 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -37,7 +37,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { assertEquals("Hello rob", customer.getName()); BeanState beanState = DB.beanState(customer); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertEquals(2, loadedProps.size()); assertTrue(loadedProps.contains("id")); diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 78d641a1a..a027ab056 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -32,7 +32,7 @@ public class TestFileTypeFetching extends BaseTestCase { .findOne(); BeanState beanState = DB.beanState(bean1); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java index 2104b8c03..5cc110bae 100644 --- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,7 +1,6 @@ package org.tests.update; import io.ebean.DB; -import io.ebean.DuplicateKeyException; import io.ebean.TransactionalTestCase; import io.ebeantest.LoggedSql; import org.junit.jupiter.api.Test; @@ -266,7 +265,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { } private boolean containsContacts(Customer cust) { - return DB.beanState(cust).getLoadedProps().contains("contacts"); + return DB.beanState(cust).loadedProps().contains("contacts"); } /** diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties index 776912381..49aae2a31 100644 --- a/ebean-core/src/test/resources/ebean.properties +++ b/ebean-core/src/test/resources/ebean.properties @@ -22,7 +22,7 @@ ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} ebean.packages=org.tests -datasource.default=sqlserver +datasource.default=h2 #datasource.h2.capturestacktrace=true ebean.dumpMetricsOnShutdown=true From 8b98335e2ed732d9913297f7e7e6a551c72f25c4 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 10:42:51 +1200 Subject: [PATCH 072/102] #2359 - Rename plugin api methods with deprecation - BeanDocType --- .../java/io/ebean/plugin/BeanDocType.java | 32 +++++++++++++++++++ .../java/io/ebean/plugin/BeanTypeTest.java | 16 +++++----- .../support/DocStoreBeanBaseAdapterTest.java | 4 +-- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index 92b3d6d19..33bcc3786 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -16,11 +16,27 @@ public interface BeanDocType { /** * Return the doc store index type for this bean type. */ + default String indexType() { + return getIndexType(); + } + + /** + * Deprecated migrate to indexType(). + */ + @Deprecated String getIndexType(); /** * Return the doc store index name for this bean type. */ + default String indexName() { + return getIndexName(); + } + + /** + * Deprecated migrate to indexName(). + */ + @Deprecated String getIndexName(); /** @@ -32,12 +48,28 @@ public interface BeanDocType { /** * Return the FetchPath for the embedded document. */ + default FetchPath embedded(String path) { + return getEmbedded(path); + } + + /** + * Deprecated migrate to embedded(). + */ + @Deprecated FetchPath getEmbedded(String path); /** * For embedded 'many' properties we need a FetchPath relative to the root which is used to * build and replace the embedded list. */ + default FetchPath embeddedManyRoot(String path) { + return getEmbedded(path); + } + + /** + * Deprecated migrate to embeddedManyRoot(). + */ + @Deprecated FetchPath getEmbeddedManyRoot(String path); /** diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index fd54a95a7..fe24cfc96 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -114,7 +114,7 @@ public class BeanTypeTest { public void docStore_getEmbedded() { BeanDocType orderDocType = beanType(Order.class).docStore(); - FetchPath customer = orderDocType.getEmbedded("customer"); + FetchPath customer = orderDocType.embedded("customer"); assertThat(customer).isNotNull(); assertThat(customer.getProperties(null)).contains("id", "name"); } @@ -124,10 +124,10 @@ public class BeanTypeTest { BeanDocType orderDocType = beanType(Order.class).docStore(); - FetchPath detailsPath = orderDocType.getEmbedded("details"); + FetchPath detailsPath = orderDocType.embedded("details"); assertThat(detailsPath).isNotNull(); - FetchPath detailsRoot = orderDocType.getEmbeddedManyRoot("details"); + FetchPath detailsRoot = orderDocType.embeddedManyRoot("details"); assertThat(detailsRoot).isNotNull(); assertThat(detailsRoot.getProperties(null)).containsExactly("id", "details"); assertThat(detailsRoot.hasPath("details")).isTrue(); @@ -143,15 +143,15 @@ public class BeanTypeTest { @Test public void getDocStoreIndexType() { - assertThat(beanType(Order.class).docStore().getIndexType()).isEqualTo("order"); - assertThat(beanType(Customer.class).docStore().getIndexType()).isEqualTo("customer"); + assertThat(beanType(Order.class).docStore().indexType()).isEqualTo("order"); + assertThat(beanType(Customer.class).docStore().indexType()).isEqualTo("customer"); } @Test public void getDocStoreIndexName() { - assertThat(beanType(Order.class).docStore().getIndexType()).isEqualTo("order"); - assertThat(beanType(Customer.class).docStore().getIndexType()).isEqualTo("customer"); + assertThat(beanType(Order.class).docStore().indexType()).isEqualTo("order"); + assertThat(beanType(Customer.class).docStore().indexType()).isEqualTo("customer"); } @Test @@ -159,7 +159,7 @@ public class BeanTypeTest { FetchPath parse = PathProperties.parse("id,name"); - FetchPath nestedCustomer = beanType(Order.class).docStore().getEmbedded("customer"); + FetchPath nestedCustomer = beanType(Order.class).docStore().embedded("customer"); assertThat(nestedCustomer.toString()).isEqualTo(parse.toString()); } diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 4d14bd503..e792aa0cc 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -31,8 +31,8 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { TDAdapter adapter = new TDAdapter<>(orderDesc, deployDesc); - assertThat(adapter.getIndexName()).isEqualTo("order"); - assertThat(adapter.getIndexType()).isEqualTo("order"); + assertThat(adapter.indexName()).isEqualTo("order"); + assertThat(adapter.indexType()).isEqualTo("order"); assertThat(adapter.getQueueId()).isEqualTo("order"); } From a15e1ae0a72d1604668a38dad0ccf533c6f488eb Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 10:53:32 +1200 Subject: [PATCH 073/102] #2359 - Rename plugin api methods with deprecation - QueryPlanMetric --- .../src/main/java/io/ebean/metric/QueryPlanMetric.java | 10 +++++++++- .../io/ebeaninternal/server/dto/DtoQueryPlanBase.java | 2 +- .../ebeaninternal/server/profile/DQueryPlanMetric.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java index edc2aaf03..07a9ca6d2 100644 --- a/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java +++ b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java @@ -10,7 +10,15 @@ public interface QueryPlanMetric { /** * Return the underlying timed metric. */ - TimedMetric getMetric(); + TimedMetric metric(); + + /** + * Deprecated migrate to metric(). + */ + @Deprecated + default TimedMetric getMetric() { + return metric(); + } /** * Visit the underlying metric. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java index 51828c77f..bc0b013e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java @@ -12,7 +12,7 @@ abstract class DtoQueryPlanBase implements DtoQueryPlan { DtoQueryPlanBase(DtoMappingRequest request) { this.planMetric = request.createMetric(); - this.metric = planMetric.getMetric(); + this.metric = planMetric.metric(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java index 723c24511..2490db52d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java @@ -27,7 +27,7 @@ final class DQueryPlanMetric implements QueryPlanMetric { } @Override - public TimedMetric getMetric() { + public TimedMetric metric() { return metric; } From d6dc14749716d40b919f079ed89ce0f8d816eb8b Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 10:59:20 +1200 Subject: [PATCH 074/102] #2359 - Rename plugin api methods with deprecation - BeanDocType --- ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index 33bcc3786..77a8f72d9 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -63,7 +63,7 @@ public interface BeanDocType { * build and replace the embedded list. */ default FetchPath embeddedManyRoot(String path) { - return getEmbedded(path); + return getEmbeddedManyRoot(path); } /** From bc02eeac57b22df5340935165a86a8e1e137f464 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 13:13:29 +1200 Subject: [PATCH 075/102] #2359 - Rename plugin api methods with deprecation - BeanType --- .../main/java/io/ebean/plugin/BeanType.java | 224 ++++++++++++++++-- .../service/ProfileOriginNodeUsage.java | 4 +- ebean-core/pom.xml | 3 +- .../io/ebeaninternal/api/LoadBeanRequest.java | 4 +- .../io/ebeaninternal/api/LoadManyRequest.java | 2 +- .../server/cache/CacheChangeSet.java | 10 +- .../server/cache/CachedBeanDataFromBean.java | 4 +- .../server/cache/CachedBeanDataToBean.java | 2 +- .../server/core/DefaultBeanLoader.java | 6 +- .../server/core/DefaultServer.java | 10 +- .../server/core/OrmQueryRequest.java | 4 +- .../server/core/PersistRequestBean.java | 22 +- .../server/core/PersistRequestOrmUpdate.java | 2 +- .../server/deploy/BeanDescriptor.java | 54 ++--- .../deploy/BeanDescriptorCacheHelp.java | 10 +- .../deploy/BeanDescriptorDraftHelp.java | 2 +- .../server/deploy/BeanDescriptorJsonHelp.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 14 +- .../server/deploy/BeanProperty.java | 10 +- .../server/deploy/BeanPropertyAssoc.java | 4 +- .../server/deploy/BeanPropertyAssocMany.java | 20 +- .../server/deploy/BeanPropertyAssocOne.java | 28 +-- .../server/deploy/DeployUpdateParser.java | 4 +- .../deploy/meta/DeployBeanPropertyLists.java | 2 +- .../deploy/visitor/VisitProperties.java | 2 +- .../server/loadcontext/DLoadContext.java | 4 +- .../server/persist/BatchedBeanHolder.java | 2 +- .../server/persist/DefaultPersister.java | 32 +-- .../persist/DeleteUnloadedForeignKeys.java | 4 +- .../server/persist/MergeHandler.java | 6 +- .../server/persist/MergeNode.java | 2 +- .../server/persist/MergeNodeAssocOne.java | 2 +- .../server/persist/SaveManyBeans.java | 2 +- .../server/persist/dml/DeleteMeta.java | 2 +- .../server/persist/dml/InsertMeta.java | 2 +- .../dmlbind/BindableUnidirectional.java | 2 +- .../server/persist/dmlbind/FactoryId.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 4 +- .../server/query/CQueryBuilder.java | 12 +- .../query/CQueryFetchSingleAttribute.java | 4 +- .../server/query/CQueryPlan.java | 4 +- .../server/query/CQueryRowCount.java | 4 +- .../server/query/CQueryUpdate.java | 2 +- .../ebeaninternal/server/query/STreeType.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 4 +- .../server/querydefn/OrmQueryDetail.java | 4 +- .../server/text/csv/TCsvReader.java | 4 +- .../server/text/json/WriteJson.java | 2 +- .../server/transaction/BeanPersistIdMap.java | 2 +- .../server/transaction/BeanPersistIds.java | 2 +- .../server/transaction/DeleteByIdMap.java | 4 +- .../api/support/DocStoreBeanBaseAdapter.java | 6 +- .../api/support/DocStoreDeleteEvent.java | 2 +- .../api/support/DocStoreIndexEvent.java | 2 +- .../docstore/api/support/DocStructure.java | 2 +- .../java/io/ebean/plugin/BeanTypeTest.java | 36 +-- .../io/ebean/plugin/ExpressionPathTest.java | 20 +- .../java/io/ebean/plugin/PropertyTest.java | 16 +- .../java/io/ebean/plugin/SpiServerTest.java | 12 +- .../BeanDescriptor_documentMappingTest.java | 4 +- .../deploy/BeanDescriptor_registerTest.java | 20 +- ...eanDescriptor_whenCreatedPropertyTest.java | 8 +- .../TestBeanDescriptorHasIdProperty.java | 4 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 2 +- .../java/org/tests/el/TestPathExpression.java | 20 +- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../java/org/tests/types/TestNewTypes.java | 32 +-- ebean-ddl-generator/pom.xml | 2 +- .../dbmigration/model/MTable.java | 4 +- 69 files changed, 467 insertions(+), 292 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java index bd79be5eb..661b370d2 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -22,24 +22,56 @@ public interface BeanType { * Return the short name of the bean type. */ @Nonnull - String getName(); + String name(); + + /** + * Deprecated migrate to name(). + */ + @Deprecated + default String getName() { + return name(); + } /** * Return the full name of the bean type. */ @Nonnull - String getFullName(); + String fullName(); + + /** + * Deprecated migrate to fullName(). + */ + @Deprecated + default String getFullName() { + return fullName(); + } /** * Return the class type this BeanDescriptor describes. */ @Nonnull - Class getBeanType(); + Class type(); + + /** + * Deprecated migrate to type(). + */ + @Deprecated + default Class getBeanType() { + return type(); + } /** * Return the type bean for an OneToMany or ManyToOne or ManyToMany property. */ - BeanType getBeanTypeAtPath(String propertyName); + BeanType beanTypeAtPath(String propertyName); + + /** + * Deprecated migrate to beanTypeAtPath(). + */ + @Deprecated + default BeanType getBeanTypeAtPath(String propertyName) { + return beanTypeAtPath(propertyName); + } /** * Return all the properties for this bean type. @@ -50,22 +82,54 @@ public interface BeanType { /** * Return the Id property. */ - Property getIdProperty(); + Property idProperty(); + + /** + * Deprecated migrate to idProperty(). + */ + @Deprecated + default Property getIdProperty() { + return idProperty(); + } /** * Return the when modified property if there is one defined. */ - Property getWhenModifiedProperty(); + Property whenModifiedProperty(); + + /** + * Deprecated migrate to idProperty(). + */ + @Deprecated + default Property getWhenModifiedProperty() { + return whenModifiedProperty(); + } /** * Return the when created property if there is one defined. */ - Property getWhenCreatedProperty(); + Property whenCreatedProperty(); + + /** + * Deprecated migrate to idProperty(). + */ + @Deprecated + default Property getWhenCreatedProperty() { + return whenCreatedProperty(); + } /** * Return the Property to read values from a bean. */ - Property getProperty(String propertyName); + Property property(String propertyName); + + /** + * Deprecated migrate to property(). + */ + @Deprecated + default Property getProperty(String propertyName) { + return property(propertyName); + } /** * Return the ExpressionPath for a given property path. @@ -73,7 +137,15 @@ public interface BeanType { * This can return a property or nested property path. *

    */ - ExpressionPath getExpressionPath(String path); + ExpressionPath expressionPath(String path); + + /** + * Deprecated migrate to expressionPath(). + */ + @Deprecated + default ExpressionPath getExpressionPath(String path) { + return expressionPath(path); + } /** * Return true if the property is a valid known property or path for the given bean type. @@ -108,7 +180,15 @@ public interface BeanType { /** * Return the base table this bean type maps to. */ - String getBaseTable(); + String baseTable(); + + /** + * Deprecated migrate to baseTable(). + */ + @Deprecated + default String getBaseTable() { + return baseTable(); + } /** * Create a new instance of the bean. @@ -118,10 +198,18 @@ public interface BeanType { /** * Return the bean id. This is the same as getBeanId() but without the generic type. */ - Object beanId(Object bean); + Object id(Object bean); /** - * Deprecated migrate to beanId() + * Deprecated migrate to id() + */ + @Deprecated + default Object beanId(Object bean) { + return id(bean); + } + + /** + * Deprecated migrate to id() */ @Deprecated Object getBeanId(T bean); @@ -129,32 +217,80 @@ public interface BeanType { /** * Set the id value to the bean. */ - void setBeanId(T bean, Object idValue); + void setId(T bean, Object idValue); + + /** + * Deprecated migrate to setId() + */ + @Deprecated + default void setBeanId(T bean, Object idValue) { + setId(bean, idValue); + } /** * Return the bean persist controller. */ - BeanPersistController getPersistController(); + BeanPersistController persistController(); + + /** + * Deprecated migrate to persistController() + */ + @Deprecated + default BeanPersistController getPersistController() { + return persistController(); + } /** * Return the bean persist listener. */ - BeanPersistListener getPersistListener(); + BeanPersistListener persistListener(); + + /** + * Deprecated migrate to persistListener() + */ + @Deprecated + default BeanPersistListener getPersistListener() { + return persistListener(); + } /** * Return the beanFinder. Usually null unless overriding the finder. */ - BeanFindController getFindController(); + BeanFindController findController(); + + /** + * Deprecated migrate to findController() + */ + @Deprecated + default BeanFindController getFindController() { + return findController(); + } /** * Return the BeanQueryAdapter or null if none is defined. */ - BeanQueryAdapter getQueryAdapter(); + BeanQueryAdapter queryAdapter(); + + /** + * Deprecated migrate to queryAdapter() + */ + @Deprecated + default BeanQueryAdapter getQueryAdapter() { + return queryAdapter(); + } /** * Return the identity generation type. */ - IdType getIdType(); + IdType idType(); + + /** + * Deprecated migrate to idType() + */ + @Deprecated + default IdType getIdType() { + return idType(); + } /** * Return true if this bean type has doc store backing. @@ -168,12 +304,28 @@ public interface BeanType { * for the document store. *

    */ - DocMapping getDocMapping(); + DocMapping docMapping(); + + /** + * Deprecated migrate to docMapping() + */ + @Deprecated + default DocMapping getDocMapping() { + return docMapping(); + } /** * Return the doc store queueId for this bean type. */ - String getDocStoreQueueId(); + String docStoreQueueId(); + + /** + * Deprecated migrate to docStoreQueueId() + */ + @Deprecated + default String getDocStoreQueueId() { + return docStoreQueueId(); + } /** * Return the doc store support for this bean type.\ @@ -204,12 +356,28 @@ public interface BeanType { /** * Returns all direct children of this beantype */ - List> getInheritanceChildren(); + List> inheritanceChildren(); /** - * Returns the parent in inheritance hiearchy + * Deprecated migrate to inheritanceChildren() */ - BeanType getInheritanceParent(); + @Deprecated + default List> getInheritanceChildren() { + return inheritanceChildren(); + } + + /** + * Returns the parent in inheritance hierarchy + */ + BeanType inheritanceParent(); + + /** + * Deprecated migrate to inheritanceParent() + */ + @Deprecated + default BeanType getInheritanceParent() { + return inheritanceParent(); + } /** * Visit all children recursively @@ -219,7 +387,15 @@ public interface BeanType { /** * Return the discriminator column. */ - String getDiscColumn(); + String discColumn(); + + /** + * Deprecated migrate to discColumn() + */ + @Deprecated + default String getDiscColumn() { + return discColumn(); + } /** * Create a bean given the discriminator value. diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 3ba6afa20..1ec851c05 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -45,7 +45,7 @@ public class ProfileOriginNodeUsage { if (path != null) { ElPropertyValue elGetValue = rootDesc.getElGetValue(path); if (elGetValue == null) { - logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.getName()); + logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name()); return; } else { BeanProperty beanProperty = elGetValue.getBeanProperty(); @@ -61,7 +61,7 @@ public class ProfileOriginNodeUsage { for (String propName : aggregateUsed) { BeanProperty beanProp = desc.findPropertyFromPath(propName); if (beanProp == null) { - logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.getName()); + logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.name()); } else { if (beanProp.isId()) { diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 719a66ca0..50ed802c9 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -63,7 +63,8 @@ io.ebean ebean-ddl-generator - 12.11.3 + + 12.11.4A test diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index 7bbbc85bc..ffe28462c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -48,7 +48,7 @@ public final class LoadBeanRequest extends LoadRequest { @Override public Class beanType() { - return loadBuffer.descriptor().getBeanType(); + return loadBuffer.descriptor().type(); } public String description() { @@ -108,7 +108,7 @@ public final class LoadBeanRequest extends LoadRequest { BeanDescriptor desc = loadBuffer.descriptor(); // collect Ids and maybe load bean cache for (Object bean : list) { - loadedIds.add(desc.beanId(bean)); + loadedIds.add(desc.id(bean)); } if (loadCache) { desc.cacheBeanPutAll(list); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index 71ebdef78..d3326e504 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -49,7 +49,7 @@ public final class LoadManyRequest extends LoadRequest { @Override public Class beanType() { - return loadContext.getBeanDescriptor().getBeanType(); + return loadContext.getBeanDescriptor().type(); } public String description() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java index a1393db06..298b856df 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java @@ -63,7 +63,7 @@ public final class CacheChangeSet { * Add an entry to clear a query cache. */ public void addInvalidate(BeanDescriptor descriptor) { - touchedTables.add(descriptor.getBaseTable()); + touchedTables.add(descriptor.baseTable()); } /** @@ -78,7 +78,7 @@ public final class CacheChangeSet { */ public void addClearQuery(BeanDescriptor descriptor) { queryCaches.add(descriptor); - touchedTables.add(descriptor.getBaseTable()); + touchedTables.add(descriptor.baseTable()); } /** @@ -125,7 +125,7 @@ public final class CacheChangeSet { entry.addId(id); } else { beanRemoveMap.put(desc, new CacheChangeBeanRemove(id, desc)); - touchedTables.add(desc.getBaseTable()); + touchedTables.add(desc.baseTable()); } } @@ -138,7 +138,7 @@ public final class CacheChangeSet { entry.addIds(ids); } else { beanRemoveMap.put(desc, new CacheChangeBeanRemove(desc, ids)); - touchedTables.add(desc.getBaseTable()); + touchedTables.add(desc.baseTable()); } } @@ -146,7 +146,7 @@ public final class CacheChangeSet { * Update a bean entry. */ public void addBeanUpdate(BeanDescriptor desc, String key, Map changes, boolean updateNaturalKey, long version) { - touchedTables.add(desc.getBaseTable()); + touchedTables.add(desc.baseTable()); entries.add(new CacheChangeBeanUpdate(desc, key, changes, updateNaturalKey, version)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java index 2fd3fd46b..e1c5dde29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -15,7 +15,7 @@ public final class CachedBeanDataFromBean { EntityBeanIntercept ebi = bean._ebean_getIntercept(); Map data = new LinkedHashMap<>(); - BeanProperty idProperty = desc.getIdProperty(); + BeanProperty idProperty = desc.idProperty(); if (idProperty != null) { int propertyIndex = idProperty.getPropertyIndex(); if (ebi.isLoadedProperty(propertyIndex)) { @@ -54,7 +54,7 @@ public final class CachedBeanDataFromBean { // create a readOnly sharable instance by copying the data EntityBean sharableBean = desc.createEntityBean(); - BeanProperty idProp = desc.getIdProperty(); + BeanProperty idProp = desc.idProperty(); if (idProp != null) { Object v = idProp.getValue(bean); idProp.setValue(sharableBean, v); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java index 08f3a80fd..cafd763d1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java @@ -13,7 +13,7 @@ public final class CachedBeanDataToBean { EntityBeanIntercept ebi = bean._ebean_getIntercept(); // any future lazy loading skips L2 bean cache ebi.setLoadedFromCache(true); - BeanProperty idProperty = desc.getIdProperty(); + BeanProperty idProperty = desc.idProperty(); if (desc.getInheritInfo() != null) { desc = desc.getInheritInfo().readType(bean.getClass()).desc(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 330ec53a9..ae1d7129a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -81,7 +81,7 @@ final class DefaultBeanLoader { } } - SpiQuery query = server.createQuery(parentDesc.getBeanType()); + SpiQuery query = server.createQuery(parentDesc.type()); if (refresh) { // populate a new collection BeanCollection emptyCollection = many.createEmpty(parentBean); @@ -203,7 +203,7 @@ final class DefaultBeanLoader { } } - SpiQuery query = server.createQuery(desc.getBeanType()); + SpiQuery query = server.createQuery(desc.type()); query.setLazyLoadProperty(ebi.getLazyLoadProperty()); if (draft) { query.asDraft(); @@ -236,7 +236,7 @@ final class DefaultBeanLoader { Object dbBean = query.findOne(); if (dbBean == null) { - throw new EntityNotFoundException("Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.getBeanType() + "]"); + throw new EntityNotFoundException("Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.type() + "]"); } desc.resetManyProperties(dbBean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 27aae1b29..0b6757e46 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -628,7 +628,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { public void truncate(Class... types) { List tableNames = new ArrayList<>(); for (Class type : types) { - tableNames.add(getBeanDescriptor(type).getBaseTable()); + tableNames.add(getBeanDescriptor(type).baseTable()); } truncate(tableNames.toArray(new String[0])); } @@ -707,7 +707,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (inheritInfo == null || inheritInfo.isConcrete()) { return (T) desc.contextRef(pc, null, false, id); } - BeanProperty idProp = desc.getIdProperty(); + BeanProperty idProp = desc.idProperty(); if (idProp == null) { throw new PersistenceException("No ID properties for this type? " + desc); } @@ -988,7 +988,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { String m = beanType.getName() + " is NOT an Entity Bean registered with this server?"; throw new PersistenceException(m); } - return new DefaultOrmUpdate<>(beanType, this, desc.getBaseTable(), ormUpdate); + return new DefaultOrmUpdate<>(beanType, this, desc.baseTable(), ormUpdate); } @Override @@ -2279,7 +2279,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { public Set checkUniqueness(Object bean, Transaction transaction) { EntityBean entityBean = checkEntityBean(bean); BeanDescriptor beanDesc = getBeanDescriptor(entityBean.getClass()); - BeanProperty idProperty = beanDesc.getIdProperty(); + BeanProperty idProperty = beanDesc.idProperty(); // if the ID of the Property is null we are unable to check uniqueness if (idProperty == null) { return Collections.emptySet(); @@ -2306,7 +2306,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Returns a set of properties if saving the bean will violate the unique constraints (defined by given properties). */ private Set checkUniqueness(EntityBean entityBean, BeanDescriptor beanDesc, BeanProperty[] props, Transaction transaction) { - BeanProperty idProperty = beanDesc.getIdProperty(); + BeanProperty idProperty = beanDesc.idProperty(); Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); ExpressionList exprList = query.where(); if (!entityBean._ebean_getIntercept().isNew()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 6d88c4fa9..8316437a6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -190,7 +190,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Run BeanQueryAdapter preQuery() if needed. */ private void adapterPreQuery() { - BeanQueryAdapter queryAdapter = beanDescriptor.getQueryAdapter(); + BeanQueryAdapter queryAdapter = beanDescriptor.queryAdapter(); if (queryAdapter != null) { queryAdapter.preQuery(this); } @@ -468,7 +468,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery public Map findMap() { String mapKey = query.getMapKey(); if (mapKey == null) { - BeanProperty idProp = beanDescriptor.getIdProperty(); + BeanProperty idProp = beanDescriptor.idProperty(); if (idProp != null) { query.setMapKey(idProp.getName()); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index a5074ced4..0876b4564 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -150,10 +150,10 @@ public final class PersistRequestBean extends PersistRequest implements BeanP this.intercept = entityBean._ebean_getIntercept(); this.beanManager = mgr; this.beanDescriptor = mgr.getBeanDescriptor(); - this.beanPersistListener = beanDescriptor.getPersistListener(); + this.beanPersistListener = beanDescriptor.persistListener(); this.bean = bean; this.parentBean = parentBean; - this.controller = beanDescriptor.getPersistController(); + this.controller = beanDescriptor.persistController(); this.type = type; this.docStoreMode = calcDocStoreMode(transaction, type); this.flags = flags; @@ -199,7 +199,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ @Override public void profile(long offset, int flushCount) { - profileBase(type.profileEventId, offset, beanDescriptor.getName(), flushCount); + profileBase(type.profileEventId, offset, beanDescriptor.name(), flushCount); } /** @@ -495,10 +495,10 @@ public final class PersistRequestBean extends PersistRequest implements BeanP case INSERT: case UPDATE: case DELETE_SOFT: - docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue); + docStoreUpdates.queueIndex(beanDescriptor.docStoreQueueId(), idValue); break; case DELETE: - docStoreUpdates.queueDelete(beanDescriptor.getDocStoreQueueId(), idValue); + docStoreUpdates.queueDelete(beanDescriptor.docStoreQueueId(), idValue); break; default: throw new IllegalStateException("Invalid type " + type); @@ -618,7 +618,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP *

    */ public String fullName() { - return beanDescriptor.getFullName(); + return beanDescriptor.fullName(); } /** @@ -937,7 +937,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP private void logSummaryMessage() { String draft = (beanDescriptor.isDraftable() && !publish) ? " draft[true]" : ""; - String name = beanDescriptor.getName(); + String name = beanDescriptor.name(); switch (type) { case INSERT: transaction.logSummary("Inserted [" + name + "] [" + idValue + "]" + draft); @@ -1101,9 +1101,9 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } case QUEUE: { if (type == Type.DELETE) { - docStoreUpdates.queueDelete(beanDescriptor.getDocStoreQueueId(), idValue); + docStoreUpdates.queueDelete(beanDescriptor.docStoreQueueId(), idValue); } else { - docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue); + docStoreUpdates.queueIndex(beanDescriptor.docStoreQueueId(), idValue); } } break; @@ -1170,7 +1170,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return the table to update depending if the request is a 'publish' one or normal. */ public String updateTable() { - return publish ? beanDescriptor.getBaseTable() : beanDescriptor.getDraftTable(); + return publish ? beanDescriptor.baseTable() : beanDescriptor.getDraftTable(); } /** @@ -1280,7 +1280,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ @Override public void profile() { - profileBase(type.profileEventId, profileOffset, beanDescriptor.getName(), 1); + profileBase(type.profileEventId, profileOffset, beanDescriptor.name(), 1); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index 0ada82876..08de8e27d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java @@ -26,7 +26,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest { @Override public void profile(long offset, int flushCount) { - profileBase(EVT_ORMUPDATE, offset, beanDescriptor.getName(), flushCount); + profileBase(EVT_ORMUPDATE, offset, beanDescriptor.name(), flushCount); } public BeanDescriptor descriptor() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 6d2b7699b..f25293fa0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -999,12 +999,12 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the queueId used to uniquely identify this type when queuing an index updateAdd. */ @Override - public String getDocStoreQueueId() { + public String docStoreQueueId() { return docStoreQueueId; } @Override - public DocumentMapping getDocMapping() { + public DocumentMapping docMapping() { return docMapping; } @@ -1067,7 +1067,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ public String rootName() { if (inheritInfo != null && !inheritInfo.isRoot()) { - return inheritInfo.getRoot().desc().getName(); + return inheritInfo.getRoot().desc().name(); } return name; } @@ -1597,7 +1597,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the 'when modified' property if there is one defined. */ @Override - public BeanProperty getWhenModifiedProperty() { + public BeanProperty whenModifiedProperty() { return whenModifiedProperty; } @@ -1605,7 +1605,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the 'when created' property if there is one defined. */ @Override - public BeanProperty getWhenCreatedProperty() { + public BeanProperty whenCreatedProperty() { return whenCreatedProperty; } @@ -1747,7 +1747,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ private EntityBean createEntityBean(boolean isNew) { if (prototypeEntityBean == null) { - throw new UnsupportedOperationException("cannot create entity bean for abstract entity " + getName()); + throw new UnsupportedOperationException("cannot create entity bean for abstract entity " + name()); } try { EntityBean bean = (EntityBean) prototypeEntityBean._ebean_newInstance(); @@ -1911,7 +1911,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public BeanType getBeanTypeAtPath(String path) { + public BeanType beanTypeAtPath(String path) { return getBeanDescriptor(path); } @@ -1931,7 +1931,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { path = splitBegin[1]; result = assocProp.getTargetDescriptor(); } else { - throw new PersistenceException("Invalid path " + path + " from " + result.getFullName()); + throw new PersistenceException("Invalid path " + path + " from " + result.fullName()); } } } @@ -2000,7 +2000,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ @Override @Nonnull - public Class getBeanType() { + public Class type() { return beanType; } @@ -2012,7 +2012,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ @Override @Nonnull - public String getFullName() { + public String fullName() { return fullName; } @@ -2021,7 +2021,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ @Override @Nonnull - public String getName() { + public String name() { return name; } @@ -2122,7 +2122,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public Object beanId(Object bean) { + public Object id(Object bean) { return getId((EntityBean) bean); } @@ -2168,7 +2168,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Set the bean id value converting if necessary. */ @Override - public void setBeanId(T bean, Object idValue) { + public void setId(T bean, Object idValue) { idBinder.convertSetId(idValue, (EntityBean) bean); } @@ -2190,7 +2190,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public Property getProperty(String propName) { + public Property property(String propName) { return findProperty(propName); } @@ -2342,7 +2342,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public ExpressionPath getExpressionPath(String path) { + public ExpressionPath expressionPath(String path) { return getElGetValue(path); } @@ -2520,7 +2520,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public String getDiscColumn() { + public String discColumn() { return inheritInfo.getDiscriminatorColumn(); } @@ -2562,7 +2562,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the beanListener. */ @Override - public BeanPersistListener getPersistListener() { + public BeanPersistListener persistListener() { return persistListener; } @@ -2577,7 +2577,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the find controller (SPI interface). */ @Override - public BeanFindController getFindController() { + public BeanFindController findController() { return beanFinder; } @@ -2585,7 +2585,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the BeanQueryAdapter or null if none is defined. */ @Override - public BeanQueryAdapter getQueryAdapter() { + public BeanQueryAdapter queryAdapter() { return queryAdapter; } @@ -2661,7 +2661,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the Controller. */ @Override - public BeanPersistController getPersistController() { + public BeanPersistController persistController() { return persistController; } @@ -2712,7 +2712,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the base table. Only properties mapped to the base table are by default persisted. */ @Override - public String getBaseTable() { + public String baseTable() { return baseTable; } @@ -2776,7 +2776,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public void markAsDeleted(EntityBean bean) { if (softDeleteProperty == null) { Object id = getId(bean); - logger.info("(Lazy) loading unsuccessful for type:{} id:{} - expecting when bean has been deleted", getName(), id); + logger.info("(Lazy) loading unsuccessful for type:{} id:{} - expecting when bean has been deleted", name(), id); bean._ebean_getIntercept().setLazyLoadFailure(id); } else { setSoftDeleteValue(bean); @@ -2803,7 +2803,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public boolean isEmbeddedPath(String propertyPath) { ElPropertyDeploy elProp = getElPropertyDeploy(propertyPath); if (elProp == null) { - throw new PersistenceException("Invalid path " + propertyPath + " from " + getFullName()); + throw new PersistenceException("Invalid path " + propertyPath + " from " + fullName()); } return elProp.getBeanProperty().isEmbedded(); } @@ -2929,7 +2929,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the identity generation type. */ @Override - public IdType getIdType() { + public IdType idType() { return idType; } @@ -3050,7 +3050,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public BeanProperty getIdProperty() { + public BeanProperty idProperty() { return idProperty; } @@ -3382,7 +3382,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public List> getInheritanceChildren() { + public List> inheritanceChildren() { if (hasInheritance()) { return getInheritInfo().getChildren() .stream() @@ -3394,7 +3394,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } @Override - public BeanType getInheritanceParent() { + public BeanType inheritanceParent() { return getInheritInfo() == null ? null : getInheritInfo().getParent().desc(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 06a13382c..abc26c507 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -124,7 +124,7 @@ final class BeanDescriptorCacheHelp { if (cacheNotifyOnAll || cacheNotifyOnDelete) { String notifyMode = cacheNotifyOnAll ? "All" : "Delete"; logger.debug("l2 caching on {} - beanCaching:{} queryCaching:{} notifyMode:{} ", - desc.getFullName(), isBeanCaching(), isQueryCaching(), notifyMode); + desc.fullName(), isBeanCaching(), isQueryCaching(), notifyMode); } } } @@ -352,7 +352,7 @@ final class BeanDescriptorCacheHelp { BeanDescriptor targetDescriptor = many.getTargetDescriptor(); List idList = new ArrayList<>(actualDetails.size()); for (Object bean : actualDetails) { - idList.add(targetDescriptor.beanId(bean)); + idList.add(targetDescriptor.id(bean)); } return new CachedManyIds(idList); } @@ -375,7 +375,7 @@ final class BeanDescriptorCacheHelp { for (Map.Entry entry : beanDataMap.entrySet()) { CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue(); T bean = convertToBean(entry.getKey(), false, context, cachedBeanData); - result.add(bean, desc.beanId(bean)); + result.add(bean, desc.id(bean)); } return result; } @@ -773,7 +773,7 @@ final class BeanDescriptorCacheHelp { void cacheUpdateQuery(boolean update, SpiTransaction transaction) { if (invalidateQueryCache || cacheNotifyOnAll || (!update && cacheNotifyOnDelete)) { - transaction.getEvent().add(desc.getBaseTable(), false, update, !update); + transaction.getEvent().add(desc.baseTable(), false, update, !update); } } @@ -816,7 +816,7 @@ final class BeanDescriptorCacheHelp { } else { queryCacheClear(changeSet); cacheDeleteImported(false, insertRequest.entityBean(), changeSet); - changeSet.addBeanInsert(desc.getBaseTable()); + changeSet.addBeanInsert(desc.baseTable()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java index f1433dbde..2468a737b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java @@ -66,7 +66,7 @@ final class BeanDescriptorDraftHelp { } EntityBean draft = (EntityBean) draftBean; EntityBean live = (EntityBean) liveBean; - BeanProperty idProperty = desc.getIdProperty(); + BeanProperty idProperty = desc.idProperty(); if (idProperty != null) { idProperty.publish(draft, live); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index 091a5a579..50076db15 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -145,7 +145,7 @@ final class BeanDescriptorJsonHelp { desc.setUnmappedJson(bean, unmappedProperties); } Object contextBean = null; - Object id = desc.beanId(bean); + Object id = desc.id(bean); if (!isNullOrZero(id)) { // check if the bean has already been loaded contextBean = readJson.persistenceContextPutIfAbsent(id, bean, desc); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 0ea24c1b1..41d5157d8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -433,7 +433,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy */ private void readTableToDescriptor() { for (BeanDescriptor desc : descMap.values()) { - String baseTable = desc.getBaseTable(); + String baseTable = desc.baseTable(); if (baseTable != null) { baseTable = baseTable.toLowerCase(); List> list = tableToDescMap.computeIfAbsent(baseTable, k -> new ArrayList<>(1)); @@ -508,7 +508,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy for (BeanDescriptor d : descMap.values()) { d.initLast(); if (!d.isEmbedded()) { - beanManagerMap.put(d.getFullName(), beanManagerFactory.create(d)); + beanManagerMap.put(d.fullName(), beanManagerFactory.create(d)); checkForValidEmbeddedId(d); } } @@ -519,12 +519,12 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy if (idBinder instanceof IdBinderEmbedded) { IdBinderEmbedded embId = (IdBinderEmbedded) idBinder; BeanDescriptor idBeanDescriptor = embId.getIdBeanDescriptor(); - Class idType = idBeanDescriptor.getBeanType(); + Class idType = idBeanDescriptor.type(); try { idType.getDeclaredMethod("hashCode"); idType.getDeclaredMethod("equals", Object.class); } catch (NoSuchMethodException e) { - checkMissingHashCodeOrEquals(e, idType, d.getBeanType()); + checkMissingHashCodeOrEquals(e, idType, d.type()); } } } @@ -597,9 +597,9 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private void registerBeanDescriptor(DeployBeanInfo info) { BeanDescriptor desc = new BeanDescriptor<>(this, info.getDescriptor()); - descMap.put(desc.getBeanType().getName(), desc); + descMap.put(desc.type().getName(), desc); if (desc.isDocStoreMapped()) { - descQueueMap.put(desc.getDocStoreQueueId(), desc); + descQueueMap.put(desc.docStoreQueueId(), desc); } for (BeanPropertyAssocMany many : desc.propertiesMany()) { if (many.isElementCollection()) { @@ -1517,7 +1517,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy @Override public int compare(BeanDescriptor o1, BeanDescriptor o2) { - return o1.getName().compareTo(o2.getName()); + return o1.name().compareTo(o2.name()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 74e75702a..7df1c997c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -14,7 +14,6 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarType; import io.ebean.plugin.Property; import io.ebean.text.StringParser; -import io.ebean.text.TextException; import io.ebean.util.SplitName; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.api.SpiQuery; @@ -50,7 +49,6 @@ import java.io.IOException; import java.lang.reflect.Field; import java.sql.SQLException; import java.sql.Types; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -269,7 +267,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { s = s.replace("${ta}", "${}"); if (dbEncrypted) { s = dbEncryptFunction.getDecryptSql(s); - String namedParam = ":encryptkey_" + descriptor.getBaseTable() + "___" + dbColumn; + String namedParam = ":encryptkey_" + descriptor.baseTable() + "___" + dbColumn; s = s.replace("?", namedParam); } } @@ -329,7 +327,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.dbMigrationInfos = source.dbMigrationInfos; this.inherited = source.isInherited(); this.owningType = source.owningType; - this.local = owningType.equals(descriptor.getBeanType()); + this.local = owningType.equals(descriptor.type()); this.version = source.isVersion(); this.embedded = source.isEmbedded(); this.id = source.isId(); @@ -358,7 +356,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { public void initialise(BeanDescriptorInitContext initContext) { // do nothing for normal BeanProperty if (!isTransient && scalarType == null) { - throw new RuntimeException("No ScalarType assigned to " + descriptor.getFullName() + "." + getName()); + throw new RuntimeException("No ScalarType assigned to " + descriptor.fullName() + "." + getName()); } } @@ -920,7 +918,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ @Override public String getFullBeanName() { - return descriptor.getFullName() + "." + name; + return descriptor.fullName() + "." + name; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 416d500aa..56cd61425 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -284,7 +284,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree */ public boolean hasId(EntityBean bean) { BeanDescriptor targetDesc = getTargetDescriptor(); - BeanProperty idProp = targetDesc.getIdProperty(); + BeanProperty idProp = targetDesc.idProperty(); // all the unique properties are non-null return idProp == null || idProp.getValue(bean) != null; } @@ -422,7 +422,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * descriptor back to local database columns in the TableJoin. */ ImportedId createImportedId(BeanPropertyAssoc owner, BeanDescriptor target, TableJoin join) { - BeanProperty idProp = target.getIdProperty(); + BeanProperty idProp = target.idProperty(); BeanProperty[] others = target.propertiesBaseScalar(); if (descriptor.isRawSqlBased()) { String dbColumn = owner.getDbColumn(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 935fc8d3f..0ba6fe720 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -175,7 +175,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ void initialisePostTarget() { if (childMasterProperty != null) { - BeanProperty masterId = childMasterProperty.getTargetDescriptor().getIdProperty(); + BeanProperty masterId = childMasterProperty.getTargetDescriptor().idProperty(); if (masterId != null) { // in docstore only, the master-id may be not available childMasterIdProperty = childMasterProperty.getName() + "." + masterId.getName(); } @@ -200,7 +200,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST @Override public void registerColumn(BeanDescriptor desc, String prefix) { if (targetDescriptor != null) { - desc.registerTable(targetDescriptor.getBaseTable(), this); + desc.registerTable(targetDescriptor.baseTable(), this); } } @@ -654,7 +654,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Create the array of ExportedProperty used to build reference objects. */ private ExportedProperty[] createExported() { - BeanProperty idProp = descriptor.getIdProperty(); + BeanProperty idProp = descriptor.idProperty(); ArrayList list = new ArrayList<>(); if (idProp != null && idProp.isEmbedded()) { BeanPropertyAssocOne one = (BeanPropertyAssocOne) idProp; @@ -697,7 +697,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return null; } // search for the property, to see if it exists - Class beanType = descriptor.getBeanType(); + Class beanType = descriptor.type(); BeanDescriptor targetDesc = getTargetDescriptor(); for (BeanPropertyAssocOne prop : targetDesc.propertiesOne()) { if (mappedBy != null) { @@ -727,8 +727,8 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return prop; } } - String from = descriptor.getFullName(); - String to = targetDesc.getFullName(); + String from = descriptor.fullName(); + String to = targetDesc.fullName(); throw new PersistenceException(from + ": Could not find mapKey property [" + mapKey + "] on [" + to + "]"); } @@ -777,7 +777,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ public void intersectionBind(SqlUpdate sql, EntityBean parentBean, EntityBean other) { if (embeddedExportedProperties) { - BeanProperty idProp = descriptor.getIdProperty(); + BeanProperty idProp = descriptor.idProperty(); parentBean = (EntityBean) idProp.getValue(parentBean); } for (ExportedProperty exportedProperty : exportedProperties) { @@ -788,7 +788,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST private void buildExport(IntersectionRow row, EntityBean parentBean) { if (embeddedExportedProperties) { - BeanProperty idProp = descriptor.getIdProperty(); + BeanProperty idProp = descriptor.idProperty(); parentBean = (EntityBean) idProp.getValue(parentBean); } for (ExportedProperty exportedProperty : exportedProperties) { @@ -869,7 +869,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST draftVal.size(); Collection actualDetails = draftVal.getActualDetails(); for (T bean : actualDetails) { - Object id = targetDescriptor.beanId(bean); + Object id = targetDescriptor.id(bean); T liveBean = liveBeansAsMap.remove(id); if (isManyToMany()) { @@ -899,7 +899,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST Collection liveBeans = liveVal.getActualDetails(); Map liveMap = new LinkedHashMap<>(); for (Object liveBean : liveBeans) { - Object id = targetDescriptor.beanId(liveBean); + Object id = targetDescriptor.id(liveBean); liveMap.put(id, (T) liveBean); } return liveMap; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index dd029000b..103ba62c9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -129,7 +129,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr // limit JoinColumn mapping to the @Id / primary key TableJoinColumn[] columns = tableJoin.columns(); String foreignJoinColumn = columns[0].getForeignDbColumn(); - String foreignIdColumn = targetDescriptor.getIdProperty().getDbColumn(); + String foreignIdColumn = targetDescriptor.idProperty().getDbColumn(); if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) { throw new PersistenceException("Mapping limitation - @JoinColumn on " + getFullBeanName() + " needs to map to a primary key as per Issue #529 " + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn); @@ -137,7 +137,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } } else { exportedProperties = createExported(); - String delStmt = "delete from " + targetDescriptor.getBaseTable() + " where "; + String delStmt = "delete from " + targetDescriptor.baseTable() + " where "; deleteByParentIdSql = delStmt + deriveWhereParentIdSql(false); deleteByParentIdInSql = delStmt + deriveWhereParentIdSql(true); } @@ -195,7 +195,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } else { Object assocBean = getValue(bean); if (assocBean != null) { - Object parentId = targetDescriptor.beanId(assocBean); + Object parentId = targetDescriptor.id(assocBean); if (parentId != null) { changeSet.addManyRemove(targetDescriptor, relationshipProperty.getName(), parentId); } @@ -300,10 +300,10 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr BeanDescriptor target = getTargetDescriptor(); String basePath = SplitName.add(prefix, name); if (dbColumn != null) { - BeanProperty idProperty = target.getIdProperty(); + BeanProperty idProperty = target.idProperty(); desc.registerColumn(dbColumn, SplitName.add(basePath, idProperty.getName())); } - desc.registerTable(target.getBaseTable(), this); + desc.registerTable(target.baseTable(), this); } } } @@ -383,7 +383,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr oldBean = (EntityBean) oldEmb; BeanDescriptor targetDescriptor = getTargetDescriptor(); - BeanProperty idProperty = targetDescriptor.getIdProperty(); + BeanProperty idProperty = targetDescriptor.idProperty(); Object newId = (newBean == null) ? null : idProperty.getValue(newBean); Object oldId = (oldBean == null) ? null : idProperty.getValue(oldBean); @@ -424,13 +424,13 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } else if (targetInheritInfo != null) { return createCacheBeanId(ap); } else { - return targetDescriptor.getIdProperty().getCacheDataValue((EntityBean) ap); + return targetDescriptor.idProperty().getCacheDataValue((EntityBean) ap); } } private Object createCacheBeanId(Object bean) { final BeanDescriptor desc = targetDescriptor.descOf(bean.getClass()); - final Object id = desc.getIdProperty().getCacheDataValue((EntityBean) bean); + final Object id = desc.idProperty().getCacheDataValue((EntityBean) bean); return new CachedBeanId(desc.getDiscValue(), id); } @@ -463,7 +463,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr private Object refBean(BeanDescriptor desc, Object id, PersistenceContext context) { if (id instanceof String) { - id = desc.getIdProperty().scalarType.parse((String) id); + id = desc.idProperty().scalarType.parse((String) id); } Object bean = desc.contextGet(context, id); if (bean == null) { @@ -474,11 +474,11 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr @Override public ScalarDataReader getIdReader() { - return targetDescriptor.getIdProperty(); + return targetDescriptor.idProperty(); } ScalarType getIdScalarType() { - return targetDescriptor.getIdProperty().scalarType; + return targetDescriptor.idProperty().scalarType; } /** @@ -565,7 +565,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Create the array of ExportedProperty used to build reference objects. */ private ExportedProperty[] createExported() { - BeanProperty idProp = descriptor.getIdProperty(); + BeanProperty idProp = descriptor.idProperty(); ArrayList list = new ArrayList<>(); if (idProp != null && idProp.isEmbedded()) { BeanPropertyAssocOne one = (BeanPropertyAssocOne) idProp; @@ -598,7 +598,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr public void appendSelect(DbSqlContext ctx, boolean subQuery) { if (!isTransient) { if (primaryKeyExport) { - descriptor.getIdProperty().appendSelect(ctx, subQuery); + descriptor.idProperty().appendSelect(ctx, subQuery); } else { localHelp.appendSelect(ctx, subQuery); } @@ -744,7 +744,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Just write the Id property of the ToOne property. */ private void jsonWriteTargetId(SpiJsonWriter writeJson, EntityBean childBean) throws IOException { - BeanProperty idProperty = targetDescriptor.getIdProperty(); + BeanProperty idProperty = targetDescriptor.idProperty(); if (idProperty != null) { writeJson.writeStartObject(name); idProperty.jsonWriteForInsert(writeJson, childBean); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index 638029647..e350617d7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java @@ -73,8 +73,8 @@ public final class DeployUpdateParser extends DeployParser { @Override public String getDeployWord(String expression) { - if (expression.equalsIgnoreCase(beanDescriptor.getName())) { - return beanDescriptor.getBaseTable(); + if (expression.equalsIgnoreCase(beanDescriptor.name())) { + return beanDescriptor.baseTable(); } ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); return elProp != null ? elProp.getDbColumn() : null; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index a6ed9c330..592e1b983 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -184,7 +184,7 @@ public final class DeployBeanPropertyLists { } if (prop.isId()) { if (id != null) { - throw new IllegalStateException("More that one @Id property on " + desc.getFullName() + " ?"); + throw new IllegalStateException("More that one @Id property on " + desc.fullName() + " ?"); } id = prop; return; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java index 70f05a6dc..b140c2f1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java @@ -21,7 +21,7 @@ public class VisitProperties { } protected void visitProperties(BeanDescriptor desc, BeanPropertyVisitor propertyVisitor) { - BeanProperty idProp = desc.getIdProperty(); + BeanProperty idProp = desc.idProperty(); if (idProp != null) { visit(propertyVisitor, idProp); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index 3bfba1459..c284cb39f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -87,7 +87,7 @@ public final class DLoadContext implements LoadContext { private ObjectGraphOrigin initOrigin() { CallOrigin callOrigin = ebeanServer.createCallOrigin(); - return new ObjectGraphOrigin(0, callOrigin, rootDescriptor.getFullName()); + return new ObjectGraphOrigin(0, callOrigin, rootDescriptor.fullName()); } public DLoadContext(OrmQueryRequest request, SpiQuerySecondary secondaryQueries) { @@ -295,7 +295,7 @@ public final class DLoadContext implements LoadContext { } DLoadBeanContext getBeanContextWithInherit(String path, BeanPropertyAssocOne property) { - String key = path + ":" + property.getTargetDescriptor().getName(); + String key = path + ":" + property.getTargetDescriptor().name(); return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path, null)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java index 06bc8a1d1..fb91333e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -57,7 +57,7 @@ final class BatchedBeanHolder { */ BatchedBeanHolder(BatchControl control, BeanDescriptor beanDescriptor, int order) { this.control = control; - this.shortDesc = beanDescriptor.getName() + ":" + order; + this.shortDesc = beanDescriptor.name() + ":" + order; this.order = order; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index d41676f94..4c8d0e5b8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -180,7 +180,7 @@ public final class DefaultPersister implements Persister { DraftHandler draftHandler = new DraftHandler<>(desc, transaction); List liveBeans = draftHandler.fetchSourceBeans(query, false); - PUB.debug("draftRestore [{}] count[{}]", desc.getName(), liveBeans.size()); + PUB.debug("draftRestore [{}] count[{}]", desc.name(), liveBeans.size()); if (liveBeans.isEmpty()) { return Collections.emptyList(); } @@ -194,11 +194,11 @@ public final class DefaultPersister implements Persister { // reset @DraftDirty and @DraftReset properties draftHandler.resetDraft(draftBean); - PUB.trace("draftRestore bean [{}] id[{}]", desc.getName(), draftHandler.getId()); + PUB.trace("draftRestore bean [{}] id[{}]", desc.name(), draftHandler.getId()); update(createRequest(draftBean, transaction, null, mgr, Type.UPDATE, Flags.RECURSE)); } - PUB.debug("draftRestore - complete for [{}]", desc.getName()); + PUB.debug("draftRestore - complete for [{}]", desc.name()); return draftHandler.getDrafts(); } @@ -208,7 +208,7 @@ public final class DefaultPersister implements Persister { private List getBeanIds(BeanDescriptor desc, List beans) { List idList = new ArrayList<>(beans.size()); for (T liveBean : beans) { - idList.add(desc.beanId(liveBean)); + idList.add(desc.id(liveBean)); } return idList; } @@ -225,7 +225,7 @@ public final class DefaultPersister implements Persister { DraftHandler draftHandler = new DraftHandler<>(desc, transaction); List draftBeans = draftHandler.fetchSourceBeans(query, true); - PUB.debug("publish [{}] count[{}]", desc.getName(), draftBeans.size()); + PUB.debug("publish [{}] count[{}]", desc.name(), draftBeans.size()); if (draftBeans.isEmpty()) { return Collections.emptyList(); } @@ -243,7 +243,7 @@ public final class DefaultPersister implements Persister { draftHandler.resetDraft(draftBean); Type persistType = draftHandler.isInsert() ? Type.INSERT : Type.UPDATE; - PUB.trace("publish bean [{}] id[{}] type[{}]", desc.getName(), draftHandler.getId(), persistType); + PUB.trace("publish bean [{}] id[{}] type[{}]", desc.name(), draftHandler.getId(), persistType); PersistRequestBean request = createRequest(liveBean, transaction, null, mgr, persistType, Flags.PUBLISH_RECURSE); if (persistType == Type.INSERT) { @@ -255,7 +255,7 @@ public final class DefaultPersister implements Persister { draftHandler.updateDrafts(transaction, mgr); - PUB.debug("publish - complete for [{}]", desc.getName()); + PUB.debug("publish - complete for [{}]", desc.name()); return livePublish; } @@ -336,7 +336,7 @@ public final class DefaultPersister implements Persister { List ids = getBeanIds(desc, sourceBeans); - Query destQuery = server.find(desc.getBeanType()).where().idIn(ids).query(); + Query destQuery = server.find(desc.type()).where().idIn(ids).query(); if (asDraft) { destQuery.asDraft(); } @@ -348,7 +348,7 @@ public final class DefaultPersister implements Persister { * Publish/restore the values from the sourceBean to the matching destination bean. */ T publishToDestinationBean(T sourceBean) { - id = desc.beanId(sourceBean); + id = desc.id(sourceBean); T destBean = destBeans.get(id); insert = (destBean == null); // apply changes from liveBean to draftBean @@ -714,7 +714,7 @@ public final class DefaultPersister implements Persister { if (idList != null) { q.where().idIn(idList); if (t.isLogSummary()) { - t.logSummary("-- DeleteById of " + descriptor.getName() + " ids[" + idList + "] requires fetch of foreign key values"); + t.logSummary("-- DeleteById of " + descriptor.name() + " ids[" + idList + "] requires fetch of foreign key values"); } List beanList = server.findList(q, t); deleteList(beanList, t, deleteMode, false); @@ -723,7 +723,7 @@ public final class DefaultPersister implements Persister { } else { q.where().idEq(id); if (t.isLogSummary()) { - t.logSummary("-- DeleteById of " + descriptor.getName() + " id[" + id + "] requires fetch of foreign key values"); + t.logSummary("-- DeleteById of " + descriptor.name() + " id[" + id + "] requires fetch of foreign key values"); } EntityBean bean = (EntityBean) server.findOne(q, t); if (bean == null) { @@ -793,9 +793,9 @@ public final class DefaultPersister implements Persister { SqlUpdate deleteById = descriptor.deleteById(id, idList, deleteMode); if (t.isLogSummary()) { if (idList != null) { - t.logSummary("-- Deleting " + descriptor.getName() + " Ids: " + idList); + t.logSummary("-- Deleting " + descriptor.name() + " Ids: " + idList); } else { - t.logSummary("-- Deleting " + descriptor.getName() + " Id: " + id); + t.logSummary("-- Deleting " + descriptor.name() + " Id: " + id); } } @@ -823,9 +823,9 @@ public final class DefaultPersister implements Persister { private void notifyDeleteById(BeanDescriptor descriptor, Object id, List idList, Transaction transaction) { - BeanPersistController controller = descriptor.getPersistController(); + BeanPersistController controller = descriptor.persistController(); if (controller != null) { - DeleteIdRequest request = new DeleteIdRequest(server, transaction, descriptor.getBeanType(), id); + DeleteIdRequest request = new DeleteIdRequest(server, transaction, descriptor.type(), id); if (idList == null) { controller.preDelete(request); } else { @@ -843,7 +843,7 @@ public final class DefaultPersister implements Persister { */ private Query deleteRequiresQuery(BeanDescriptor desc, BeanPropertyAssocOne[] propImportDelete, DeleteMode deleteMode) { - Query q = server.createQuery(desc.getBeanType()); + Query q = server.createQuery(desc.type()); StringBuilder sb = new StringBuilder(30); for (BeanPropertyAssocOne aPropImportDelete : propImportDelete) { sb.append(aPropImportDelete.getName()).append(","); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index ed183afaf..62f26503f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -50,7 +50,7 @@ final class DeleteUnloadedForeignKeys { void queryForeignKeys() { BeanDescriptor descriptor = request.descriptor(); - SpiQuery q = (SpiQuery) server.createQuery(descriptor.getBeanType()); + SpiQuery q = (SpiQuery) server.createQuery(descriptor.type()); Object id = request.beanId(); @@ -69,7 +69,7 @@ final class DeleteUnloadedForeignKeys { SpiTransaction t = request.transaction(); if (t.isLogSummary()) { - t.logSummary("-- Ebean fetching foreign key values for delete of " + descriptor.getName() + " id:" + id); + t.logSummary("-- Ebean fetching foreign key values for delete of " + descriptor.name() + " id:" + id); } beanWithForeignKeys = (EntityBean) server.findOne(q, t); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index 3e09a44f9..b50fe6dfc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -82,11 +82,11 @@ final class MergeHandler { * We use the Id values to determine what are inserts, updates and deletes as part of the merge. */ private EntityBean fetchOutline(Set paths) { - Query query = server.find(desc.getBeanType()); + Query query = server.find(desc.type()); query.setBeanCacheMode(CacheMode.OFF); query.setPersistenceContextScope(PersistenceContextScope.QUERY); query.setId(desc.getId(bean)); - query.select(desc.getIdProperty().getName()); + query.select(desc.idProperty().getName()); for (String path : paths) { MergeNode node = buildNode(path); @@ -128,7 +128,7 @@ final class MergeHandler { static MergeNode createMergeNode(String fullPath, BeanDescriptor targetDesc, String path) { BeanProperty prop = targetDesc.getBeanProperty(path); if (!(prop instanceof BeanPropertyAssoc)) { - throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName()); + throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.fullName()); } if (prop instanceof BeanPropertyAssocMany) { BeanPropertyAssocMany assocMany = (BeanPropertyAssocMany) prop; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java index cc5ebeaba..3c1f77db3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java @@ -71,7 +71,7 @@ abstract class MergeNode { * Add to the query to fetch the Ids values for the foreign keys basically. */ final void addSelectId(Query query) { - BeanProperty idProperty = targetDescriptor.getIdProperty(); + BeanProperty idProperty = targetDescriptor.idProperty(); query.fetch(fullPath, idProperty.getName()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java index 68438bf40..9922c1feb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java @@ -51,7 +51,7 @@ final class MergeNodeAssocOne extends MergeNode { private boolean isUpdate(Object beanId, Object outlineId, MergeRequest request) { return Objects.equals(beanId, outlineId) || !request.isClientGeneratedIds() - || request.idExists(targetDescriptor.getBeanType(), beanId); + || request.idExists(targetDescriptor.type(), beanId); } private EntityBean getEntityBean(Object bean) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 6e842863e..d150188de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -225,7 +225,7 @@ public final class SaveManyBeans extends SaveManyBase { detailBean = ((Map.Entry) detailBean).getValue(); } if (detailBean instanceof EntityBean) { - Object id = targetDescriptor.beanId(detailBean); + Object id = targetDescriptor.id(detailBean); if (!isNullOrZero(id)) { // remember the Id (other details not in the collection) will be removed detailIds.add(id); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index 78f653af3..c51f99a42 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -23,7 +23,7 @@ final class DeleteMeta extends BaseMeta { DeleteMeta(BeanDescriptor desc, BindableId id, Bindable version, Bindable tenantId) { super(id, version, tenantId); - String tableName = desc.getBaseTable(); + String tableName = desc.baseTable(); this.sqlNone = genSql(ConcurrencyMode.NONE, tableName); this.sqlVersion = genSql(ConcurrencyMode.VERSION, tableName); if (desc.isDraftable()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java index 588b778e7..73096138e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java @@ -48,7 +48,7 @@ final class InsertMeta { this.allExcludeDraftOnly = all.excludeDraftOnly(); this.shadowFKey = shadowFKey; - String tableName = desc.getBaseTable(); + String tableName = desc.baseTable(); String draftTableName = desc.getDraftTable(); this.sqlWithId = genSql(false, tableName, false); this.sqlDraftWithId = desc.isDraftable() ? genSql(false, draftTableName, true) : sqlWithId; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 768fd380d..af7f2546b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -56,7 +56,7 @@ public final class BindableUnidirectional implements Bindable { PersistRequestBean persistRequest = request.getPersistRequest(); Object parentBean = persistRequest.parentBean(); if (parentBean == null) { - Class localType = desc.getBeanType(); + Class localType = desc.type(); Class targetType = unidirectional.getTargetType(); String msg = "Error inserting bean [" + localType + "] with unidirectional relationship. "; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java index 398f59ecf..b72e9b8e6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java @@ -13,7 +13,7 @@ public final class FactoryId { * Add uniqueId properties. */ public BindableId createId(BeanDescriptor desc) { - BeanProperty id = desc.getIdProperty(); + BeanProperty id = desc.idProperty(); if (id == null) { return new BindableIdEmpty(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index c517341e9..4ca34c33a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -564,7 +564,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi public void profile() { getTransaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.getName(), loadedBeanCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), loadedBeanCount, query.getProfileId()); } QueryIterator readIterate(int bufferSize, OrmQueryRequest request) { @@ -637,7 +637,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi * Return the short bean name. */ String getBeanName() { - return desc.getName(); + return desc.name(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 709653a30..8840575c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -145,7 +145,7 @@ final class CQueryBuilder { private String buildUpdateSql(OrmQueryRequest request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) { StringBuilder sb = new StringBuilder(200); - sb.append("update ").append(request.descriptor().getBaseTable()); + sb.append("update ").append(request.descriptor().baseTable()); if (rootTableAlias != null) { sb.append(" ").append(rootTableAlias); } @@ -361,7 +361,7 @@ final class CQueryBuilder { BeanDescriptor desc = request.descriptor(); if (desc.isReadAuditing()) { // log the query plan based bean type (i.e. ignoring query disabling for logging the sql/plan) - desc.getReadAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.getFullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql())); + desc.getReadAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.fullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql())); } // cache the query plan because we can reuse it and also // gather query performance statistics based on it. @@ -465,7 +465,7 @@ final class CQueryBuilder { } } if (el == null) { - throw new PersistenceException("Property [" + propertyName + "] not found on " + descriptor.getFullName()); + throw new PersistenceException("Property [" + propertyName + "] not found on " + descriptor.fullName()); } addRawColumnMapping(pathProps, column, propertyName, el); } @@ -478,7 +478,7 @@ final class CQueryBuilder { } // check if @Id property included in RawSql boolean rawNoId = true; - BeanProperty idProperty = descriptor.getIdProperty(); + BeanProperty idProperty = descriptor.idProperty(); if (idProperty != null && columnMapping.contains(idProperty.getName())) { // contains the @Id property for the root level bean rawNoId = false; @@ -583,7 +583,7 @@ final class CQueryBuilder { sb.append("r1.attribute_, count(*) from (select "); if (distinct) { sb.append("distinct t0."); - sb.append(request.descriptor().getIdProperty().getDbColumn()).append(", "); + sb.append(request.descriptor().idProperty().getDbColumn()).append(", "); } sb.append(select.getSelectSql()).append(" as attribute_"); } else { @@ -663,7 +663,7 @@ final class CQueryBuilder { BeanDescriptor desc = request.descriptor(); String idSql = desc.getIdBinderIdSql(query.getAlias()); if (idSql.isEmpty()) { - throw new IllegalStateException("Executing FindById query on entity bean " + desc.getName() + throw new IllegalStateException("Executing FindById query on entity bean " + desc.name() + " that doesn't have an @Id property??"); } if (updateStatement) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 466f812ed..6b19c0aa8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -66,7 +66,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca StringBuilder sb = new StringBuilder(80); sb.append("FindAttr exeMicros[").append(executionTimeMicros) .append("] rows[").append(rowCount) - .append("] type[").append(desc.getName()) + .append("] type[").append(desc.name()) .append("] predicates[").append(predicates.getLogWhereSql()) .append("] bind[").append(bindLog).append("]"); return sb.toString(); @@ -168,7 +168,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca public void profile() { getTransaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.getName(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); } Set getDependentTables() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index ba6a3a459..698963c75 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -87,7 +87,7 @@ public class CQueryPlan implements SpiQueryPlan { CQueryPlan(OrmQueryRequest request, SqlLimitResponse sqlRes, SqlTree sqlTree, boolean rawSql, String logWhereSql) { this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); - this.beanType = request.descriptor().getBeanType(); + this.beanType = request.descriptor().type(); this.planKey = request.queryPlanKey(); SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); @@ -112,7 +112,7 @@ public class CQueryPlan implements SpiQueryPlan { CQueryPlan(OrmQueryRequest request, String sql, SqlTree sqlTree, String logWhereSql) { this.server = request.server(); this.dataTimeZone = server.getDataTimeZone(); - this.beanType = request.descriptor().getBeanType(); + this.beanType = request.descriptor().type(); SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index 78b4093f7..da7def29b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -56,7 +56,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer StringBuilder sb = new StringBuilder(80); sb.append("FindCount exeMicros[").append(executionTimeMicros) .append("] rows[").append(rowCount) - .append("] type[").append(desc.getFullName()) + .append("] type[").append(desc.fullName()) .append("] predicates[").append(predicates.getLogWhereSql()) .append("] bind[").append(bindLog).append("]"); @@ -137,7 +137,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer public void profile() { getTransaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.getName(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); } Set getDependentTables() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index b49849cfd..8e7dfd1f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -113,7 +113,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery public void profile() { getTransaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.getName(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java index 8348066ee..fae7ab110 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java @@ -15,7 +15,7 @@ public interface STreeType { /** * Return the bean short name. */ - String getName(); + String name(); /** * Return true if the underlying type has an Id property. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 9d5d7d613..23768e29e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -165,7 +165,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< public DefaultOrmQuery(BeanDescriptor desc, SpiEbeanServer server, ExpressionFactory expressionFactory) { this.beanDescriptor = desc; this.rootBeanDescriptor = desc; - this.beanType = desc.getBeanType(); + this.beanType = desc.type(); this.server = server; this.orderById = server.config().isDefaultOrderById(); this.disableLazyLoading = server.config().isDisableLazyLoading(); @@ -1688,7 +1688,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< @Override public Class getInheritType() { - return beanDescriptor.getBeanType(); + return beanDescriptor.type(); } @SuppressWarnings("unchecked") diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 90f4cbac1..a8a453bee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -309,7 +309,7 @@ public final class OrmQueryDetail implements Serializable { if (parentProp == null) { ElPropertyValue el = d.getElGetValue(parentPath); if (el == null) { - throw new PersistenceException("Path [" + parentPath + "] not valid from " + d.getFullName()); + throw new PersistenceException("Path [" + parentPath + "] not valid from " + d.fullName()); } // add a missing parent path just fetching the Id property BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.getBeanProperty(); @@ -372,7 +372,7 @@ public final class OrmQueryDetail implements Serializable { String fetchPath = entry.getKey(); ElPropertyDeploy elProp = desc.getElPropertyDeploy(fetchPath); if (elProp == null) { - throw new PersistenceException("Invalid fetch path " + fetchPath + " from " + desc.getFullName()); + throw new PersistenceException("Invalid fetch path " + fetchPath + " from " + desc.fullName()); } entries.add(new FetchEntry(idx++, fetchPath, elProp, entry.getValue())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index 2f3c0716b..023f6705e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -124,7 +124,7 @@ public class TCsvReader implements CsvReader { @Override public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) { - ExpressionPath elProp = descriptor.getExpressionPath(propertyName); + ExpressionPath elProp = descriptor.expressionPath(propertyName); if (!elProp.isDateTimeCapable()) { throw new TextException("Property " + propertyName + " is not DateTime capable"); } @@ -160,7 +160,7 @@ public class TCsvReader implements CsvReader { @Override public void addProperty(String propertyName, StringParser parser) { - ExpressionPath elProp = descriptor.getExpressionPath(propertyName); + ExpressionPath elProp = descriptor.expressionPath(propertyName); if (parser == null) { parser = elProp.getStringParser(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index 4ae521e16..c8a83e649 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -529,7 +529,7 @@ public final class WriteJson implements SpiJsonWriter { public void write(WriteJson writeJson) { try { - BeanProperty beanProp = desc.getIdProperty(); + BeanProperty beanProp = desc.idProperty(); if (beanProp != null) { if (isIncludeProperty(beanProp)) { beanProp.jsonWrite(writeJson, currentBean); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java index 8274af4bb..4eba89103 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java @@ -37,7 +37,7 @@ public final class BeanPersistIdMap { } private BeanPersistIds getPersistIds(BeanDescriptor desc) { - String beanType = desc.getFullName(); + String beanType = desc.fullName(); return beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java index 280f3c28f..09195bae2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java @@ -94,7 +94,7 @@ public final class BeanPersistIds implements BinaryWritable { StringBuilder sb = new StringBuilder(); sb.append("BeanIds["); if (beanDescriptor != null) { - sb.append(beanDescriptor.getFullName()); + sb.append(beanDescriptor.fullName()); } else { sb.append("descId:").append(descriptorId); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java index ca2cc1f27..89a831515 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -63,7 +63,7 @@ public final class DeleteByIdMap { } private BeanPersistIds getPersistIds(BeanDescriptor desc) { - String beanType = desc.getFullName(); + String beanType = desc.fullName(); return beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc)); } @@ -77,7 +77,7 @@ public final class DeleteByIdMap { if (DocStoreMode.IGNORE != mode) { // Add to queue or bulk update entries boolean queue = (DocStoreMode.QUEUE == mode); - String queueId = desc.getDocStoreQueueId(); + String queueId = desc.docStoreQueueId(); List idValues = deleteIds.getIds(); if (idValues != null) { for (Object idValue : idValues) { diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 7212f74ee..be62500d2 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -175,11 +175,11 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< String path = pathProp.getPath(); if (path != null) { BeanDescriptor targetDesc = desc.getBeanDescriptor(path); - BeanProperty idProperty = targetDesc.getIdProperty(); + BeanProperty idProperty = targetDesc.idProperty(); if (idProperty != null) { // embedded beans don't have id property String fullPath = path + "." + idProperty.getName(); - targetDesc.docStoreAdapter().registerInvalidationPath(desc.getDocStoreQueueId(), fullPath, pathProp.getProperties()); + targetDesc.docStoreAdapter().registerInvalidationPath(desc.docStoreQueueId(), fullPath, pathProp.getProperties()); } } } @@ -323,7 +323,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< * Return the supplied value or default to the bean name lower case. */ protected String derive(BeanType desc, String suppliedValue) { - return (suppliedValue != null && !suppliedValue.isEmpty()) ? suppliedValue : desc.getName().toLowerCase(); + return (suppliedValue != null && !suppliedValue.isEmpty()) ? suppliedValue : desc.name().toLowerCase(); } @Override diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java index 9c758b426..35c120bd4 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java @@ -34,6 +34,6 @@ public class DocStoreDeleteEvent implements DocStoreUpdate { */ @Override public void addToQueue(DocStoreUpdates docStoreUpdates) { - docStoreUpdates.queueDelete(beanType.getDocStoreQueueId(), idValue); + docStoreUpdates.queueDelete(beanType.docStoreQueueId(), idValue); } } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java index 20354a94c..ad1e5a706 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java @@ -37,6 +37,6 @@ public class DocStoreIndexEvent implements DocStoreUpdate { */ @Override public void addToQueue(DocStoreUpdates docStoreUpdates) { - docStoreUpdates.queueIndex(beanType.getDocStoreQueueId(), idValue); + docStoreUpdates.queueIndex(beanType.docStoreQueueId(), idValue); } } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java index e67e473f3..3c9aec803 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java @@ -87,7 +87,7 @@ public class DocStructure { BeanDescriptor targetDesc = embProp.getTargetDescriptor(); PathProperties manyRootPath = new PathProperties(); - manyRootPath.addToPath(null, targetDesc.getIdProperty().getName()); + manyRootPath.addToPath(null, targetDesc.idProperty().getName()); manyRootPath.addNested(prop, embedded.get(prop)); manyRoot.put(prop, manyRootPath); diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index fe24cfc96..bcfebbf25 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -31,33 +31,33 @@ public class BeanTypeTest { @Test public void getBeanType() { - assertThat(beanType(Order.class).getBeanType()).isEqualTo(Order.class); + assertThat(beanType(Order.class).type()).isEqualTo(Order.class); } @Test public void getTypeAtPath_when_ManyToOne() { BeanType orderType = beanType(Order.class); - BeanType customerType = orderType.getBeanTypeAtPath("customer"); - assertThat(customerType.getBeanType()).isEqualTo(Customer.class); + BeanType customerType = orderType.beanTypeAtPath("customer"); + assertThat(customerType.type()).isEqualTo(Customer.class); } @Test public void getTypeAtPath_when_OneToMany() { BeanType orderType = beanType(Order.class); - BeanType detailsType = orderType.getBeanTypeAtPath("details"); - assertThat(detailsType.getBeanType()).isEqualTo(OrderDetail.class); + BeanType detailsType = orderType.beanTypeAtPath("details"); + assertThat(detailsType.type()).isEqualTo(OrderDetail.class); } @Test public void getTypeAtPath_when_nested() { BeanType orderType = beanType(Order.class); - BeanType productType = orderType.getBeanTypeAtPath("details.product"); - assertThat(productType.getBeanType()).isEqualTo(Product.class); + BeanType productType = orderType.beanTypeAtPath("details.product"); + assertThat(productType.type()).isEqualTo(Product.class); } @Test public void getTypeAtPath_when_simpleType() { - assertThrows(RuntimeException.class, () -> beanType(Order.class).getBeanTypeAtPath("status")); + assertThrows(RuntimeException.class, () -> beanType(Order.class).beanTypeAtPath("status")); } @Test @@ -70,7 +70,7 @@ public class BeanTypeTest { Order order = new Order(); order.setStatus(Order.Status.APPROVED); - Property statusProperty = beanType(Order.class).getProperty("status"); + Property statusProperty = beanType(Order.class).property("status"); assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus()); } @@ -78,7 +78,7 @@ public class BeanTypeTest { @Test public void getBaseTable() { - assertThat(beanType(Order.class).getBaseTable()).isEqualTo("o_order"); + assertThat(beanType(Order.class).baseTable()).isEqualTo("o_order"); } @Test @@ -87,7 +87,7 @@ public class BeanTypeTest { Order order = new Order(); order.setId(42); - Object id1 = beanType(Order.class).beanId(order); + Object id1 = beanType(Order.class).id(order); assertThat(id1).isEqualTo(order.getId()); } @@ -95,7 +95,7 @@ public class BeanTypeTest { public void setBeanId() { Order order = new Order(); - beanType(Order.class).setBeanId(order, 42); + beanType(Order.class).setId(order, 42); assertThat(42).isEqualTo(order.getId()); } @@ -106,8 +106,8 @@ public class BeanTypeTest { assertThat(beanType(Order.class).isDocStoreMapped()).isFalse(); assertThat(beanType(Person.class).isDocStoreMapped()).isFalse(); - assertThat(beanType(Order.class).getDocMapping()).isNotNull(); - assertThat(beanType(Person.class).getDocMapping()).isNull(); + assertThat(beanType(Order.class).docMapping()).isNotNull(); + assertThat(beanType(Person.class).docMapping()).isNull(); } @Test @@ -136,8 +136,8 @@ public class BeanTypeTest { @Test public void getDocStoreQueueId() { - assertThat(beanType(Order.class).getDocStoreQueueId()).isEqualTo("order"); - assertThat(beanType(Customer.class).getDocStoreQueueId()).isEqualTo("customer"); + assertThat(beanType(Order.class).docStoreQueueId()).isEqualTo("order"); + assertThat(beanType(Customer.class).docStoreQueueId()).isEqualTo("customer"); } @Test @@ -205,12 +205,12 @@ public class BeanTypeTest { @Test public void getDiscColumn_when_default() { - assertEquals(beanType(Car.class).getDiscColumn(), "dtype"); + assertEquals(beanType(Car.class).discColumn(), "dtype"); } @Test public void getDiscColumn_when_set() { - assertEquals(beanType(Stockforecast.class).getDiscColumn(), "type"); + assertEquals(beanType(Stockforecast.class).discColumn(), "type"); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index d5073bb98..4bf5d1f0e 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java @@ -22,42 +22,42 @@ public class ExpressionPathTest { public void containsMany_when_many() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("details").containsMany()).isTrue(); + assertThat(beanType.expressionPath("details").containsMany()).isTrue(); } @Test public void containsMany_when_manyChild() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("details.id").containsMany()).isTrue(); + assertThat(beanType.expressionPath("details.id").containsMany()).isTrue(); } @Test public void containsMany_when_manyGrandChild() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("details.product.sku").containsMany()).isTrue(); + assertThat(beanType.expressionPath("details.product.sku").containsMany()).isTrue(); } @Test public void containsMany_when_one() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("customer.name").containsMany()).isFalse(); + assertThat(beanType.expressionPath("customer.name").containsMany()).isFalse(); } @Test public void containsMany_when_oneWithMany() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("customer.contacts").containsMany()).isTrue(); + assertThat(beanType.expressionPath("customer.contacts").containsMany()).isTrue(); } @Test public void containsMany_when_oneWithManyChild() throws Exception { BeanType beanType = beanType(Order.class); - assertThat(beanType.getExpressionPath("customer.contacts.firstName").containsMany()).isTrue(); + assertThat(beanType.expressionPath("customer.contacts.firstName").containsMany()).isTrue(); } @Test @@ -65,7 +65,7 @@ public class ExpressionPathTest { BeanType beanType = beanType(Order.class); Order order = new Order(); - beanType.getExpressionPath("id").pathSet(order, 42); + beanType.expressionPath("id").pathSet(order, 42); assertThat(order.getId()).isEqualTo(42); } @@ -74,7 +74,7 @@ public class ExpressionPathTest { BeanType beanType = beanType(Order.class); Order order = new Order(); - beanType.getExpressionPath("customer.name").pathSet(order, "Rob"); + beanType.expressionPath("customer.name").pathSet(order, "Rob"); assertThat(order.getCustomer().getName()).isEqualTo("Rob"); } @@ -94,7 +94,7 @@ public class ExpressionPathTest { customer = server.find(Customer.class, customer.getId()); assertThat(customer.getName()).isEqualTo("foo"); - customerBeanType.getExpressionPath("name").pathSet(customer, "bar"); + customerBeanType.expressionPath("name").pathSet(customer, "bar"); server.save(customer); customer = server.find(Customer.class, customer.getId()); @@ -108,7 +108,7 @@ public class ExpressionPathTest { order = server.find(Order.class, order.getId()); - ExpressionPath customerNamePath = orderBeanType.getExpressionPath("customer.name"); + ExpressionPath customerNamePath = orderBeanType.expressionPath("customer.name"); assertThat(customerNamePath.pathGet(order)).isEqualTo("bar"); customerNamePath.pathSet(order, "baz"); diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index ca5ebecc1..00ed9d9cd 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -27,30 +27,30 @@ public class PropertyTest { order.setCustomer(customer); order.setStatus(Order.Status.APPROVED); - Property statusProperty = beanType(Order.class).getProperty("status"); + Property statusProperty = beanType(Order.class).property("status"); assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus()); - Property customerProperty = beanType(Order.class).getProperty("customer"); + Property customerProperty = beanType(Order.class).property("customer"); assertThat(customerProperty.getVal(order)).isEqualTo(customer); } @Test public void isMany_when_not() { - assertThat(beanType(Order.class).getProperty("status").isMany()).isFalse(); - assertThat(beanType(Order.class).getProperty("customer").isMany()).isFalse(); + assertThat(beanType(Order.class).property("status").isMany()).isFalse(); + assertThat(beanType(Order.class).property("customer").isMany()).isFalse(); } @Test public void isMany_when_true() { - assertThat(beanType(Order.class).getProperty("details").isMany()).isTrue(); + assertThat(beanType(Order.class).property("details").isMany()).isTrue(); } @Test public void name() { - assertThat(beanType(Order.class).getProperty("status").getName()).isEqualTo("status"); - assertThat(beanType(Order.class).getProperty("customer").getName()).isEqualTo("customer"); - assertThat(beanType(Order.class).getProperty("details").getName()).isEqualTo("details"); + assertThat(beanType(Order.class).property("status").getName()).isEqualTo("status"); + assertThat(beanType(Order.class).property("customer").getName()).isEqualTo("customer"); + assertThat(beanType(Order.class).property("details").getName()).isEqualTo("details"); } } diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index 9426ed5d2..f36edd730 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -26,12 +26,12 @@ public class SpiServerTest extends BaseTestCase { SpiServer pluginApi = defaultServer.pluginApi(); BeanType beanType = pluginApi.beanType(Customer.class); - assertEquals("o_customer", beanType.getBaseTable()); + assertEquals("o_customer", beanType.baseTable()); assertNotNull(pluginApi.databasePlatform()); - assertNull(beanType.getFindController()); - assertNotNull(beanType.getPersistController()); - assertNull(beanType.getPersistListener()); - assertNull(beanType.getQueryAdapter()); + assertNull(beanType.findController()); + assertNotNull(beanType.persistController()); + assertNull(beanType.persistListener()); + assertNull(beanType.queryAdapter()); assertTrue(beanType.isValidExpression("name")); assertTrue(beanType.isValidExpression("contacts.firstName")); @@ -43,7 +43,7 @@ public class SpiServerTest extends BaseTestCase { Customer customer = new Customer(); customer.setId(42); - assertEquals(42, beanType.beanId(customer)); + assertEquals(42, beanType.id(customer)); List> beanTypes = pluginApi.beanTypes("o_customer"); assertEquals(2, beanTypes.size()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index 7f85b26c0..2b3dd7b11 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -17,7 +17,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { BeanDescriptor desc = getBeanDescriptor(Order.class); - DocumentMapping documentMapping = desc.getDocMapping(); + DocumentMapping documentMapping = desc.docMapping(); DocPropertyMapping properties = documentMapping.getProperties(); @@ -29,7 +29,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { BeanDescriptor desc = getBeanDescriptor(Order.class); - DocumentMapping documentMapping = desc.getDocMapping(); + DocumentMapping documentMapping = desc.docMapping(); DocPropertyMapping properties = documentMapping.getProperties(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index fb9d7f92d..0ee380ee2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -39,42 +39,42 @@ public class BeanDescriptor_registerTest { Controller1 controller1 = new Controller1(); - assertNull(desc.getPersistController()); + assertNull(desc.persistController()); desc.register(controller1); - assertSame(controller1, desc.getPersistController()); + assertSame(controller1, desc.persistController()); Controller2 controller2 = new Controller2(); desc.register(controller2); - assertEquals(2, ((ChainedBeanPersistController) desc.getPersistController()).size()); + assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size()); desc.deregister(controller1); - assertEquals(1, ((ChainedBeanPersistController) desc.getPersistController()).size()); + assertEquals(1, ((ChainedBeanPersistController) desc.persistController()).size()); desc.deregister(controller2); - assertEquals(0, ((ChainedBeanPersistController) desc.getPersistController()).size()); + assertEquals(0, ((ChainedBeanPersistController) desc.persistController()).size()); } private void persistListenerRegistrationTests(BeanDescriptor desc) { Listener1 listener1 = new Listener1(); - assertNull(desc.getPersistListener()); + assertNull(desc.persistListener()); desc.register(listener1); - assertSame(listener1, desc.getPersistListener()); + assertSame(listener1, desc.persistListener()); Listener2 listener2 = new Listener2(); desc.register(listener2); - BeanPersistListener persistListener = desc.getPersistListener(); + BeanPersistListener persistListener = desc.persistListener(); assertTrue(persistListener instanceof ChainedBeanPersistListener); assertEquals(2, ((ChainedBeanPersistListener) persistListener).size()); desc.deregister(listener1); - assertEquals(1, ((ChainedBeanPersistListener) desc.getPersistListener()).size()); + assertEquals(1, ((ChainedBeanPersistListener) desc.persistListener()).size()); desc.deregister(listener2); - assertEquals(0, ((ChainedBeanPersistListener) desc.getPersistListener()).size()); + assertEquals(0, ((ChainedBeanPersistListener) desc.persistListener()).size()); } public static class Listener1 extends AbstractBeanPersistListener { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 655e7f300..0b095dc54 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -21,15 +21,15 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { BeanDescriptor desc = server.getBeanDescriptor(Customer.class); - BeanProperty whenCreatedProperty = desc.getWhenCreatedProperty(); + BeanProperty whenCreatedProperty = desc.whenCreatedProperty(); assertEquals("cretime", whenCreatedProperty.getDbColumn()); - BeanProperty whenModifiedProperty = desc.getWhenModifiedProperty(); + BeanProperty whenModifiedProperty = desc.whenModifiedProperty(); assertEquals("updtime", whenModifiedProperty.getDbColumn()); BeanDescriptor eBasicDesc = server.getBeanDescriptor(EBasic.class); - assertNull(eBasicDesc.getWhenCreatedProperty()); - assertNull(eBasicDesc.getWhenModifiedProperty()); + assertNull(eBasicDesc.whenCreatedProperty()); + assertNull(eBasicDesc.whenModifiedProperty()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index a8ff657e3..b5b909ee0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -32,8 +32,8 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { public void testHasId() { BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Order.class); - assertNotNull(beanDescriptor.getIdProperty()); - assertEquals("id", beanDescriptor.getIdProperty().getName()); + assertNotNull(beanDescriptor.idProperty()); + assertEquals("id", beanDescriptor.idProperty().getName()); assertNotNull(beanDescriptor.getVersionProperty()); assertEquals("updtime", beanDescriptor.getVersionProperty().getName()); diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 28a4f868b..8927ded5d 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -46,7 +46,7 @@ public class TestDPersonEl { EntityBean entityBean = (EntityBean) p; - ExpressionPath elSalary = descriptor.getExpressionPath("salary"); + ExpressionPath elSalary = descriptor.expressionPath("salary"); Object money = elSalary.pathGet(entityBean); diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index 59a19dbf7..26fa4e0e4 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -22,9 +22,9 @@ public class TestPathExpression { public TestPathExpression() { SpiServer server = DB.getDefault().pluginApi(); beanType = server.beanType(Customer.class); - billingId = beanType.getExpressionPath("billingAddress.id"); - line1 = beanType.getExpressionPath("billingAddress.line1"); - city = beanType.getExpressionPath("billingAddress.city"); + billingId = beanType.expressionPath("billingAddress.id"); + line1 = beanType.expressionPath("billingAddress.line1"); + city = beanType.expressionPath("billingAddress.city"); } @Test @@ -35,11 +35,11 @@ public class TestPathExpression { city.pathSet(c1, "Auckland"); billingId.pathSet(c1, 4); - beanType.getExpressionPath("id").pathSet(c1, 42L); - beanType.getExpressionPath("name").pathSet(c1, "jimmy"); - beanType.getExpressionPath("status").pathSet(c1, "ACTIVE"); - beanType.getExpressionPath("billingAddress.country.code").pathSet(c1, "NZ"); - beanType.getExpressionPath("billingAddress.country.name").pathSet(c1, "New Zealand"); + beanType.expressionPath("id").pathSet(c1, 42L); + beanType.expressionPath("name").pathSet(c1, "jimmy"); + beanType.expressionPath("status").pathSet(c1, "ACTIVE"); + beanType.expressionPath("billingAddress.country.code").pathSet(c1, "NZ"); + beanType.expressionPath("billingAddress.country.name").pathSet(c1, "New Zealand"); assertEquals(c1.getId(), Integer.valueOf(42)); @@ -75,7 +75,7 @@ public class TestPathExpression { assertEquals(billingId.pathGet(e0), Integer.valueOf("12")); - assertEquals(beanType.getExpressionPath("billingAddress.country.code").pathGet(e0), "NZ"); - assertEquals(beanType.getExpressionPath("billingAddress.country.name").pathGet(e0), "New Zealand"); + assertEquals(beanType.expressionPath("billingAddress.country.code").pathGet(e0), "NZ"); + assertEquals(beanType.expressionPath("billingAddress.country.name").pathGet(e0), "New Zealand"); } } diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 234deee5f..b8f578986 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -29,7 +29,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { EAddr addr = new EAddr("Foo", "Bar", nz); EPerAddr perAddr = new EPerAddr("Embed", addr); - Property country = embType.getProperty("country"); + Property country = embType.property("country"); Object val = country.getVal(addr); assertThat(val).isSameAs(nz); diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java index bc9e6bba6..fb8fb0e00 100644 --- a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java @@ -217,22 +217,22 @@ public class TestNewTypes extends BaseTestCase { private void testSetGetPath(SomeNewTypesBean refBean) { SomeNewTypesBean testBean = new SomeNewTypesBean(); BeanType beanType = DB.getDefault().pluginApi().beanType(SomeNewTypesBean.class); - ExpressionPath localDate = beanType.getExpressionPath("localDate"); - ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime"); - ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime"); - ExpressionPath zonedDateTime = beanType.getExpressionPath("zonedDateTime"); - ExpressionPath localTime = beanType.getExpressionPath("localTime"); - ExpressionPath instant = beanType.getExpressionPath("instant"); - ExpressionPath year = beanType.getExpressionPath("year"); - ExpressionPath month = beanType.getExpressionPath("month"); - ExpressionPath dayOfWeek = beanType.getExpressionPath("dayOfWeek"); - ExpressionPath zoneId = beanType.getExpressionPath("zoneId"); - ExpressionPath zoneOffset = beanType.getExpressionPath("zoneOffset"); - ExpressionPath yearMonth = beanType.getExpressionPath("yearMonth"); - ExpressionPath monthDay = beanType.getExpressionPath("monthDay"); - ExpressionPath path = beanType.getExpressionPath("path"); - ExpressionPath period = beanType.getExpressionPath("period"); - ExpressionPath duration = beanType.getExpressionPath("duration"); + ExpressionPath localDate = beanType.expressionPath("localDate"); + ExpressionPath localDateTime = beanType.expressionPath("localDateTime"); + ExpressionPath offsetDateTime = beanType.expressionPath("offsetDateTime"); + ExpressionPath zonedDateTime = beanType.expressionPath("zonedDateTime"); + ExpressionPath localTime = beanType.expressionPath("localTime"); + ExpressionPath instant = beanType.expressionPath("instant"); + ExpressionPath year = beanType.expressionPath("year"); + ExpressionPath month = beanType.expressionPath("month"); + ExpressionPath dayOfWeek = beanType.expressionPath("dayOfWeek"); + ExpressionPath zoneId = beanType.expressionPath("zoneId"); + ExpressionPath zoneOffset = beanType.expressionPath("zoneOffset"); + ExpressionPath yearMonth = beanType.expressionPath("yearMonth"); + ExpressionPath monthDay = beanType.expressionPath("monthDay"); + ExpressionPath path = beanType.expressionPath("path"); + ExpressionPath period = beanType.expressionPath("period"); + ExpressionPath duration = beanType.expressionPath("duration"); localDate.pathSet(testBean, refBean.getLocalDate()); assertThat(localDate.pathGet(testBean)).isEqualTo(refBean.getLocalDate()); diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 31216b1a4..53be2b49a 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -10,7 +10,7 @@ ebean ddl generation DDL and DB Migration generation ebean-ddl-generator - + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 71faa1c44..6dcf22b5a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -89,14 +89,14 @@ public class MTable { private final List droppedColumns = new ArrayList<>(); public MTable(BeanDescriptor descriptor) { - this.name = descriptor.getBaseTable(); + this.name = descriptor.baseTable(); this.identityMode = descriptor.getIdentityMode(); this.storageEngine = descriptor.getStorageEngine(); this.partitionMeta = descriptor.getPartitionMeta(); this.comment = descriptor.getDbComment(); if (descriptor.isHistorySupport()) { withHistory = true; - BeanProperty whenCreated = descriptor.getWhenCreatedProperty(); + BeanProperty whenCreated = descriptor.whenCreatedProperty(); if (whenCreated != null) { whenCreatedColumn = whenCreated.getDbColumn(); } From 632f04c76bdbdca4fcc069833784025204fa5b66 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 14:04:31 +1200 Subject: [PATCH 076/102] #2359 - Rename plugin api methods with deprecation - Property --- .../java/io/ebean/plugin/ExpressionPath.java | 60 +++++++++++++++++-- .../main/java/io/ebean/plugin/Property.java | 30 +++++++++- .../service/ProfileOriginNodeUsage.java | 6 +- .../io/ebeaninternal/api/ManyWhereJoins.java | 2 +- .../server/cache/CachedBeanDataFromBean.java | 8 +-- .../server/cache/CachedBeanDataToBean.java | 4 +- .../server/core/DefaultBeanLoader.java | 8 +-- .../server/core/DefaultServer.java | 10 ++-- .../server/core/OrmQueryRequest.java | 2 +- .../server/core/PersistRequestBean.java | 2 +- .../deploy/AssocOneHelpRefExported.java | 4 +- .../server/deploy/AssocOneHelpRefInherit.java | 2 +- .../server/deploy/BaseCollectionHelp.java | 2 +- .../server/deploy/BeanChangeJson.java | 4 +- .../server/deploy/BeanDescriptor.java | 22 +++---- .../deploy/BeanDescriptorCacheHelp.java | 8 +-- .../deploy/BeanDescriptorDraftHelp.java | 4 +- .../deploy/BeanEmbeddedMetaFactory.java | 2 +- .../server/deploy/BeanFkeyProperty.java | 14 ++--- .../server/deploy/BeanMapHelp.java | 2 +- .../server/deploy/BeanProperty.java | 24 ++++---- .../server/deploy/BeanPropertyAssocMany.java | 16 ++--- .../server/deploy/BeanPropertyAssocOne.java | 22 +++---- .../server/deploy/DynamicPropertyBase.java | 2 +- .../server/deploy/ExportedProperty.java | 2 +- .../server/deploy/id/IdBinderEmbedded.java | 24 ++++---- .../server/deploy/id/IdBinderSimple.java | 12 ++-- .../server/deploy/id/ImportedIdEmbedded.java | 2 +- .../server/deploy/id/ImportedIdSimple.java | 2 +- .../deploy/meta/DeployBeanPropertyLists.java | 6 +- .../deploy/parse/AnnotationAssocManys.java | 2 +- .../server/el/ElComparatorProperty.java | 4 +- .../server/el/ElPropertyChain.java | 18 +++--- .../server/el/ElPropertyDeploy.java | 4 +- .../expression/DefaultExampleExpression.java | 2 +- .../server/expression/IdInExpression.java | 2 +- .../server/expression/InExpression.java | 2 +- .../server/expression/NullExpression.java | 2 +- .../server/expression/SimpleExpression.java | 8 +-- .../server/loadcontext/DLoadBeanContext.java | 2 +- .../server/persist/DefaultPersister.java | 2 +- .../persist/DeleteUnloadedForeignKeys.java | 2 +- .../server/persist/MergeHandler.java | 2 +- .../server/persist/MergeNode.java | 2 +- .../server/persist/MergeNodeAssocOne.java | 2 +- .../server/persist/SaveManyBase.java | 2 +- .../dmlbind/BindableEncryptedProperty.java | 4 +- .../io/ebeaninternal/server/query/CQuery.java | 4 +- .../server/query/CQueryBuilder.java | 2 +- .../server/query/CQueryOrderBy.java | 2 +- .../server/query/CQueryPredicates.java | 10 ++-- .../server/query/STreeProperty.java | 2 +- .../server/query/SqlTreeBuilder.java | 10 ++-- .../server/query/SqlTreeNodeBean.java | 2 +- .../server/query/SqlTreeProperties.java | 2 +- .../server/text/csv/TCsvReader.java | 8 +-- .../server/text/json/WriteJson.java | 4 +- .../api/support/DocStoreBeanBaseAdapter.java | 2 +- .../docstore/api/support/DocStructure.java | 2 +- .../java/io/ebean/plugin/BeanTypeTest.java | 2 +- .../java/io/ebean/plugin/PropertyTest.java | 10 ++-- .../TestBeanDescriptorHasIdProperty.java | 4 +- .../test/java/org/tests/el/TestELBasic.java | 6 +- .../tests/insert/TestInsertCheckUnique.java | 4 +- .../model/embedded/TestEmbeddedManyToOne.java | 2 +- .../build/ModelBuildPropertyVisitor.java | 10 ++-- 66 files changed, 265 insertions(+), 193 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java index 45de4c66b..b7675f87b 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java +++ b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java @@ -37,7 +37,15 @@ public interface ExpressionPath { /** * Return the default StringParser for the scalar property. */ - StringParser getStringParser(); + StringParser stringParser(); + + /** + * Deprecated migrate to stringParser(). + */ + @Deprecated + default StringParser getStringParser() { + return stringParser(); + } /** * For DateTime capable scalar types convert the long systemTimeMillis into @@ -54,7 +62,15 @@ public interface ExpressionPath { /** * Return the underlying JDBC type or 0 if this is not a scalar type. */ - int getJdbcType(); + int jdbcType(); + + /** + * Deprecated migrate to jdbcType(). + */ + @Deprecated + default int getJdbcType() { + return jdbcType(); + } /** * Return true if this is an ManyToOne or OneToOne associated bean property. @@ -67,20 +83,52 @@ public interface ExpressionPath { * Typically used to produce id = ? expression strings. *

    */ - String getAssocIdExpression(String propName, String bindOperator); + String assocIdExpression(String propName, String bindOperator); + + /** + * Deprecated migrate to assocIdExpression(). + */ + @Deprecated + default String getAssocIdExpression(String propName, String bindOperator) { + return assocIdExpression(propName, bindOperator); + } /** * Return the Id values for the given bean value. */ - Object[] getAssocIdValues(EntityBean bean); + Object[] assocIdValues(EntityBean bean); + + /** + * Deprecated migrate to assocIdValues(). + */ + @Deprecated + default Object[] getAssocIdValues(EntityBean bean) { + return assocIdValues(bean); + } /** * Return the underlying bean property. */ - Property getProperty(); + Property property(); + + /** + * Deprecated migrate to property(). + */ + @Deprecated + default Property getProperty() { + return property(); + } /** * The ElPrefix plus name. */ - String getElName(); + String elName(); + + /** + * Deprecated migrate to elName(). + */ + @Deprecated + default String getElName() { + return elName(); + } } diff --git a/ebean-api/src/main/java/io/ebean/plugin/Property.java b/ebean-api/src/main/java/io/ebean/plugin/Property.java index 20d81d7e5..50a1ebc3d 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/Property.java +++ b/ebean-api/src/main/java/io/ebean/plugin/Property.java @@ -11,18 +11,42 @@ public interface Property { * Return the name of the property. */ @Nonnull - String getName(); + String name(); + + /** + * Deprecated migrate to name(). + */ + @Deprecated + default String getName() { + return name(); + } /** * Return the type of the property. */ @Nonnull - Class getPropertyType(); + Class type(); + + /** + * Deprecated migrate to type(). + */ + @Deprecated + default Class getPropertyType() { + return type(); + } /** * Return the value of the property on the given bean. */ - Object getVal(Object bean); + Object value(Object bean); + + /** + * Deprecated migrate to value(). + */ + @Deprecated + default Object getVal(Object bean) { + return value(bean); + } /** * Return true if this is a OneToMany or ManyToMany property. diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 1ec851c05..c576c5628 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -76,7 +76,7 @@ public class ProfileOriginNodeUsage { // (which is the default for Lob's so typical). } else { addedToPath = true; - pathProps.addToPath(path, beanProp.getName()); + pathProps.addToPath(path, beanProp.name()); } } } @@ -86,14 +86,14 @@ public class ProfileOriginNodeUsage { BeanProperty versionProp = desc.getVersionProperty(); if (versionProp != null) { addedToPath = true; - pathProps.addToPath(path, versionProp.getName()); + pathProps.addToPath(path, versionProp.name()); } } if (toOneIdProperty != null && !addedToPath) { // add ToOne property to parent path ElPropertyValue assocOne = rootDesc.getElGetValue(path); - pathProps.addToPath(SplitName.parent(path), assocOne.getName()); + pathProps.addToPath(SplitName.parent(path), assocOne.name()); } } finally { lock.unlock(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 91fc49d21..08795611d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -52,7 +52,7 @@ public final class ManyWhereJoins implements Serializable { String join = elProp.getElPrefix(); BeanProperty p = elProp.getBeanProperty(); if (p instanceof BeanPropertyAssocMany) { - join = addManyToJoin(join, p.getName()); + join = addManyToJoin(join, p.name()); } if (join != null) { addJoin(join); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java index e1c5dde29..02353ba17 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -19,7 +19,7 @@ public final class CachedBeanDataFromBean { if (idProperty != null) { int propertyIndex = idProperty.getPropertyIndex(); if (ebi.isLoadedProperty(propertyIndex)) { - data.put(idProperty.getName(), idProperty.getCacheDataValue(bean)); + data.put(idProperty.name(), idProperty.getCacheDataValue(bean)); } } @@ -27,15 +27,15 @@ public final class CachedBeanDataFromBean { final boolean dirty = ebi.isDirty(); for (BeanProperty prop : desc.propertiesNonMany()) { if (dirty && ebi.isDirtyProperty(prop.getPropertyIndex())) { - data.put(prop.getName(), prop.getCacheDataValueOrig(ebi)); + data.put(prop.name(), prop.getCacheDataValueOrig(ebi)); } else if (ebi.isLoadedProperty(prop.getPropertyIndex())) { - data.put(prop.getName(), prop.getCacheDataValue(bean)); + data.put(prop.name(), prop.getCacheDataValue(bean)); } } for (BeanPropertyAssocMany prop : desc.propertiesMany()) { if (prop.isElementCollection()) { - data.put(prop.getName(), prop.getCacheDataValue(bean)); + data.put(prop.name(), prop.getCacheDataValue(bean)); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java index cafd763d1..1c3f4996f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java @@ -36,9 +36,9 @@ public final class CachedBeanDataToBean { } private static void loadProperty(EntityBean bean, CachedBeanData cacheBeanData, EntityBeanIntercept ebi, BeanProperty prop, PersistenceContext context) { - if (cacheBeanData.isLoaded(prop.getName())) { + if (cacheBeanData.isLoaded(prop.name())) { if (!ebi.isLoadedProperty(prop.getPropertyIndex())) { - Object value = cacheBeanData.getData(prop.getName()); + Object value = cacheBeanData.getData(prop.name()); prop.setCacheDataValue(bean, value, context); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index ae1d7129a..ef0efe603 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -93,18 +93,18 @@ final class DefaultBeanLoader { query.select(parentDesc.getIdBinder().getIdProperty()); if (onlyIds) { - query.fetch(many.getName(), many.getTargetIdProperty()); + query.fetch(many.name(), many.getTargetIdProperty()); } else { - query.fetch(many.getName()); + query.fetch(many.name()); } if (filterMany != null) { - query.setFilterMany(many.getName(), filterMany); + query.setFilterMany(many.name(), filterMany); } query.where().idEq(parentId); query.setBeanCacheMode(CacheMode.OFF); query.setMode(Mode.LAZYLOAD_MANY); - query.setLazyLoadManyPath(many.getName()); + query.setLazyLoadManyPath(many.name()); query.setPersistenceContext(pc); if (ebi.isReadOnly()) { query.setReadOnly(true); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 0b6757e46..d3e6eba47 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -713,7 +713,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } // we actually need to do a query because we don't know the type without the discriminator // value, just select the id property and discriminator column (auto added) - return find(type).select(idProp.getName()).setId(id).findOne(); + return find(type).select(idProp.name()).setId(id).findOne(); } @Override @@ -2284,7 +2284,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (idProperty == null) { return Collections.emptySet(); } - Object id = idProperty.getVal(entityBean); + Object id = idProperty.value(entityBean); if (entityBean._ebean_getIntercept().isNew() && id != null) { // Primary Key is changeable only on new models - so skip check if we are not new Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); @@ -2311,14 +2311,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { ExpressionList exprList = query.where(); if (!entityBean._ebean_getIntercept().isNew()) { // if model is not new, exclude ourself. - exprList.ne(idProperty.getName(), idProperty.getVal(entityBean)); + exprList.ne(idProperty.name(), idProperty.value(entityBean)); } for (Property prop : props) { - Object value = prop.getVal(entityBean); + Object value = prop.value(entityBean); if (value == null) { return null; } - exprList.eq(prop.getName(), value); + exprList.eq(prop.name(), value); } if (findCount(query, transaction) > 0) { Set ret = new LinkedHashSet<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 8316437a6..c236f64f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -470,7 +470,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery if (mapKey == null) { BeanProperty idProp = beanDescriptor.idProperty(); if (idProp != null) { - query.setMapKey(idProp.getName()); + query.setMapKey(idProp.name()); } else { throw new PersistenceException("No mapKey specified for query"); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 0876b4564..727f9a132 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -1341,7 +1341,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP BeanProperty property = beanDescriptor.propertyByIndex(i); if (property.isCacheDataInclude()) { Object val = property.getCacheDataValue(bean); - changes.put(property.getName(), val); + changes.put(property.name(), val); if (property.isNaturalKey()) { updateNaturalKey = true; String valStr = (val == null) ? null : val.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java index cf2f00f28..37a73536b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java @@ -22,7 +22,7 @@ final class AssocOneHelpRefExported extends AssocOneHelp { @Override void appendSelect(DbSqlContext ctx, boolean subQuery) { // set appropriate tableAlias for the exported id columns - String relativePrefix = ctx.getRelativePrefix(property.getName()); + String relativePrefix = ctx.getRelativePrefix(property.name()); ctx.pushTableAlias(relativePrefix); property.targetIdBinder.appendSelect(ctx, subQuery); ctx.popTableAlias(); @@ -30,7 +30,7 @@ final class AssocOneHelpRefExported extends AssocOneHelp { @Override void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { - String relativePrefix = ctx.getRelativePrefix(property.getName()); + String relativePrefix = ctx.getRelativePrefix(property.name()); if (softDelete && !ctx.isIncludeSoftDelete()) { property.tableJoin.addJoin(joinType, relativePrefix, ctx, softDeletePredicate); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java index 3018b7e19..3a471f666 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java @@ -70,7 +70,7 @@ final class AssocOneHelpRefInherit extends AssocOneHelp { void appendSelect(DbSqlContext ctx, boolean subQuery) { if (!subQuery) { // add discriminator column - String relativePrefix = ctx.getRelativePrefix(property.getName()); + String relativePrefix = ctx.getRelativePrefix(property.name()); String tableAlias = ctx.getTableAlias(relativePrefix); ctx.appendColumn(tableAlias, property.targetInheritInfo.getDiscriminatorColumn()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java index a803e1754..6bc473db6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java @@ -18,7 +18,7 @@ abstract class BaseCollectionHelp implements BeanCollectionHelp { BaseCollectionHelp(BeanPropertyAssocMany many) { this.many = many; this.targetDescriptor = many.getTargetDescriptor(); - this.propertyName = many.getName(); + this.propertyName = many.name(); } BaseCollectionHelp() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java index a4cb98e94..69dfcf2b9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java @@ -55,9 +55,9 @@ final class BeanChangeJson implements BeanDiffVisitor { stack.push(descriptor); BeanPropertyAssocOne embedded = (BeanPropertyAssocOne)descriptor.propertiesIndex[position]; descriptor = embedded.getTargetDescriptor(); - newJson.writeStartObject(embedded.getName()); + newJson.writeStartObject(embedded.name()); if (oldJson != null) { - oldJson.writeStartObject(embedded.getName()); + oldJson.writeStartObject(embedded.name()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index f25293fa0..11c924c92 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -380,8 +380,8 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { this.propertiesIndex = new BeanProperty[0]; } else { EntityBeanIntercept ebi = prototypeEntityBean._ebean_getIntercept(); - this.idPropertyIndex = (idProperty == null) ? -1 : ebi.findProperty(idProperty.getName()); - this.versionPropertyIndex = (versionProperty == null) ? -1 : ebi.findProperty(versionProperty.getName()); + this.idPropertyIndex = (idProperty == null) ? -1 : ebi.findProperty(idProperty.name()); + this.versionPropertyIndex = (versionProperty == null) ? -1 : ebi.findProperty(versionProperty.name()); this.unloadProperties = derivePropertiesToUnload(prototypeEntityBean); this.propertiesIndex = new BeanProperty[ebi.getPropertyLength()]; for (int i = 0; i < propertiesIndex.length; i++) { @@ -913,7 +913,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * foreign keys don't require an extra join. */ public void add(BeanFkeyProperty fkey) { - elDeployCache.put(fkey.getName(), fkey); + elDeployCache.put(fkey.name(), fkey); } void initialiseFkeys() { @@ -1639,7 +1639,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public BeanPropertyAssocMany getManyProperty(SpiQuery query) { OrmQueryDetail detail = query.getDetail(); for (BeanPropertyAssocMany many : propertiesMany) { - if (detail.includesPath(many.getName())) { + if (detail.includesPath(many.name())) { return many; } } @@ -2094,7 +2094,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the Id property name or null if no Id property exists. */ public String getIdName() { - return (idProperty == null) ? null : idProperty.getName(); + return (idProperty == null) ? null : idProperty.name(); } /** @@ -2220,7 +2220,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (!ebi.isLoadedProperty(many.getPropertyIndex())) { BeanCollection ref = many.createReferenceIfNull(bean); if (ref != null && !ref.isRegisteredWithLoadContext()) { - String path = SplitName.add(prefix, many.getName()); + String path = SplitName.add(prefix, many.name()); loadContext.register(path, many, ref); } } @@ -2416,7 +2416,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (assocProperty != null) { String relativePath = assocProperty.getTargetDescriptor().findBeanPath(schemaName, tableName, columnName); if (relativePath != null) { - return SplitName.add(assocProperty.getName(), relativePath); + return SplitName.add(assocProperty.name(), relativePath); } } return null; @@ -2825,7 +2825,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public void inheritanceLoad(SqlBeanLoad sqlBeanLoad, STreeProperty property, DbReadContext ctx) { - BeanProperty p = getBeanProperty(property.getName()); + BeanProperty p = getBeanProperty(property.name()); if (p != null) { p.load(sqlBeanLoad); } else { @@ -3026,7 +3026,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { final Set included = rootProps.getIncluded(); if (included != null) { for (BeanProperty property : propertiesAggregate) { - if (included.contains(property.getName())) { + if (included.contains(property.name())) { return true; } } @@ -3176,8 +3176,8 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * provides unique ordering of the rows (so that the paging is predicable). */ public void appendOrderById(SpiQuery query) { - if (idProperty != null && !idProperty.isEmbedded() && !query.order().containsProperty(idProperty.getName())) { - query.order().asc(idProperty.getName()); + if (idProperty != null && !idProperty.isEmbedded() && !query.order().containsProperty(idProperty.name())) { + query.order().asc(idProperty.name()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index abc26c507..4e6333203 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -282,7 +282,7 @@ final class BeanDescriptorCacheHelp { // held as part of the bean cache so skip return false; } - CachedManyIds entry = manyPropGet(parentId, many.getName()); + CachedManyIds entry = manyPropGet(parentId, many.name()); if (entry == null) { // not in cache so return unsuccessful return false; @@ -316,7 +316,7 @@ final class BeanDescriptorCacheHelp { // add as JSON to bean cache String asJson = many.jsonWriteCollection(details); Map changes = new HashMap<>(); - changes.put(many.getName(), asJson); + changes.put(many.name(), asJson); CachedBeanData newData = data.update(changes, data.getVersion()); if (beanLog.isDebugEnabled()) { @@ -330,7 +330,7 @@ final class BeanDescriptorCacheHelp { } else { CachedManyIds entry = createManyIds(many, details); if (entry != null) { - cachePutManyIds(parentId, many.getName(), entry); + cachePutManyIds(parentId, many.name(), entry); } } } @@ -845,7 +845,7 @@ final class BeanDescriptorCacheHelp { Object details = many.getValue(updateRequest.entityBean()); CachedManyIds entry = createManyIds(many, details); if (entry != null) { - changeSet.addManyPut(desc, many.getName(), id, entry); + changeSet.addManyPut(desc, many.name(), id, entry); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java index 2468a737b..07482486d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java @@ -87,12 +87,12 @@ final class BeanDescriptorDraftHelp { void draftQueryOptimise(Query query) { for (BeanPropertyAssocOne anOne : desc.propertiesOne()) { if (anOne.getTargetDescriptor().isDraftableElement()) { - query.fetch(anOne.getName()); + query.fetch(anOne.name()); } } for (BeanPropertyAssocMany aMany : desc.propertiesMany()) { if (aMany.getTargetDescriptor().isDraftableElement()) { - query.fetch(aMany.getName()); + query.fetch(aMany.name()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index d6ee56491..98280b268 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -34,7 +34,7 @@ final class BeanEmbeddedMetaFactory { BeanProperty[] embeddedProperties = new BeanProperty[sourceProperties.length]; for (int i = 0; i < sourceProperties.length; i++) { - String propertyName = sourceProperties[i].getName(); + String propertyName = sourceProperties[i].name(); Column column = propColMap.get(propertyName); String dbColumn = dbColumn(columnPrefix, column, sourceProperties[i]); boolean dbNullable = dbNullable(column, sourceProperties[i]); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index 071a0f660..7180f252a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java @@ -106,12 +106,12 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public String getName() { + public String name() { return name; } @Override - public String getElName() { + public String elName() { return name; } @@ -119,7 +119,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { * Returns null as not an AssocOne. */ @Override - public Object[] getAssocIdValues(EntityBean value) { + public Object[] assocIdValues(EntityBean value) { return null; } @@ -127,7 +127,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { * Returns null as not an AssocOne. */ @Override - public String getAssocIdExpression(String prefix, String operator) { + public String assocIdExpression(String prefix, String operator) { return null; } @@ -186,7 +186,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public int getJdbcType() { + public int jdbcType() { return 0; } @@ -201,7 +201,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public StringParser getStringParser() { + public StringParser stringParser() { throw new RuntimeException("ElPropertyDeploy only - not implemented"); } @@ -226,7 +226,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public Property getProperty() { + public Property property() { throw new RuntimeException("ElPropertyDeploy only - not implemented"); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index 9a6812d97..026b20f01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -30,7 +30,7 @@ public class BeanMapHelp extends BaseCollectionHelp { BeanMapHelp(BeanPropertyAssocMany many) { this.many = many; this.targetDescriptor = many.getTargetDescriptor(); - this.propertyName = many.getName(); + this.propertyName = many.name(); this.beanProperty = targetDescriptor.getBeanProperty(many.getMapKey()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 7df1c997c..105c2a3d5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -284,7 +284,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { protected BeanProperty(BeanProperty source, BeanPropertyOverride override) { this.descriptor = source.descriptor; this.propertyIndex = source.propertyIndex; - this.name = source.getName(); + this.name = source.name(); this.dbColumn = override.getDbColumn(); this.nullable = override.isDbNullable(); this.dbLength = override.getDbLength(); @@ -337,7 +337,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.dbType = source.getDbType(true); this.scalarType = source.scalarType; this.lob = isLobType(dbType); - this.propertyType = source.getPropertyType(); + this.propertyType = source.type(); this.field = source.getField(); this.docOptions = source.docOptions; this.unmappedJson = source.unmappedJson; @@ -356,7 +356,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { public void initialise(BeanDescriptorInitContext initContext) { // do nothing for normal BeanProperty if (!isTransient && scalarType == null) { - throw new RuntimeException("No ScalarType assigned to " + descriptor.fullName() + "." + getName()); + throw new RuntimeException("No ScalarType assigned to " + descriptor.fullName() + "." + name()); } } @@ -572,7 +572,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public Property getProperty() { + public Property property() { return this; } @@ -756,7 +756,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public Object getVal(Object bean) { + public Object value(Object bean) { return getValue((EntityBean) bean); } @@ -817,7 +817,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ @Override @Nonnull - public String getName() { + public String name() { return name; } @@ -829,7 +829,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getElName() { + public String elName() { return name; } @@ -855,13 +855,13 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public Object[] getAssocIdValues(EntityBean bean) { + public Object[] assocIdValues(EntityBean bean) { // Returns null as not an AssocOne. return null; } @Override - public String getAssocIdExpression(String prefix, String operator) { + public String assocIdExpression(String prefix, String operator) { // Returns null as not an AssocOne. return null; } @@ -939,7 +939,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public StringParser getStringParser() { + public StringParser stringParser() { return scalarType; } @@ -949,7 +949,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public int getJdbcType() { + public int jdbcType() { return scalarType == null ? 0 : scalarType.getJdbcType(); } @@ -1303,7 +1303,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ @Override @Nonnull - public Class getPropertyType() { + public Class type() { return propertyType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 0ba6fe720..63608bdec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -177,7 +177,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST if (childMasterProperty != null) { BeanProperty masterId = childMasterProperty.getTargetDescriptor().idProperty(); if (masterId != null) { // in docstore only, the master-id may be not available - childMasterIdProperty = childMasterProperty.getName() + "." + masterId.getName(); + childMasterIdProperty = childMasterProperty.name() + "." + masterId.name(); } } } @@ -209,7 +209,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @SuppressWarnings("rawtypes") public Collection getRawCollection(EntityBean bean) { - return help.underlying(getVal(bean)); + return help.underlying(value(bean)); } /** @@ -217,11 +217,11 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @Override public void merge(EntityBean bean, EntityBean existing) { - Object existingCollection = getVal(existing); + Object existingCollection = value(existing); if (existingCollection instanceof BeanCollection) { BeanCollection toBC = (BeanCollection) existingCollection; if (!toBC.isPopulated()) { - Object fromCollection = getVal(bean); + Object fromCollection = value(bean); if (fromCollection instanceof BeanCollection) { BeanCollection fromBC = (BeanCollection) fromCollection; if (fromBC.isPopulated()) { @@ -454,7 +454,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the Id values from the given bean. */ @Override - public Object[] getAssocIdValues(EntityBean bean) { + public Object[] assocIdValues(EntityBean bean) { return targetDescriptor.getIdBinder().getIdValues(bean); } @@ -462,7 +462,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the Id expression to add to where clause etc. */ @Override - public String getAssocIdExpression(String prefix, String operator) { + public String assocIdExpression(String prefix, String operator) { return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator); } @@ -702,7 +702,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST for (BeanPropertyAssocOne prop : targetDesc.propertiesOne()) { if (mappedBy != null) { // match using mappedBy as property name - if (mappedBy.equalsIgnoreCase(prop.getName())) { + if (mappedBy.equalsIgnoreCase(prop.name())) { return prop; } } else { @@ -723,7 +723,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST // search for the property BeanDescriptor targetDesc = getTargetDescriptor(); for (BeanProperty prop : targetDesc.propertiesAll()) { - if (mapKey.equalsIgnoreCase(prop.getName())) { + if (mapKey.equalsIgnoreCase(prop.name())) { return prop; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 103ba62c9..140de2f65 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -79,7 +79,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr embeddedProps = overrideMeta.getProperties(); embeddedPropsMap = new HashMap<>(); for (BeanProperty embeddedProp : embeddedProps) { - embeddedPropsMap.put(embeddedProp.getName(), embeddedProp); + embeddedPropsMap.put(embeddedProp.name(), embeddedProp); } } else { embeddedProps = null; @@ -175,13 +175,13 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ void cacheClear() { if (cacheNotifyRelationship) { - targetDescriptor.cacheManyPropClear(relationshipProperty.getName()); + targetDescriptor.cacheManyPropClear(relationshipProperty.name()); } } void cacheClear(CacheChangeSet changeSet) { if (cacheNotifyRelationship) { - changeSet.addManyClear(targetDescriptor, relationshipProperty.getName()); + changeSet.addManyClear(targetDescriptor, relationshipProperty.name()); } } @@ -191,13 +191,13 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr void cacheDelete(boolean clear, EntityBean bean, CacheChangeSet changeSet) { if (cacheNotifyRelationship) { if (clear) { - changeSet.addManyClear(targetDescriptor, relationshipProperty.getName()); + changeSet.addManyClear(targetDescriptor, relationshipProperty.name()); } else { Object assocBean = getValue(bean); if (assocBean != null) { Object parentId = targetDescriptor.id(assocBean); if (parentId != null) { - changeSet.addManyRemove(targetDescriptor, relationshipProperty.getName(), parentId); + changeSet.addManyRemove(targetDescriptor, relationshipProperty.name(), parentId); } } } @@ -268,7 +268,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr private List findIdsByParentId(Object parentId, Transaction t) { String rawWhere = deriveWhereParentIdSql(false); SpiEbeanServer server = server(); - Query q = server.find(getPropertyType()); + Query q = server.find(type()); bindParentIdEq(rawWhere, parentId, q); return server.findIds(q, t); } @@ -278,7 +278,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr String inClause = getIdBinder().getIdInValueExpr(false, parentIds.size()); String expr = rawWhere + inClause; SpiEbeanServer server = server(); - Query q = server.find(getPropertyType()); + Query q = server.find(type()); bindParentIdsIn(expr, parentIds, q); return server.findIds(q, t); } @@ -301,7 +301,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr String basePath = SplitName.add(prefix, name); if (dbColumn != null) { BeanProperty idProperty = target.idProperty(); - desc.registerColumn(dbColumn, SplitName.add(basePath, idProperty.getName())); + desc.registerColumn(dbColumn, SplitName.add(basePath, idProperty.name())); } desc.registerTable(target.baseTable(), this); } @@ -399,7 +399,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ @Override public Class getTargetType() { - return getPropertyType(); + return type(); } /** @@ -485,7 +485,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Return the Id values from the given bean. */ @Override - public Object[] getAssocIdValues(EntityBean bean) { + public Object[] assocIdValues(EntityBean bean) { return targetDescriptor.getIdBinder().getIdValues(bean); } @@ -493,7 +493,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Return the Id expression to add to where clause etc. */ @Override - public String getAssocIdExpression(String prefix, String operator) { + public String assocIdExpression(String prefix, String operator) { return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java index 2bf722154..c14dd6f67 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java @@ -24,7 +24,7 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getName() { + public String name() { return name; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java index 72db83564..ae41492fd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java @@ -54,6 +54,6 @@ final class ExportedProperty { if (path != null) { sb.append(path).append("."); } - sb.append(property.getName()); + sb.append(property.name()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 2edc359fc..97e1efe5e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -35,7 +35,7 @@ public final class IdBinderEmbedded implements IdBinder { public IdBinderEmbedded(boolean idInExpandedForm, BeanPropertyAssocOne embIdProperty) { this.idInExpandedForm = idInExpandedForm; this.embIdProperty = embIdProperty; - this.idClass = "_idClass".equals(embIdProperty.getName()); + this.idClass = "_idClass".equals(embIdProperty.name()); } @Override @@ -91,9 +91,9 @@ public final class IdBinderEmbedded implements IdBinder { sb.append(pathPrefix).append("."); } if (!idClass) { - sb.append(embIdProperty.getName()).append("."); + sb.append(embIdProperty.name()).append("."); } - sb.append(props[i].getName()); + sb.append(props[i].name()); if (!ascending) { sb.append(" desc"); } @@ -107,13 +107,13 @@ public final class IdBinderEmbedded implements IdBinder { @Override public String getIdProperty() { - return embIdProperty.getName(); + return embIdProperty.name(); } @Override public void buildRawSqlSelectChain(String prefix, List selectChain) { if (!idClass) { - prefix = SplitName.add(prefix, embIdProperty.getName()); + prefix = SplitName.add(prefix, embIdProperty.name()); } for (BeanProperty prop : props) { prop.buildRawSqlSelectChain(prefix, selectChain); @@ -143,9 +143,9 @@ public final class IdBinderEmbedded implements IdBinder { sb.append(", "); } if (!idClass) { - sb.append(embIdProperty.getName()).append("."); + sb.append(embIdProperty.name()).append("."); } - sb.append(props[i].getName()); + sb.append(props[i].name()); } return sb.toString(); } @@ -235,7 +235,7 @@ public final class IdBinderEmbedded implements IdBinder { EntityBean ebValue = (EntityBean) embIdProperty.getValue(bean); Map map = new LinkedHashMap<>(); for (BeanProperty prop : props) { - map.put(prop.getName(), prop.getValue(ebValue)); + map.put(prop.name(), prop.getValue(ebValue)); } return map; } @@ -249,7 +249,7 @@ public final class IdBinderEmbedded implements IdBinder { Map map = (Map) value; EntityBean idValue = idDesc.createEntityBean(); for (BeanProperty prop : props) { - prop.setValue(idValue, map.get(prop.getName())); + prop.setValue(idValue, map.get(prop.name())); } return idValue; } @@ -358,7 +358,7 @@ public final class IdBinderEmbedded implements IdBinder { if (prefix != null) { sb.append(prefix).append("."); } - sb.append(props[i].getName()); + sb.append(props[i].name()); } sb.append(")"); return sb.toString(); @@ -375,9 +375,9 @@ public final class IdBinderEmbedded implements IdBinder { sb.append(prefix).append("."); } if (!idClass) { - sb.append(embIdProperty.getName()).append("."); + sb.append(embIdProperty.name()).append("."); } - sb.append(props[i].getName()).append(operator); + sb.append(props[i].name()).append(operator); } return sb.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index 2dd025cb3..42055e8ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -35,7 +35,7 @@ public final class IdBinderSimple implements IdBinder { public IdBinderSimple(BeanProperty idProperty, MultiValueBind multiValueBind) { this.idProperty = idProperty; this.scalarType = idProperty.getScalarType(); - this.expectedType = idProperty.getPropertyType(); + this.expectedType = idProperty.type(); bindIdSql = InternString.intern(idProperty.getDbColumn() + " = ? "); this.multiValueBind = multiValueBind; } @@ -56,7 +56,7 @@ public final class IdBinderSimple implements IdBinder { if (pathPrefix != null) { sb.append(pathPrefix).append("."); } - sb.append(idProperty.getName()); + sb.append(idProperty.name()); if (!ascending) { sb.append(" desc"); } @@ -75,7 +75,7 @@ public final class IdBinderSimple implements IdBinder { @Override public String getIdProperty() { - return idProperty.getName(); + return idProperty.name(); } @Override @@ -93,7 +93,7 @@ public final class IdBinderSimple implements IdBinder { @Override public String getDefaultOrderBy() { - return idProperty.getName(); + return idProperty.name(); } @Override @@ -216,7 +216,7 @@ public final class IdBinderSimple implements IdBinder { sb.append(prefix); sb.append("."); } - sb.append(idProperty.getName()); + sb.append(idProperty.name()); sb.append(operator); return sb.toString(); } @@ -228,7 +228,7 @@ public final class IdBinderSimple implements IdBinder { sb.append(prefix); sb.append("."); } - sb.append(idProperty.getName()); + sb.append(idProperty.name()); return sb.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index 54581a1be..ab1909714 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -34,7 +34,7 @@ public final class ImportedIdEmbedded implements ImportedId { public void addFkeys(String name) { BeanProperty[] embeddedProps = foreignAssocOne.getProperties(); for (int i = 0; i < imported.length; i++) { - String n = name + "." + foreignAssocOne.getName() + "." + embeddedProps[i].getName(); + String n = name + "." + foreignAssocOne.name() + "." + embeddedProps[i].name(); BeanFkeyProperty fkey = new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.getDeployOrder()); owner.getBeanDescriptor().add(fkey); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 362ea51cc..db098cb16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -88,7 +88,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable implements Comparator, ElComparato return val2 == null ? 0 : nullOrder; } if (elGetValue.isAssocId()) { - val1 = elGetValue.getAssocIdValues((EntityBean) val1)[0]; // TODO: compound key not yet supported + val1 = elGetValue.assocIdValues((EntityBean) val1)[0]; // TODO: compound key not yet supported } if (val2 == null) { return -1 * nullOrder; } if (elGetValue.isAssocId()) { - val2 = elGetValue.getAssocIdValues((EntityBean) val2)[0]; + val2 = elGetValue.assocIdValues((EntityBean) val2)[0]; } Comparable c = (Comparable) val1; return asc * c.compareTo(val2); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index 16d0e3808..a2c2c5e16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -136,12 +136,12 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getName() { + public String name() { return name; } @Override - public String getElName() { + public String elName() { return expression; } @@ -171,15 +171,15 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public Object[] getAssocIdValues(EntityBean bean) { + public Object[] assocIdValues(EntityBean bean) { // Don't navigate the object graph as bean // is assumed to be the appropriate type - return lastElPropertyValue.getAssocIdValues(bean); + return lastElPropertyValue.assocIdValues(bean); } @Override - public String getAssocIdExpression(String prefix, String operator) { - return lastElPropertyValue.getAssocIdExpression(expression, operator); + public String assocIdExpression(String prefix, String operator) { + return lastElPropertyValue.assocIdExpression(expression, operator); } @Override @@ -198,7 +198,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public Property getProperty() { + public Property property() { return lastBeanProperty; } @@ -234,7 +234,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public int getJdbcType() { + public int jdbcType() { return scalarType == null ? 0 : scalarType.getJdbcType(); } @@ -244,7 +244,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public StringParser getStringParser() { + public StringParser stringParser() { return scalarType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java index 17f4cfb29..ad43abce3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java @@ -53,12 +53,12 @@ public interface ElPropertyDeploy { /** * Return the name of the property. */ - String getName(); + String name(); /** * The ElPrefix plus name. */ - String getElName(); + String elName(); /** * Return the deployment db column for this property. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index ca97b5408..c82a47426 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -276,7 +276,7 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression if (!beanProperty.isTransient()) { Object value = beanProperty.getValue(bean); if (value != null) { - String propName = SplitName.add(prefix, beanProperty.getName()); + String propName = SplitName.add(prefix, beanProperty.name()); if (beanProperty.isScalar()) { if (value instanceof String) { list.add(new LikeExpression(propName, value, caseInsensitive, likeType)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java index c1bd76db0..040cc8a36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java @@ -113,7 +113,7 @@ public final class IdInExpression extends NonPrepareExpression { request.append(descriptor.getIdBinderInLHSSql()); request.append(idBinder.getIdInValueExpr(false, idCollection.size())); } else { - request.append(idBinder.getBeanProperty().getName()); + request.append(idBinder.getBeanProperty().name()); request.appendInExpression(false, idCollection); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java index 1a84d87eb..843653538 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java @@ -117,7 +117,7 @@ final class InExpression extends AbstractExpression { List idList = new ArrayList<>(); for (Object bindValue : bindValues) { // extract the id values from the bean - Object[] ids = prop.getAssocIdValues((EntityBean) bindValue); + Object[] ids = prop.assocIdValues((EntityBean) bindValue); if (ids != null) { Collections.addAll(idList, ids); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java index 4a4a81201..e754d1957 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java @@ -66,7 +66,7 @@ final class NullExpression extends AbstractExpression { String nullExpr = notNull ? " is not null" : " is null"; if (elProperty != null && elProperty.isAssocId()) { - request.append(elProperty.getAssocIdExpression(propName, nullExpr)); + request.append(elProperty.assocIdExpression(propName, nullExpr)); } else { request.append(propName).append(nullExpr); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index 87b0ed3bf..d6122e67f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -44,8 +44,8 @@ public final class SimpleExpression extends AbstractValueExpression { } ExpressionPath prop = context.getExpressionPath(propName); if (prop != null && prop.isAssocId()) { - String idName = prop.getAssocIdExpression(propName, ""); - Object[] ids = prop.getAssocIdValues((EntityBean) value()); + String idName = prop.assocIdExpression(propName, ""); + Object[] ids = prop.assocIdValues((EntityBean) value()); if (ids == null || ids.length != 1) { throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + Arrays.toString(ids)); } @@ -73,7 +73,7 @@ public final class SimpleExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null) { if (prop.isAssocId()) { - Object[] ids = prop.getAssocIdValues((EntityBean) value()); + Object[] ids = prop.assocIdValues((EntityBean) value()); if (ids != null) { for (Object id : ids) { request.addBindValue(id); @@ -101,7 +101,7 @@ public final class SimpleExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null) { if (prop.isAssocId()) { - request.append(prop.getAssocIdExpression(propName, type.bind())); + request.append(prop.assocIdExpression(propName, type.bind())); return; } if (prop.isDbEncrypted()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index bab6b0448..012e7a09e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -39,7 +39,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext @Override public void register(BeanPropertyAssocMany many, BeanCollection collection) { - String path = fullPath + "." + many.getName(); + String path = fullPath + "." + many.name(); parent.register(path, many, collection); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 4c8d0e5b8..ba496c915 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -846,7 +846,7 @@ public final class DefaultPersister implements Persister { Query q = server.createQuery(desc.type()); StringBuilder sb = new StringBuilder(30); for (BeanPropertyAssocOne aPropImportDelete : propImportDelete) { - sb.append(aPropImportDelete.getName()).append(","); + sb.append(aPropImportDelete.name()).append(","); } q.setAutoTune(false); q.select(sb.toString()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index 62f26503f..ad16a3fa8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -56,7 +56,7 @@ final class DeleteUnloadedForeignKeys { StringBuilder sb = new StringBuilder(30); for (BeanPropertyAssocOne aPropList : propList) { - sb.append(aPropList.getName()).append(","); + sb.append(aPropList.name()).append(","); } // run query in a separate persistence context diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index b50fe6dfc..c5c22225a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -86,7 +86,7 @@ final class MergeHandler { query.setBeanCacheMode(CacheMode.OFF); query.setPersistenceContextScope(PersistenceContextScope.QUERY); query.setId(desc.getId(bean)); - query.select(desc.idProperty().getName()); + query.select(desc.idProperty().name()); for (String path : paths) { MergeNode node = buildNode(path); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java index 3c1f77db3..e068990f1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java @@ -72,7 +72,7 @@ abstract class MergeNode { */ final void addSelectId(Query query) { BeanProperty idProperty = targetDescriptor.idProperty(); - query.fetch(fullPath, idProperty.getName()); + query.fetch(fullPath, idProperty.name()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java index 9922c1feb..939ace117 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java @@ -55,6 +55,6 @@ final class MergeNodeAssocOne extends MergeNode { } private EntityBean getEntityBean(Object bean) { - return (EntityBean) one.getVal(bean); + return (EntityBean) one.value(bean); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java index 130ce23e3..26549227f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java @@ -72,7 +72,7 @@ abstract class SaveManyBase implements SaveMany { if (request.isNotifyCache()) { try { String asJson = many.jsonWriteCollection(value); - request.addCollectionChange(many.getName(), asJson); + request.addCollectionChange(many.name(), asJson); } catch (IOException e) { log.error("Error build element collection entry for L2 cache", e); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index 3bfd2fa41..be2bf26c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -64,13 +64,13 @@ final class BindableEncryptedProperty implements Bindable { if (!bindEncryptDataFirst) { // H2 encrypt function ... different parameter order - request.bindNoLog(encryptKeyValue, Types.VARCHAR, prop.getName() + "=****"); + request.bindNoLog(encryptKeyValue, Types.VARCHAR, prop.name() + "=****"); } request.bindNoLog(value, prop); if (bindEncryptDataFirst) { // MySql, Postgres, Oracle - request.bindNoLog(encryptKeyValue, Types.VARCHAR, prop.getName() + "=****"); + request.bindNoLog(encryptKeyValue, Types.VARCHAR, prop.name() + "=****"); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index 4ca34c33a..f8117276e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -585,7 +585,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi @Override public void registerBeanInherit(BeanPropertyAssocOne property, EntityBeanIntercept ebi) { - String path = getPath(property.getName()); + String path = getPath(property.name()); request.loadContext().register(path, ebi, property); } @@ -597,7 +597,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi @Override public void register(BeanPropertyAssocMany many, BeanCollection bc) { - String path = getPath(many.getName()); + String path = getPath(many.name()); request.loadContext().register(path, many, bc); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 8840575c8..f994d49c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -479,7 +479,7 @@ final class CQueryBuilder { // check if @Id property included in RawSql boolean rawNoId = true; BeanProperty idProperty = descriptor.idProperty(); - if (idProperty != null && columnMapping.contains(idProperty.getName())) { + if (idProperty != null && columnMapping.contains(idProperty.name())) { // contains the @Id property for the root level bean rawNoId = false; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java index ffb65a039..c26364364 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java @@ -63,7 +63,7 @@ final class CQueryOrderBy { if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc ap = (BeanPropertyAssoc) beanProperty; IdBinder idBinder = ap.getTargetDescriptor().getIdBinder(); - return idBinder.getOrderBy(el.getElName(), p.isAscending()); + return idBinder.getOrderBy(el.elName(), p.isAscending()); } return p.toStringFormat(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index cab8530fa..cb83c3006 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -212,7 +212,7 @@ public final class CQueryPredicates { BeanPropertyAssocMany manyProperty = request.determineMany(); if (manyProperty != null) { - OrmQueryProperties chunk = query.getDetail().getChunk(manyProperty.getName(), false); + OrmQueryProperties chunk = query.getDetail().getChunk(manyProperty.name(), false); SpiExpressionList filterManyExpr = chunk.getFilterMany(); if (filterManyExpr != null) { this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr); @@ -337,7 +337,7 @@ public final class CQueryPredicates { // check for default ordering on the many property... String manyOrderBy = manyProp.getFetchOrderBy(); if (manyOrderBy != null) { - orderBy = orderBy + ", " + CQueryBuilder.prefixOrderByFields(manyProp.getName(), manyOrderBy); + orderBy = orderBy + ", " + CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy); } if (request.isFindById()) { @@ -353,7 +353,7 @@ public final class CQueryPredicates { // we need to make sure their is an order by on the // top level first (to ensure master/detail construction). - int manyPos = orderBy.indexOf(manyProp.getName()); + int manyPos = orderBy.indexOf(manyProp.name()); int idPos = orderBy.indexOf(" " + orderById); if (manyPos == -1) { @@ -370,9 +370,9 @@ public final class CQueryPredicates { if (idPos <= -1 || idPos >= manyPos) { if (idPos > manyPos) { // there was an error with the order by... - String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.getName(); + String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name(); msg += "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById + "]"; - msg += " must come before the many property [" + manyProp.getName() + "] in the orderBy."; + msg += " must come before the many property [" + manyProp.name() + "] in the orderBy."; msg += " Ebean has automatically modified the orderBy clause to do this."; logger.warn(msg); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java index 911f92ef7..b1b15f019 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java @@ -17,7 +17,7 @@ public interface STreeProperty extends ScalarDataReader { /** * Return the property name. */ - String getName(); + String name(); /** * Return the full property name (for error messages). diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index f1768bb39..f0b43ef16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -226,7 +226,7 @@ public final class SqlTreeBuilder { List myJoinList = new ArrayList<>(); List extraProps = new ArrayList<>(); for (STreePropertyAssocOne one : desc.propsOne()) { - String propPrefix = SplitName.add(prefix, one.getName()); + String propPrefix = SplitName.add(prefix, one.name()); if (isIncludeBean(propPrefix)) { selectIncludes.add(propPrefix); if (!one.hasForeignKey()) { @@ -237,7 +237,7 @@ public final class SqlTreeBuilder { } for (STreePropertyAssocMany many : desc.propsMany()) { - String propPrefix = SplitName.add(prefix, many.getName()); + String propPrefix = SplitName.add(prefix, many.name()); if (isIncludeMany(propPrefix, many)) { selectIncludes.add(propPrefix); buildSelectChain(propPrefix, many, many.target(), myJoinList); @@ -413,7 +413,7 @@ public final class SqlTreeBuilder { } else { logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it."); } - } else if (p.isEmbedded() || (p instanceof STreePropertyAssoc && !queryProps.isIncludedBeanJoin(p.getName()))) { + } else if (p.isEmbedded() || (p instanceof STreePropertyAssoc && !queryProps.isIncludedBeanJoin(p.name()))) { // add the embedded bean or the *ToOne assoc bean. We skip the check that the *ToOne propName maps to Id property ... selectProps.add(p); } else { @@ -440,7 +440,7 @@ public final class SqlTreeBuilder { // included as a bean join. With a bean join // the property should be excluded as the bean // join has its own node in the SqlTree. - if (!queryProps.isIncludedBeanJoin(p.getName())) { + if (!queryProps.isIncludedBeanJoin(p.name())) { // include the property... which basically // means include the foreign key column(s) selectProps.add(p); @@ -497,7 +497,7 @@ public final class SqlTreeBuilder { for (STreePropertyAssocOne propertyAssocOne : desc.propsOne()) { //noinspection StatementWithEmptyBody if (queryProps != null - && queryProps.isIncludedBeanJoin(propertyAssocOne.getName()) + && queryProps.isIncludedBeanJoin(propertyAssocOne.name()) && propertyAssocOne.hasForeignKey() && !propertyAssocOne.isFormula()) { // if it is a joined bean with FK constraint... then don't add the property diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 83c8362a9..87b5d204a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -139,7 +139,7 @@ class SqlTreeNodeBean implements SqlTreeNode { private Map createPathMap(String prefix, STreeType desc) { HashMap m = new HashMap<>(); for (STreePropertyAssocMany many : desc.propsMany()) { - String name = many.getName(); + String name = many.name(); m.put(name, getPath(prefix, name)); } return m; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java index 489341789..31af8813a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java @@ -35,7 +35,7 @@ public final class SqlTreeProperties { public void add(STreeProperty prop) { propsList.add(prop); - propNames.add(prop.getName()); + propNames.add(prop.name()); if (prop.isAggregation()) { if (!aggregation) { aggregation = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index 023f6705e..0b9bc22d9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -129,7 +129,7 @@ public class TCsvReader implements CsvReader { throw new TextException("Property " + propertyName + " is not DateTime capable"); } if (dateTimeFormat == null) { - dateTimeFormat = getDefaultDateTimeFormat(elProp.getJdbcType()); + dateTimeFormat = getDefaultDateTimeFormat(elProp.jdbcType()); } if (locale == null) { @@ -162,7 +162,7 @@ public class TCsvReader implements CsvReader { ExpressionPath elProp = descriptor.expressionPath(propertyName); if (parser == null) { - parser = elProp.getStringParser(); + parser = elProp.stringParser(); } CsvColumn column = new CsvColumn(elProp, parser); columnList.add(column); @@ -240,10 +240,10 @@ public class TCsvReader implements CsvReader { throw new TextException("Property [" + aLine + "] not found"); } - if (Types.TIME == elProp.getJdbcType()) { + if (Types.TIME == elProp.jdbcType()) { addProperty(aLine, TIME_PARSER); - } else if (isDateTimeType(elProp.getJdbcType())) { + } else if (isDateTimeType(elProp.jdbcType())) { addDateTime(aLine, null, null); } else if (elProp.isAssocProperty()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index c8a83e649..3f69ac1b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -506,7 +506,7 @@ public final class WriteJson implements SpiJsonWriter { return true; if (currentIncludeProps != null) { // explicitly controlled by pathProperties - return currentIncludeProps.contains(prop.getName()); + return currentIncludeProps.contains(prop.name()); } else { // include only loaded properties return currentBean._ebean_getIntercept().isLoadedProperty(prop.getPropertyIndex()); @@ -518,7 +518,7 @@ public final class WriteJson implements SpiJsonWriter { return false; } else if (!explicitAllProps && currentIncludeProps != null) { // explicitly controlled by pathProperties - return currentIncludeProps.contains(prop.getName()); + return currentIncludeProps.contains(prop.name()); } else { // by default include transient properties return true; diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index be62500d2..99ac21e93 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -178,7 +178,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< BeanProperty idProperty = targetDesc.idProperty(); if (idProperty != null) { // embedded beans don't have id property - String fullPath = path + "." + idProperty.getName(); + String fullPath = path + "." + idProperty.name(); targetDesc.docStoreAdapter().registerInvalidationPath(desc.docStoreQueueId(), fullPath, pathProp.getProperties()); } } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java index 3c9aec803..5dc796fe6 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java @@ -87,7 +87,7 @@ public class DocStructure { BeanDescriptor targetDesc = embProp.getTargetDescriptor(); PathProperties manyRootPath = new PathProperties(); - manyRootPath.addToPath(null, targetDesc.idProperty().getName()); + manyRootPath.addToPath(null, targetDesc.idProperty().name()); manyRootPath.addNested(prop, embedded.get(prop)); manyRoot.put(prop, manyRootPath); diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index bcfebbf25..47523eb91 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -72,7 +72,7 @@ public class BeanTypeTest { order.setStatus(Order.Status.APPROVED); Property statusProperty = beanType(Order.class).property("status"); - assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus()); + assertThat(statusProperty.value(order)).isEqualTo(order.getStatus()); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index 00ed9d9cd..82197e1e4 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java @@ -28,10 +28,10 @@ public class PropertyTest { order.setStatus(Order.Status.APPROVED); Property statusProperty = beanType(Order.class).property("status"); - assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus()); + assertThat(statusProperty.value(order)).isEqualTo(order.getStatus()); Property customerProperty = beanType(Order.class).property("customer"); - assertThat(customerProperty.getVal(order)).isEqualTo(customer); + assertThat(customerProperty.value(order)).isEqualTo(customer); } @Test @@ -49,8 +49,8 @@ public class PropertyTest { @Test public void name() { - assertThat(beanType(Order.class).property("status").getName()).isEqualTo("status"); - assertThat(beanType(Order.class).property("customer").getName()).isEqualTo("customer"); - assertThat(beanType(Order.class).property("details").getName()).isEqualTo("details"); + assertThat(beanType(Order.class).property("status").name()).isEqualTo("status"); + assertThat(beanType(Order.class).property("customer").name()).isEqualTo("customer"); + assertThat(beanType(Order.class).property("details").name()).isEqualTo("details"); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index b5b909ee0..e741e61dc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -33,10 +33,10 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Order.class); assertNotNull(beanDescriptor.idProperty()); - assertEquals("id", beanDescriptor.idProperty().getName()); + assertEquals("id", beanDescriptor.idProperty().name()); assertNotNull(beanDescriptor.getVersionProperty()); - assertEquals("updtime", beanDescriptor.getVersionProperty().getName()); + assertEquals("updtime", beanDescriptor.getVersionProperty().name()); Order order = new Order(); diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index 4b0521200..50c0a7284 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -32,14 +32,14 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); assertTrue(elBillAddressId instanceof BeanFkeyProperty); assertEquals("billing_address_id", elBillAddressId.getDbColumn()); - assertEquals("billingAddress.id", elBillAddressId.getName()); + assertEquals("billingAddress.id", elBillAddressId.name()); assertNull(elBillAddressId.getElPrefix()); ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); assertTrue(elBillAddressCity instanceof ElPropertyChain); assertEquals("billingAddress", elBillAddressCity.getElPrefix()); - assertEquals("city", elBillAddressCity.getName()); + assertEquals("city", elBillAddressCity.name()); assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); assertEquals("city", elBillAddressCity.getDbColumn()); @@ -52,7 +52,7 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); assertTrue(elOrderStatus instanceof ElPropertyChain); assertEquals("orders", elOrderStatus.getElPrefix()); - assertEquals("status", elOrderStatus.getName()); + assertEquals("status", elOrderStatus.name()); assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); assertEquals("status", elOrderStatus.getDbColumn()); diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java index 4cbf3dbaa..5f0a31039 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -95,8 +95,8 @@ public class TestInsertCheckUnique extends BaseTestCase { StringBuilder msg = new StringBuilder(); properties.forEach((it)-> { - Object propertyValue = it.getVal(doc2); - String propertyName = it.getName(); + Object propertyValue = it.value(doc2); + String propertyName = it.name(); msg.append(" property["+propertyName+"] value["+propertyValue+"]"); }); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index b8f578986..4bfbe840d 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -30,7 +30,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { EPerAddr perAddr = new EPerAddr("Embed", addr); Property country = embType.property("country"); - Object val = country.getVal(addr); + Object val = country.value(addr); assertThat(val).isSameAs(nz); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java index 73928a5d0..4505808ee 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -199,9 +199,9 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { MCompoundForeignKey compoundKey = null; if (columns.length > 1) { // compound foreign key - String refTable = p.getTargetDescriptor().getBaseTable(); - String fkName = foreignKeyConstraintName(p.getName()); - String fkIndex = foreignKeyIndexName(p.getName()); + String refTable = p.getTargetDescriptor().baseTable(); + String fkName = foreignKeyConstraintName(p.name()); + String fkIndex = foreignKeyIndexName(p.name()); compoundKey = new MCompoundForeignKey(fkName, refTable, fkIndex); table.addForeignKey(compoundKey); } @@ -253,7 +253,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { } else { String[] cols = indexSetAdd(toColumnNames(modelColumns)); - String uqName = uniqueConstraintName(p.getName()); + String uqName = uniqueConstraintName(p.name()); table.addUniqueConstraint(new MCompoundUniqueConstraint(cols, uqName)); } } @@ -307,7 +307,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { if (checkConstraintValues != null) { if (beanDescriptor.hasInheritance()) { InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); - inheritInfo.appendCheckConstraintValues(p.getName(), checkConstraintValues); + inheritInfo.appendCheckConstraintValues(p.name(), checkConstraintValues); } col.setCheckConstraint(buildCheckConstraint(p.getDbColumn(), checkConstraintValues)); col.setCheckConstraintName(checkConstraintName(col.getName())); From bb9532f42e7a0765772b6baf31362ef59546f6da Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 14:17:30 +1200 Subject: [PATCH 077/102] #2359 - Rename Transaction.getConnection() method to connection() with deprecation --- ebean-api/src/main/java/io/ebean/Transaction.java | 6 ++++++ .../dbplatform/SimpleSequenceIdGenerator.java | 2 +- .../io/ebeaninternal/api/SpiTransactionProxy.java | 4 ++-- .../server/persist/dml/InsertHandler.java | 2 +- .../ebeaninternal/server/query/CQueryBuilder.java | 2 +- .../ebeaninternal/server/query/CQueryEngine.java | 2 +- .../transaction/DocStoreOnlyTransaction.java | 2 +- .../transaction/ImplicitReadOnlyTransaction.java | 2 +- .../server/transaction/JdbcTransaction.java | 2 +- .../server/transaction/NoTransaction.java | 2 +- .../server/transaction/TransactionFactory.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 4 ++-- .../java/org/tests/idkeys/TestGeneratedKeys.java | 2 +- .../org/tests/insert/TestInsertDuplicateKey.java | 2 +- .../org/tests/query/cancel/SlowDownEBasic.java | 2 +- .../org/tests/rawsql/TestRawSqlNamedParams.java | 2 +- .../org/tests/rawsql/TestRawSqlWithResultSet.java | 3 +-- .../java/org/tests/timezone/TimezoneTests.java | 14 +++++++------- .../java/org/tests/transaction/TestSavepoint.java | 2 +- .../tests/transaction/TestTransactionCallback.java | 2 +- .../transaction/TestTransactionalRequiresNew.java | 6 +++--- 21 files changed, 36 insertions(+), 31 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 0856a6e4e..c84db9c7d 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -538,6 +538,12 @@ public interface Transaction extends AutoCloseable { * Examples of when a developer may wish to use the connection directly are: * Savepoints, advanced CLOB BLOB use and advanced stored procedure calls. */ + Connection connection(); + + /** + * Deprecated migrate to connection(). + */ + @Deprecated Connection getConnection(); /** diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 95ee33894..e028aaa3a 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -61,7 +61,7 @@ public class SimpleSequenceIdGenerator implements PlatformIdGenerator { PreparedStatement pstmt = null; ResultSet rset = null; try { - c = useTxnConnection ? t.getConnection() : dataSource.getConnection(); + c = useTxnConnection ? t.connection() : dataSource.getConnection(); pstmt = c.prepareStatement(sql); rset = pstmt.executeQuery(); if (rset.next()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index a63c04cc6..03824903b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -318,8 +318,8 @@ public abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Connection getConnection() { - return transaction.getConnection(); + public Connection connection() { + return transaction.connection(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 0e6d6ff80..3e7ec1cd7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -148,7 +148,7 @@ public final class InsertHandler extends DmlHandler { PreparedStatement stmt = null; ResultSet rset = null; try { - stmt = transaction.getConnection().prepareStatement(persistRequest.getSelectLastInsertedId()); + stmt = transaction.connection().prepareStatement(persistRequest.getSelectLastInsertedId()); rset = stmt.executeQuery(); setGeneratedKey(rset); } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index f994d49c8..cbe600a51 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -409,7 +409,7 @@ final class CQueryBuilder { } query.setGeneratedSql(sql); - Connection connection = request.transaction().getConnection(); + Connection connection = request.transaction().connection(); BeanDescriptor desc = request.descriptor(); try { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 56142b51d..418354053 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -132,7 +132,7 @@ public final class CQueryEngine { t.logSummary(msg); } // ensure 'rollback' is logged if queryOnly transaction - t.getConnection(); + t.connection(); // build a decent error message for the exception String m = "Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql; return dbPlatform.translate(m, e); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java index 0165fb1e8..9ff36d545 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java @@ -35,7 +35,7 @@ public final class DocStoreOnlyTransaction extends JdbcTransaction { } @Override - public Connection getConnection() { + public Connection connection() { throw new RuntimeException("not supported on DocStoreTransaction"); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index cbb4f7618..4948eb9ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -503,7 +503,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve * Return the underlying connection for public use. */ @Override - public Connection getConnection() { + public Connection connection() { return getInternalConnection(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index d271d1c04..b1909b1f8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -886,7 +886,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { * Return the underlying connection for public use. */ @Override - public Connection getConnection() { + public Connection connection() { queryOnly = false; return getInternalConnection(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 0ed17e94f..8bccacfc6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -288,7 +288,7 @@ final class NoTransaction implements SpiTransaction { } @Override - public Connection getConnection() { + public Connection connection() { return null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index 687741654..ea2bc8aa0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -35,7 +35,7 @@ abstract class TransactionFactory { */ final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) { if (isolationLevel > -1) { - Connection connection = t.getConnection(); + Connection connection = t.connection(); try { connection.setTransactionIsolation(isolationLevel); } catch (SQLException e) { diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 5798beb57..cc41e4933 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -31,11 +31,11 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { try { EBasicWithUniqueCon v2 = createEntityWithName("conflict", "after"); txn.flush(); - Savepoint sp = txn.getConnection().setSavepoint(); + Savepoint sp = txn.connection().setSavepoint(); try { server().save(v2); // unique key violation } catch (PersistenceException e) { - txn.getConnection().rollback(sp); + txn.connection().rollback(sp); EBasicWithUniqueCon conflicting = server().find(EBasicWithUniqueCon.class).where().eq("name", "conflict").findOne(); assertThat(conflicting).isNotNull(); diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index 9632bebcf..c6672bc67 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -51,7 +51,7 @@ public class TestGeneratedKeys extends BaseTestCase { private long readSequenceValue(Transaction tx, String sequence) throws SQLException { Statement stm = null; try { - stm = tx.getConnection().createStatement(); + stm = tx.connection().createStatement(); ResultSet rs = stm.executeQuery("select currval('" + sequence + "')"); rs.next(); diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index af0628ad5..87a427a65 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -97,7 +97,7 @@ public class TestInsertDuplicateKey extends BaseTestCase { // typically we would use transaction.commitAndContinue() // ... this is a rollback and continue type scenario // ... more sensible to use a second transaction that do this - DB.getDefault().currentTransaction().getConnection().rollback(); + DB.getDefault().currentTransaction().connection().rollback(); } catch (SQLException e1) { e1.printStackTrace(); } diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java index 68d6c038b..7a56f46d5 100644 --- a/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java +++ b/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java @@ -47,7 +47,7 @@ public class SlowDownEBasic implements Trigger { return; } triggerInstalled = true; - try (Transaction txn = DB.beginTransaction(); Statement stmt = txn.getConnection().createStatement()) { + try (Transaction txn = DB.beginTransaction(); Statement stmt = txn.connection().createStatement()) { stmt.execute("CREATE TRIGGER SLOW_DOWN_E_BASIC BEFORE SELECT ON e_basic " + "CALL \"" + SlowDownEBasic.class.getName() + "\""); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index b384ae7a3..f229009b1 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -51,7 +51,7 @@ public class TestRawSqlNamedParams extends BaseTestCase { Transaction transaction = DB.beginTransaction(); try { - if ("MariaDB connector/J".equals(transaction.getConnection().getMetaData().getDriverName())) { + if ("MariaDB connector/J".equals(transaction.connection().getMetaData().getDriverName())) { return; // MariaDb only supports callable statements in the form "? = call function x(?)" } CallableSql callableSql = DB.createCallableSql("set @total = 0"); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index f62281378..06b5ddae6 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -2,7 +2,6 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import io.ebean.Transaction; @@ -29,7 +28,7 @@ public class TestRawSqlWithResultSet extends BaseTestCase { // Transaction supplies our jdbc Connection Transaction txn = DB.beginTransaction(); try { - pstmt = txn.getConnection().prepareStatement("select id, name, billing_address_id from o_customer"); + pstmt = txn.connection().prepareStatement("select id, name, billing_address_id from o_customer"); // ResultSet will be closed by Ebean ResultSet resultSet = pstmt.executeQuery(); diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java index 41fdca140..8f455c0f7 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java @@ -45,10 +45,10 @@ public class TimezoneTests { private void fetch() throws SQLException { try ( - Transaction transaction = DB.beginTransaction(); - Connection connection = transaction.getConnection(); - PreparedStatement statement = connection.prepareStatement("select * from tztest"); - ResultSet resultSet = statement.executeQuery()) { + Transaction transaction = DB.beginTransaction(); + Connection connection = transaction.connection(); + PreparedStatement statement = connection.prepareStatement("select * from tztest"); + ResultSet resultSet = statement.executeQuery()) { while (resultSet.next()) { System.out.println(" zone:" + resultSet.getString("zone")); @@ -79,9 +79,9 @@ public class TimezoneTests { } try ( - Transaction transaction = DB.beginTransaction(); - Connection connection = transaction.getConnection(); - PreparedStatement statement = connection.prepareStatement(insert)) { + Transaction transaction = DB.beginTransaction(); + Connection connection = transaction.connection(); + PreparedStatement statement = connection.prepareStatement(insert)) { statement.setString(1, zone); statement.setTimestamp(2, nowTs); statement.setTimestamp(3, nowTs); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java index b167ba6f9..1ba7ffe01 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java @@ -26,7 +26,7 @@ public class TestSavepoint extends BaseTestCase { try (Transaction transaction = DB.beginTransaction()) { - Connection connection = transaction.getConnection(); + Connection connection = transaction.connection(); Savepoint savepoint = connection.setSavepoint(); basicVer.setOther("changeOther"); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java index 9481eb10f..3135fa42f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -22,7 +22,7 @@ public class TestTransactionCallback extends BaseTestCase { public void test_commitAndRollback() { try (Transaction txn = DB.beginTransaction()) { DB.register(new MyCallback()); - txn.getConnection(); // Ebean assumes writes have occurred + txn.connection(); // Ebean assumes writes have occurred txn.commit(); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 23d80eab1..67aed59d6 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -45,14 +45,14 @@ public class TestTransactionalRequiresNew extends BaseTestCase { void doOuter() { outerTxn = DB.currentTransaction(); log.info("outer before ...{}", outerTxn); - outerConn = outerTxn.getConnection(); + outerConn = outerTxn.connection(); new InTransactionalWithRequiresNew().doInner(); // restore the outerTxn Transaction current = DB.currentTransaction(); log.info("outer after ...{}", current); - assertSame(outerConn, current.getConnection()); + assertSame(outerConn, current.connection()); } } @@ -64,7 +64,7 @@ public class TestTransactionalRequiresNew extends BaseTestCase { Transaction innerTxn = DB.currentTransaction(); log.info("inner ...{} {}", innerTxn); - Connection connection = innerTxn.getConnection(); + Connection connection = innerTxn.connection(); assertNotSame(connection, outerConn); } } From dbc1ab7a57a76b82b280078c4848bac7318f274c Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 14:25:10 +1200 Subject: [PATCH 078/102] #2359 - Rename methods and tidy in cache API --- .../src/main/java/io/ebean/cache/QueryCacheEntry.java | 2 -- .../main/java/io/ebean/cache/ServerCacheOptions.java | 2 -- .../main/java/io/ebean/cache/ServerCacheRegion.java | 10 +++++++++- .../server/cache/DefaultServerCacheManager.java | 10 +++++----- .../io/ebeaninternal/server/deploy/DCacheRegion.java | 2 +- .../ebeaninternal/server/deploy/DCacheRegionNone.java | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java index 31f1134d9..9c07e3574 100644 --- a/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java +++ b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java @@ -13,9 +13,7 @@ import java.util.Set; public class QueryCacheEntry { private final Object value; - private final Set dependentTables; - private final long timestamp; /** diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java index fe8fdb486..c455286ea 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java @@ -18,7 +18,6 @@ public class ServerCacheOptions { * Construct with no set options. */ public ServerCacheOptions() { - } /** @@ -73,7 +72,6 @@ public class ServerCacheOptions { * Return a copy of this object. */ public ServerCacheOptions copy() { - ServerCacheOptions copy = new ServerCacheOptions(); copy.maxSize = maxSize; copy.maxIdleSecs = maxIdleSecs; diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java index b63668d91..c798b5a35 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java @@ -8,7 +8,15 @@ public interface ServerCacheRegion { /** * Return the region name. */ - String getName(); + String name(); + + /** + * Deprecated migrate to name(). + */ + @Deprecated + default String getName() { + return name(); + } /** * Return true if the cache region is enabled. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java index 562a98371..d3a652437 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java @@ -65,17 +65,17 @@ public final class DefaultServerCacheManager implements SpiCacheManager { List enabled = new ArrayList<>(); for (SpiCacheRegion region : regionMap.values()) { - if (enabledRegionNames.contains(region.getName())) { - enabled.add(region.getName()); + if (enabledRegionNames.contains(region.name())) { + enabled.add(region.name()); if (!region.isEnabled()) { region.setEnabled(true); - log.debug("Cache region[{}] enabled", region.getName()); + log.debug("Cache region[{}] enabled", region.name()); } } else { - disabled.add(region.getName()); + disabled.add(region.name()); if (region.isEnabled()) { region.setEnabled(false); - log.debug("Cache region[{}] disabled", region.getName()); + log.debug("Cache region[{}] disabled", region.name()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java index d8867e904..0f9190782 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java @@ -12,7 +12,7 @@ public final class DCacheRegion implements SpiCacheRegion { } @Override - public String getName() { + public String name() { return name; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java index c7b20095a..cdb7783bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java @@ -7,7 +7,7 @@ final class DCacheRegionNone implements SpiCacheRegion { static final SpiCacheRegion INSTANCE = new DCacheRegionNone(); @Override - public String getName() { + public String name() { return ""; } From cb9295658c15b549a8d1d14ff3f5010ab379ed9e Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 14:32:49 +1200 Subject: [PATCH 079/102] #2359 - Rename internal methods - ElPropertyValue --- ebean-api/src/main/java/io/ebean/Transaction.java | 4 +++- .../server/deploy/BeanFkeyProperty.java | 6 +++--- .../io/ebeaninternal/server/deploy/BeanProperty.java | 6 +++--- .../server/deploy/BeanPropertyAssocMany.java | 6 +++--- .../server/deploy/BeanPropertyAssocOne.java | 4 ++-- .../io/ebeaninternal/server/el/ElPropertyChain.java | 12 ++++++------ .../io/ebeaninternal/server/el/ElPropertyValue.java | 6 +++--- .../server/expression/InExpression.java | 4 ++-- .../server/expression/IsEmptyExpression.java | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index c84db9c7d..06f6bd315 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -544,7 +544,9 @@ public interface Transaction extends AutoCloseable { * Deprecated migrate to connection(). */ @Deprecated - Connection getConnection(); + default Connection getConnection() { + return connection(); + } /** * Add table modification information to the TransactionEvent. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index 7180f252a..8d7a31456 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java @@ -135,7 +135,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { * Returns null as not an AssocOne. */ @Override - public String getAssocIdInExpr(String prefix) { + public String assocIdInExpr(String prefix) { return null; } @@ -143,12 +143,12 @@ public final class BeanFkeyProperty implements ElPropertyValue { * Returns null as not an AssocOne. */ @Override - public String getAssocIdInValueExpr(boolean not, int size) { + public String assocIdInValueExpr(boolean not, int size) { return null; } @Override - public String getAssocIsEmpty(SpiExpressionRequest request, String path) { + public String assocIsEmpty(SpiExpressionRequest request, String path) { throw new RuntimeException("Not Supported or Expected"); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 105c2a3d5..3f6117d54 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -849,7 +849,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getAssocIsEmpty(SpiExpressionRequest request, String path) { + public String assocIsEmpty(SpiExpressionRequest request, String path) { // overridden in BanePropertyAssocMany throw new RuntimeException("Not Supported or Expected"); } @@ -867,13 +867,13 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getAssocIdInExpr(String prefix) { + public String assocIdInExpr(String prefix) { // Returns null as not an AssocOne. return null; } @Override - public String getAssocIdInValueExpr(boolean not, int size) { + public String assocIdInValueExpr(boolean not, int size) { // Returns null as not an AssocOne. return null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 63608bdec..a1e28251b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -410,7 +410,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } @Override - public String getAssocIsEmpty(SpiExpressionRequest request, String path) { + public String assocIsEmpty(SpiExpressionRequest request, String path) { boolean softDelete = targetDescriptor.isSoftDelete(); boolean needsX2Table = softDelete || getExtraWhere() != null; StringBuilder sb = new StringBuilder(50); @@ -470,7 +470,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the logical id value expression taking into account embedded id's. */ @Override - public String getAssocIdInValueExpr(boolean not, int size) { + public String assocIdInValueExpr(boolean not, int size) { return targetDescriptor.getIdBinder().getIdInValueExpr(not, size); } @@ -478,7 +478,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the logical id in expression taking into account embedded id's. */ @Override - public String getAssocIdInExpr(String prefix) { + public String assocIdInExpr(String prefix) { return targetDescriptor.getIdBinder().getAssocIdInExpr(prefix); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 140de2f65..436cc8d8f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -501,7 +501,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Return the logical id value expression taking into account embedded id's. */ @Override - public String getAssocIdInValueExpr(boolean not, int size) { + public String assocIdInValueExpr(boolean not, int size) { return targetDescriptor.getIdBinder().getIdInValueExpr(not, size); } @@ -509,7 +509,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Return the logical id in expression taking into account embedded id's. */ @Override - public String getAssocIdInExpr(String prefix) { + public String assocIdInExpr(String prefix) { return targetDescriptor.getIdBinder().getAssocIdInExpr(prefix); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index a2c2c5e16..5fc82e99a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -166,8 +166,8 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getAssocIsEmpty(SpiExpressionRequest request, String path) { - return lastElPropertyValue.getAssocIsEmpty(request, path); + public String assocIsEmpty(SpiExpressionRequest request, String path) { + return lastElPropertyValue.assocIsEmpty(request, path); } @Override @@ -183,13 +183,13 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getAssocIdInExpr(String prefix) { - return lastElPropertyValue.getAssocIdInExpr(prefix); + public String assocIdInExpr(String prefix) { + return lastElPropertyValue.assocIdInExpr(prefix); } @Override - public String getAssocIdInValueExpr(boolean not, int size) { - return lastElPropertyValue.getAssocIdInValueExpr(not, size); + public String assocIdInValueExpr(boolean not, int size) { + return lastElPropertyValue.assocIdInValueExpr(not, size); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java index f69b33040..e43559560 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java @@ -14,17 +14,17 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath { /** * Return the logical id value expression taking into account embedded id's. */ - String getAssocIdInValueExpr(boolean not, int size); + String assocIdInValueExpr(boolean not, int size); /** * Return the logical id in expression taking into account embedded id's. */ - String getAssocIdInExpr(String prefix); + String assocIdInExpr(String prefix); /** * Return the logical where clause to support "Is empty". */ - String getAssocIsEmpty(SpiExpressionRequest request, String path); + String assocIsEmpty(SpiExpressionRequest request, String path); /** * Return true if this is an ManyToOne or OneToOne associated bean property. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java index 843653538..16b79c1f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java @@ -145,8 +145,8 @@ final class InExpression extends AbstractExpression { } if (prop != null) { - request.append(prop.getAssocIdInExpr(propName)); - request.append(prop.getAssocIdInValueExpr(not, bindValues.size())); + request.append(prop.assocIdInExpr(propName)); + request.append(prop.assocIdInValueExpr(not, bindValues.size())); } else { request.append(propName); request.appendInExpression(not, bindValues); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java index fc3be3e34..9896891de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java @@ -84,7 +84,7 @@ final class IsEmptyExpression extends AbstractExpression { } request .append("exists (select 1 from ") - .append(prop.getAssocIsEmpty(request, propertyPath)) + .append(prop.assocIsEmpty(request, propertyPath)) .append(")"); } From d582e63c255f93b86fccbe3128da5613acf00bb3 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 14:41:12 +1200 Subject: [PATCH 080/102] #2359 - Rename internal methods - STreeProperty --- .../service/ProfileOriginNodeUsage.java | 2 +- .../io/ebeaninternal/api/ManyWhereJoins.java | 4 ++-- .../server/deploy/BeanDescriptor.java | 6 ++--- .../server/deploy/BeanDescriptorElement.java | 2 +- .../BeanDescriptorElementScalarMap.java | 4 ++-- .../deploy/BeanEmbeddedMetaFactory.java | 2 +- .../server/deploy/BeanFkeyProperty.java | 10 ++++---- .../server/deploy/BeanProperty.java | 20 ++++++++-------- .../server/deploy/BeanPropertyAssoc.java | 12 +++++----- .../server/deploy/BeanPropertyAssocMany.java | 4 ++-- .../deploy/BeanPropertyAssocManyJsonHelp.java | 2 +- .../deploy/BeanPropertyAssocManySqlHelp.java | 4 ++-- .../server/deploy/BeanPropertyAssocOne.java | 12 +++++----- .../server/deploy/BeanTable.java | 2 +- .../server/deploy/DeployPropertyParser.java | 4 ++-- .../server/deploy/DeployUpdateParser.java | 2 +- .../server/deploy/DynamicPropertyBase.java | 8 +++---- .../server/deploy/FormulaPropertyPath.java | 4 ++-- .../server/deploy/id/IdBinderEmbedded.java | 10 ++++---- .../server/deploy/id/IdBinderSimple.java | 10 ++++---- .../deploy/meta/DeployBeanPropertyLists.java | 2 +- .../deploy/meta/DeployTableJoinColumn.java | 4 +--- .../deploy/parse/AnnotationAssocManys.java | 10 ++++---- .../server/el/ElPropertyChain.java | 24 +++++++++---------- .../server/el/ElPropertyDeploy.java | 10 ++++---- .../CaseInsensitiveEqualExpression.java | 4 ++-- .../server/expression/LikeExpression.java | 4 ++-- .../expression/NativeILikeExpression.java | 4 ++-- .../server/expression/SimpleExpression.java | 4 ++-- .../server/loadcontext/DLoadContext.java | 2 +- .../server/persist/DefaultPersister.java | 2 +- .../server/persist/SaveManyBeans.java | 2 +- .../dmlbind/BindableEncryptedProperty.java | 2 +- .../persist/dmlbind/BindableIdEmbedded.java | 4 ++-- .../persist/dmlbind/BindableIdScalar.java | 4 ++-- .../persist/dmlbind/BindableProperty.java | 2 +- .../dmlbind/BindablePropertyVersion.java | 2 +- .../dmlbind/MatchedImportedFactory.java | 4 ++-- .../server/query/CQueryBuilder.java | 4 ++-- .../server/query/CQueryOrderBy.java | 2 +- .../server/query/CQueryPlan.java | 4 ++-- .../server/query/STreeProperty.java | 8 +++---- .../server/query/SqlBeanLoad.java | 2 +- .../server/query/SqlTreeBuilder.java | 2 +- .../server/query/SqlTreeProperties.java | 2 +- .../server/querydefn/DefaultUpdateQuery.java | 2 +- .../server/querydefn/OrmQueryDetail.java | 6 ++--- .../server/text/csv/TCsvReader.java | 2 +- ...eanDescriptor_whenCreatedPropertyTest.java | 4 ++-- .../java/org/tests/basic/TestJodaType.java | 2 +- .../test/java/org/tests/el/TestELBasic.java | 16 ++++++------- .../dbmigration/model/MTable.java | 2 +- .../model/build/ModelBuildContext.java | 6 ++--- .../build/ModelBuildIntersectionTable.java | 3 +-- .../build/ModelBuildPropertyVisitor.java | 8 +++---- 55 files changed, 143 insertions(+), 146 deletions(-) diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index c576c5628..d684d063a 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -48,7 +48,7 @@ public class ProfileOriginNodeUsage { logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name()); return; } else { - BeanProperty beanProperty = elGetValue.getBeanProperty(); + BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { desc = ((BeanPropertyAssoc) beanProperty).getTargetDescriptor(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 08795611d..50fac9299 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -49,8 +49,8 @@ public final class ManyWhereJoins implements Serializable { */ public void add(ElPropertyDeploy elProp) { - String join = elProp.getElPrefix(); - BeanProperty p = elProp.getBeanProperty(); + String join = elProp.elPrefix(); + BeanProperty p = elProp.beanProperty(); if (p instanceof BeanPropertyAssocMany) { join = addManyToJoin(join, p.name()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 11c924c92..37e9e4bb3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -935,7 +935,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the Encrypt key given the BeanProperty. */ public EncryptKey getEncryptKey(BeanProperty p) { - return owner.getEncryptKey(baseTable, p.getDbColumn()); + return owner.getEncryptKey(baseTable, p.dbColumn()); } /** @@ -2805,14 +2805,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (elProp == null) { throw new PersistenceException("Invalid path " + propertyPath + " from " + fullName()); } - return elProp.getBeanProperty().isEmbedded(); + return elProp.beanProperty().isEmbedded(); } @Override public ExtraJoin extraJoin(String propertyPath) { ElPropertyValue elGetValue = getElGetValue(propertyPath); if (elGetValue != null) { - BeanProperty beanProperty = elGetValue.getBeanProperty(); + BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc assocProp = (BeanPropertyAssoc) beanProperty; if (!assocProp.isEmbedded()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java index 54803369a..ccc22836f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java @@ -52,7 +52,7 @@ abstract class BeanDescriptorElement extends BeanDescriptor { if (props.length != 1) { throw new IllegalStateException("Expecting 1 property for element scalar but got " + Arrays.toString(props)); } - return props[0].getScalarType(); + return props[0].scalarType(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java index 93a2bcb91..d9f6b4b25 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java @@ -26,8 +26,8 @@ class BeanDescriptorElementScalarMap extends BeanDescriptorElement { if (props.length != 2) { throw new IllegalStateException("Expecting 2 properties for key and value but got " + Arrays.toString(props)); } - this.scalarTypeKey = props[0].getScalarType(); - this.scalarTypeVal = props[1].getScalarType(); + this.scalarTypeKey = props[0].scalarType(); + this.scalarTypeVal = props[1].scalarType(); this.stringKey = String.class.equals(scalarTypeKey.getType()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index 98280b268..d99d58444 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -49,7 +49,7 @@ final class BeanEmbeddedMetaFactory { } private static String dbColumn(String prefix, Column override, BeanProperty source) { - String dbCol = (override != null && !override.name().isEmpty()) ? override.name() : source.getDbColumn(); + String dbCol = (override != null && !override.name().isEmpty()) ? override.name() : source.dbColumn(); return prefix == null ? dbCol : prefix + dbCol; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index 8d7a31456..bd479b08d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java @@ -42,7 +42,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public int getFetchPreference() { + public int fetchPreference() { // return some decently high value return 1000; } @@ -101,7 +101,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public String getDbColumn() { + public String dbColumn() { return dbColumn; } @@ -171,12 +171,12 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return placeHolder; } @Override - public String getElPrefix() { + public String elPrefix() { return prefix; } @@ -191,7 +191,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 3f6117d54..1a49e2a3e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -429,7 +429,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getEncryptKeyAsString() { + public String encryptKeyAsString() { return getEncryptKey().getStringValue(); } @@ -441,11 +441,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return the SQL for the column including decryption function and column alias. */ private String getDecryptSqlWithColumnAlias(String tableAlias) { - return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn()) + ENC_PREFIX + tableAlias + "_" + this.getDbColumn(); + return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.dbColumn()) + ENC_PREFIX + tableAlias + "_" + this.dbColumn(); } @Override - public int getFetchPreference() { + public int fetchPreference() { // return some decently high value - override on ToMany property return 1000; } @@ -567,7 +567,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return this; } @@ -904,12 +904,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? elPlaceHolderEncrypted : elPlaceHolder; } @Override - public String getElPrefix() { + public String elPrefix() { return elPrefix; } @@ -917,7 +917,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return the full name of this property. */ @Override - public String getFullBeanName() { + public String fullName() { return descriptor.fullName() + "." + name; } @@ -934,7 +934,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ @Override @SuppressWarnings(value = "unchecked") - public ScalarType getScalarType() { + public ScalarType scalarType() { return scalarType; } @@ -1117,7 +1117,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * The database column name this is mapped to. */ @Override - public String getDbColumn() { + public String dbColumn() { return dbColumn; } @@ -1411,7 +1411,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { // change in behavior for #318 objValue = null; String msg = "Error trying to use Jackson ObjectMapper to read transient property " - + getFullBeanName() + " - consider marking this property with @JsonIgnore"; + + fullName() + " - consider marking this property with @JsonIgnore"; logger.error(msg, e); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 56cd61425..c88c66d15 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -129,7 +129,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } @Override - public int getFetchPreference() { + public int fetchPreference() { return fetchPreference; } @@ -425,7 +425,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree BeanProperty idProp = target.idProperty(); BeanProperty[] others = target.propertiesBaseScalar(); if (descriptor.isRawSqlBased()) { - String dbColumn = owner.getDbColumn(); + String dbColumn = owner.dbColumn(); return new ImportedIdSimple(owner, dbColumn, null, idProp, 0); } if (idProp == null) { @@ -466,16 +466,16 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree boolean insertable = col.isInsertable(); boolean updateable = col.isUpdateable(); for (int j = 0; j < props.length; j++) { - if (props[j].getDbColumn().equalsIgnoreCase(matchColumn)) { + if (props[j].dbColumn().equalsIgnoreCase(matchColumn)) { return new ImportedIdSimple(owner, localColumn, localSqlFormula, props[j], j, insertable, updateable); } } for (int j = 0; j < others.length; j++) { - if (others[j].getDbColumn().equalsIgnoreCase(matchColumn)) { + if (others[j].dbColumn().equalsIgnoreCase(matchColumn)) { return new ImportedIdSimple(owner, localColumn, localSqlFormula, others[j], j + props.length, insertable, updateable); } } - String msg = "Error with the Join on [" + getFullBeanName() + String msg = "Error with the Join on [" + fullName() + "]. Could not find the local match for [" + matchColumn + "] "//in table["+searchTable+"]?" + " Perhaps an error in a @JoinColumn"; throw new PersistenceException(msg); @@ -566,7 +566,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } } - String msg = "Error with the Join on [" + getFullBeanName() + String msg = "Error with the Join on [" + fullName() + "]. Could not find the matching foreign key for [" + matchColumn + "] in table[" + searchTable + "]?" + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped? " + " or a @JoinColumn needs an explicit referencedColumnName specified?"; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index a1e28251b..2e8b08c02 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -680,9 +680,9 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST private ExportedProperty findMatch(boolean embedded, BeanProperty prop) { if (hasJoinTable()) { // look for column going to intersection - return findMatch(embedded, prop, prop.getDbColumn(), intersectionJoin); + return findMatch(embedded, prop, prop.dbColumn(), intersectionJoin); } else { - return findMatch(embedded, prop, prop.getDbColumn(), tableJoin); + return findMatch(embedded, prop, prop.dbColumn(), tableJoin); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index b84889833..1aa792f30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -58,7 +58,7 @@ class BeanPropertyAssocManyJsonHelp { */ private void jsonReadTransientUsingObjectMapper(SpiJsonReader readJson, EntityBean parentBean) throws IOException { if (jsonTransient == null) { - throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property " + many.getFullBeanName()); + throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property " + many.fullName()); } jsonTransient.jsonReadUsingObjectMapper(many, readJson, parentBean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java index 8a5eade8b..11fc94c4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java @@ -73,7 +73,7 @@ class BeanPropertyAssocManySqlHelp { @Override public void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne embedded) { - sb.append(",").append(p.getDbColumn()); + sb.append(",").append(p.dbColumn()); colCount++; } @@ -84,7 +84,7 @@ class BeanPropertyAssocManySqlHelp { @Override public void visitScalar(BeanProperty p, boolean allowNonNull) { - sb.append(",").append(p.getDbColumn()); + sb.append(",").append(p.dbColumn()); colCount++; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 436cc8d8f..de55dbcad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -129,9 +129,9 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr // limit JoinColumn mapping to the @Id / primary key TableJoinColumn[] columns = tableJoin.columns(); String foreignJoinColumn = columns[0].getForeignDbColumn(); - String foreignIdColumn = targetDescriptor.idProperty().getDbColumn(); + String foreignIdColumn = targetDescriptor.idProperty().dbColumn(); if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) { - throw new PersistenceException("Mapping limitation - @JoinColumn on " + getFullBeanName() + " needs to map to a primary key as per Issue #529 " + throw new PersistenceException("Mapping limitation - @JoinColumn on " + fullName() + " needs to map to a primary key as per Issue #529 " + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn); } } @@ -218,7 +218,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr if (embedded) { BeanProperty embProp = embeddedPropsMap.get(remainder); if (embProp == null) { - String msg = "Embedded Property " + remainder + " not found in " + getFullBeanName(); + String msg = "Embedded Property " + remainder + " not found in " + fullName(); throw new PersistenceException(msg); } if (chain == null) { @@ -232,7 +232,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? elPlaceHolderEncrypted : elPlaceHolder; } @@ -330,7 +330,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr selectChain.add(discProperty); } if (targetIdBinder == null) { - throw new IllegalStateException("No Id binding property for " + getFullBeanName() + throw new IllegalStateException("No Id binding property for " + fullName() + ". Probably a missing @OneToOne mapping annotation on this relationship?"); } targetIdBinder.buildRawSqlSelectChain(prefix, selectChain); @@ -591,7 +591,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Find the matching foreignDbColumn for a given local property. */ private ExportedProperty findMatch(boolean embeddedProp, BeanProperty prop) { - return findMatch(embeddedProp, prop, prop.getDbColumn(), tableJoin); + return findMatch(embeddedProp, prop, prop.dbColumn(), tableJoin); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index ecd0b7a37..4bc051ebb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -100,7 +100,7 @@ public final class BeanTable { } private void addToJoin(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect, boolean complexKey, BeanProperty prop) { - String lc = prop.getDbColumn(); + String lc = prop.dbColumn(); String fk = lc; if (foreignKeyPrefix != null) { fk = owner.getNamingConvention().getForeignKey(foreignKeyPrefix, fk); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index 419d1052e..a6d3650d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -63,8 +63,8 @@ public final class DeployPropertyParser extends DeployParser { if (catchFirst && firstProp == null) { firstProp = elProp; } - addIncludes(elProp.getElPrefix()); - return elProp.getElPlaceholder(encrypted); + addIncludes(elProp.elPrefix()); + return elProp.elPlaceholder(encrypted); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index e350617d7..045417445 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java @@ -77,7 +77,7 @@ public final class DeployUpdateParser extends DeployParser { return beanDescriptor.baseTable(); } ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); - return elProp != null ? elProp.getDbColumn() : null; + return elProp != null ? elProp.dbColumn() : null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java index c14dd6f67..ceb22bf06 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java @@ -29,7 +29,7 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getFullBeanName() { + public String fullName() { return fullName; } @@ -49,12 +49,12 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getElPrefix() { + public String elPrefix() { return elPrefix; } @Override - public ScalarType getScalarType() { + public ScalarType scalarType() { return scalarType; } @@ -74,7 +74,7 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getEncryptKeyAsString() { + public String encryptKeyAsString() { return null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java index bd294d145..aa1ec102a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java @@ -113,9 +113,9 @@ final class FormulaPropertyPath { throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?"); } // determine scalarType based on first property found by parser - final BeanProperty property = firstProp.getBeanProperty(); + final BeanProperty property = firstProp.beanProperty(); if (!property.isAssocId()) { - return create(property.getScalarType()); + return create(property.scalarType()); } else { return createManyToOne(property); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 97e1efe5e..b16d39184 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -57,7 +57,7 @@ public final class IdBinderEmbedded implements IdBinder { if (i > 0) { sb.append(" and "); } - sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].getDbColumn()).append("=?"); + sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].dbColumn()).append("=?"); } sb.append(")"); return sb.toString(); @@ -123,7 +123,7 @@ public final class IdBinderEmbedded implements IdBinder { @Override public BeanProperty findBeanProperty(String dbColumnName) { for (BeanProperty prop : props) { - if (dbColumnName.equalsIgnoreCase(prop.getDbColumn())) { + if (dbColumnName.equalsIgnoreCase(prop.dbColumn())) { return prop; } } @@ -173,7 +173,7 @@ public final class IdBinderEmbedded implements IdBinder { if (i > 0) { sb.append(" and "); } - sb.append(props[i].getDbColumn()).append("=?"); + sb.append(props[i].dbColumn()).append("=?"); } sb.append(")"); } @@ -392,7 +392,7 @@ public final class IdBinderEmbedded implements IdBinder { if (baseTableAlias != null) { sb.append(baseTableAlias).append("."); } - sb.append(props[i].getDbColumn()).append("=?"); + sb.append(props[i].dbColumn()).append("=?"); } return sb.toString(); } @@ -411,7 +411,7 @@ public final class IdBinderEmbedded implements IdBinder { if (baseTableAlias != null) { sb.append(baseTableAlias).append("."); } - sb.append(props[i].getDbColumn()); + sb.append(props[i].dbColumn()); } sb.append(")"); return sb.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index 42055e8ef..b0fd2da18 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -34,9 +34,9 @@ public final class IdBinderSimple implements IdBinder { public IdBinderSimple(BeanProperty idProperty, MultiValueBind multiValueBind) { this.idProperty = idProperty; - this.scalarType = idProperty.getScalarType(); + this.scalarType = idProperty.scalarType(); this.expectedType = idProperty.type(); - bindIdSql = InternString.intern(idProperty.getDbColumn() + " = ? "); + bindIdSql = InternString.intern(idProperty.dbColumn() + " = ? "); this.multiValueBind = multiValueBind; } @@ -80,7 +80,7 @@ public final class IdBinderSimple implements IdBinder { @Override public BeanProperty findBeanProperty(String dbColumnName) { - if (dbColumnName.equalsIgnoreCase(idProperty.getDbColumn())) { + if (dbColumnName.equalsIgnoreCase(idProperty.dbColumn())) { return idProperty; } return null; @@ -99,9 +99,9 @@ public final class IdBinderSimple implements IdBinder { @Override public String getBindIdInSql(String baseTableAlias) { if (baseTableAlias == null) { - return idProperty.getDbColumn(); + return idProperty.dbColumn(); } else { - return baseTableAlias + "." + idProperty.getDbColumn(); + return baseTableAlias + "." + idProperty.dbColumn(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index 9beaeb8ad..8924da2a1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -225,7 +225,7 @@ public final class DeployBeanPropertyLists { if (versionProperty == null) { versionProperty = prop; } else { - logger.warn("Multiple @Version properties - property " + prop.getFullBeanName() + " not treated as a version property"); + logger.warn("Multiple @Version properties - property " + prop.fullName() + " not treated as a version property"); } } else if (prop.isDraftDirty()) { draftDirty = prop; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java index 7bd82c709..a3fa2797a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java @@ -3,8 +3,6 @@ package io.ebeaninternal.server.deploy.meta; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanTable; -import javax.persistence.JoinColumn; - /** * A join pair of local and foreign properties. */ @@ -87,7 +85,7 @@ public final class DeployTableJoinColumn { if (localDbColumn == null) { BeanProperty idProperty = beanTable.getIdProperty(); if (idProperty != null) { - localDbColumn = idProperty.getDbColumn(); + localDbColumn = idProperty.dbColumn(); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index c756912f8..8a4dfc599 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -199,7 +199,7 @@ final class AnnotationAssocManys extends AnnotationAssoc { if (localId != null) { // add foreign key based on convention String fkColName = namingConvention.getForeignKey(descriptor.getBaseTable(), localId.name()); - prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkColName)); + prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localId.dbColumn(), fkColName)); } } @@ -386,8 +386,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { BeanProperty localId = localTable.getIdProperty(); if (localId != null) { // add the source to intersection join columns - String fkCol = namingConvention.deriveM2MColumn(localTableName, localId.getDbColumn()); - intJoin.addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkCol)); + String fkCol = namingConvention.deriveM2MColumn(localTableName, localId.dbColumn()); + intJoin.addJoinColumn(new DeployTableJoinColumn(localId.dbColumn(), fkCol)); } } @@ -396,8 +396,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { BeanProperty otherId = otherTable.getIdProperty(); if (otherId != null) { // set the intersection to dest table join columns - String fkCol = namingConvention.deriveM2MColumn(otherTableName, otherId.getDbColumn()); - destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherId.getDbColumn())); + String fkCol = namingConvention.deriveM2MColumn(otherTableName, otherId.dbColumn()); + destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherId.dbColumn())); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index 5fc82e99a..d10acaedc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -59,9 +59,9 @@ public final class ElPropertyChain implements ElPropertyValue { this.assocId = chain[chain.length - 1].isAssocId(); this.last = chain.length - 1; - this.lastBeanProperty = chain[chain.length - 1].getBeanProperty(); + this.lastBeanProperty = chain[chain.length - 1].beanProperty(); if (lastBeanProperty != null) { - this.scalarType = lastBeanProperty.getScalarType(); + this.scalarType = lastBeanProperty.scalarType(); } else { // case for nested compound type (non-scalar) this.scalarType = null; @@ -77,8 +77,8 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public int getFetchPreference() { - return chain[0].getFetchPreference(); + public int fetchPreference() { + return chain[0].fetchPreference(); } @Override @@ -88,9 +88,9 @@ public final class ElPropertyChain implements ElPropertyValue { private String getElPlaceHolder(String prefix, ElPropertyValue lastElPropertyValue, boolean encrypted) { if (prefix == null) { - return lastElPropertyValue.getElPlaceholder(encrypted); + return lastElPropertyValue.elPlaceholder(encrypted); } - String el = lastElPropertyValue.getElPlaceholder(encrypted); + String el = lastElPropertyValue.elPlaceholder(encrypted); if (!el.contains("${}")) { // typically a secondary table property return el.replace("${", "${" + prefix + "."); @@ -113,7 +113,7 @@ public final class ElPropertyChain implements ElPropertyValue { } int i = 1 + SplitName.count(sinceProperty); for (; i < chain.length; i++) { - if (chain[i].getBeanProperty().containsMany()) { + if (chain[i].beanProperty().containsMany()) { return true; } } @@ -131,7 +131,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getElPrefix() { + public String elPrefix() { return prefix; } @@ -146,7 +146,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? placeHolderEncrypted : placeHolder; } @@ -218,12 +218,12 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getDbColumn() { - return lastElPropertyValue.getDbColumn(); + public String dbColumn() { + return lastElPropertyValue.dbColumn(); } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return lastBeanProperty; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java index ad43abce3..e5e491b98 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java @@ -40,7 +40,7 @@ public interface ElPropertyDeploy { * this property. *

    */ - String getElPrefix(); + String elPrefix(); /** * Return the place holder in the form of ${elPrefix}dbColumn. @@ -48,7 +48,7 @@ public interface ElPropertyDeploy { * The ${elPrefix} is replaced by the appropriate table alias. *

    */ - String getElPlaceholder(boolean encrypted); + String elPlaceholder(boolean encrypted); /** * Return the name of the property. @@ -63,12 +63,12 @@ public interface ElPropertyDeploy { /** * Return the deployment db column for this property. */ - String getDbColumn(); + String dbColumn(); /** * Return the underlying bean property. */ - BeanProperty getBeanProperty(); + BeanProperty beanProperty(); /** * Return true if this is an aggregation property. @@ -79,5 +79,5 @@ public interface ElPropertyDeploy { * Return the fetch preference. This can be used to control which ToMany relationship * is left as a 'join' and which get converted to query join. */ - int getFetchPreference(); + int fetchPreference(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index a8075090a..418ead12e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -37,7 +37,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } @@ -49,7 +49,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } if (not) { request.append("lower(").append(pname).append(") != ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java index bf3871c23..5d9a74759 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java @@ -29,7 +29,7 @@ final class LikeExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } String bindValue = getValue(strValue(), caseInsensitive, type, request); @@ -41,7 +41,7 @@ final class LikeExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } if (caseInsensitive) { request.append("lower(").append(pname).append(")"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java index 110442365..552f8d71f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java @@ -28,7 +28,7 @@ final class NativeILikeExpression extends AbstractExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } request.addBindValue(val); @@ -40,7 +40,7 @@ final class NativeILikeExpression extends AbstractExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } request.append(pname).append(" ilike ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index d6122e67f..b24f9b485 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -83,7 +83,7 @@ public final class SimpleExpression extends AbstractValueExpression { } if (prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } else if (prop.isLocalEncrypted()) { Object bindVal = prop.localEncrypt(value()); @@ -105,7 +105,7 @@ public final class SimpleExpression extends AbstractValueExpression { return; } if (prop.isDbEncrypted()) { - String dsql = prop.getBeanProperty().getDecryptProperty(propName); + String dsql = prop.beanProperty().getDecryptProperty(propName); request.append(dsql).append(type.bind()); return; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index c284cb39f..7d7fcfebb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -162,7 +162,7 @@ public final class DLoadContext implements LoadContext { */ private void registerSecondaryQuery(OrmQueryProperties props) { ElPropertyValue elGetValue = rootDescriptor.getElGetValue(props.getPath()); - boolean many = elGetValue.getBeanProperty().containsMany(); + boolean many = elGetValue.beanProperty().containsMany(); registerSecondaryNode(many, props); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index ba496c915..c20e68496 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -783,7 +783,7 @@ public final class DefaultPersister implements Persister { for (BeanPropertyAssocMany many : manys) { SqlUpdate sqlDelete = many.deleteByParentId(id, idList); if (t.isLogSummary()) { - t.logSummary("-- Deleting intersection table entries: " + many.getFullBeanName()); + t.logSummary("-- Deleting intersection table entries: " + many.fullName()); } executeSqlUpdate(sqlDelete, t); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index d150188de..dd4f6c670 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -277,7 +277,7 @@ public final class SaveManyBeans extends SaveManyBase { } else if (value instanceof Collection) { additions = (Collection) value; } else { - throw new PersistenceException("Unhandled ManyToMany type " + value.getClass().getName() + " for " + many.getFullBeanName()); + throw new PersistenceException("Unhandled ManyToMany type " + value.getClass().getName() + " for " + many.fullName()); } if (!vanillaCollection) { BeanCollection manyValue = (BeanCollection) value; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index be2bf26c2..4ebba440e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -44,7 +44,7 @@ final class BindableEncryptedProperty implements Bindable { public void dmlAppend(GenerateDmlRequest request) { // columnName = AES_ENCRYPT(?,?) - request.appendColumn(prop.getDbColumn(), prop.getDbBind()); + request.appendColumn(prop.dbColumn(), prop.getDbBind()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index a62135f46..7cb2b104d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -76,7 +76,7 @@ final class BindableIdEmbedded implements BindableId { @Override public void dmlAppend(GenerateDmlRequest request) { for (BeanProperty prop : props) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } } @@ -84,7 +84,7 @@ final class BindableIdEmbedded implements BindableId { public boolean deriveConcatenatedId(PersistRequestBean persist) { if (matches == null) { - String m = "No matches for " + embId.getFullBeanName() + " the concatenated key columns where not found?" + String m = "No matches for " + embId.fullName() + " the concatenated key columns where not found?" + " I expect that the concatenated key was null, and this bean does" + " not have ManyToOne assoc beans matching the primary key columns?"; throw new PersistenceException(m); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 518a236b7..7b50e1e4e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -32,7 +32,7 @@ final class BindableIdScalar implements BindableId { @Override public String getIdentityColumn() { - return uidProp.getDbColumn(); + return uidProp.dbColumn(); } @Override @@ -64,7 +64,7 @@ final class BindableIdScalar implements BindableId { @Override public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(uidProp.getDbColumn()); + request.appendColumn(uidProp.dbColumn()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java index 8f50fe7b3..d4129922a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java @@ -38,7 +38,7 @@ class BindableProperty implements Bindable { @Override public final void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java index db28c3035..56eddd8e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java @@ -38,7 +38,7 @@ final class BindablePropertyVersion implements Bindable { @Override public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java index e4fa26284..60079c015 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java @@ -24,7 +24,7 @@ final class MatchedImportedFactory { private static MatchedImportedProperty findMatch(BeanProperty prop, BeanDescriptor desc) { // find matching against the local database column - String dbColumn = prop.getDbColumn(); + String dbColumn = prop.dbColumn(); for (BeanPropertyAssocOne assocOne1 : desc.propertiesOne()) { if (assocOne1.isImportedPrimaryKey()) { // search using the ImportedId from the assoc one @@ -35,7 +35,7 @@ final class MatchedImportedFactory { } } for (BeanProperty beanProperty : desc.propertiesBaseScalar()) { - if (dbColumn.equals(beanProperty.getDbColumn())) { + if (dbColumn.equals(beanProperty.dbColumn())) { return new MatchedImportedScalar(prop, beanProperty); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index cbe600a51..e7de1fbd4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -488,7 +488,7 @@ final class CQueryBuilder { } private void addRawColumnMapping(PathProperties pathProps, Column column, String propertyName, ElPropertyValue el) { - BeanProperty beanProperty = el.getBeanProperty(); + BeanProperty beanProperty = el.beanProperty(); if (beanProperty.isId()) { if (propertyName.contains(".")) { // For @Id properties we chop off the last part of the path @@ -583,7 +583,7 @@ final class CQueryBuilder { sb.append("r1.attribute_, count(*) from (select "); if (distinct) { sb.append("distinct t0."); - sb.append(request.descriptor().idProperty().getDbColumn()).append(", "); + sb.append(request.descriptor().idProperty().dbColumn()).append(", "); } sb.append(select.getSelectSql()).append(" as attribute_"); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java index c26364364..4323a5a01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java @@ -59,7 +59,7 @@ final class CQueryOrderBy { return p.toStringFormat(); } - BeanProperty beanProperty = el.getBeanProperty(); + BeanProperty beanProperty = el.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc ap = (BeanPropertyAssoc) beanProperty; IdBinder idBinder = ap.getTargetDescriptor().getIdBinder(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 698963c75..f7f63ef5b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -221,7 +221,7 @@ public class CQueryPlan implements SpiQueryPlan { DataBind dataBind = new DataBind(dataTimeZone, stmt, conn); if (encryptedProps != null) { for (STreeProperty encryptedProp : encryptedProps) { - dataBind.setString(encryptedProp.getEncryptKeyAsString()); + dataBind.setString(encryptedProp.encryptKeyAsString()); } } return dataBind; @@ -231,7 +231,7 @@ public class CQueryPlan implements SpiQueryPlan { DataBindCapture dataBind = DataBindCapture.of(dataTimeZone); if (encryptedProps != null) { for (STreeProperty encryptedProp : encryptedProps) { - dataBind.setString(encryptedProp.getEncryptKeyAsString()); + dataBind.setString(encryptedProp.encryptKeyAsString()); } } return dataBind; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java index b1b15f019..954ef6e1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java @@ -22,7 +22,7 @@ public interface STreeProperty extends ScalarDataReader { /** * Return the full property name (for error messages). */ - String getFullBeanName(); + String fullName(); /** * Return true if the property is the Id. @@ -54,17 +54,17 @@ public interface STreeProperty extends ScalarDataReader { /** * Return the encryption key as a string value (when the property is encrypted). */ - String getEncryptKeyAsString(); + String encryptKeyAsString(); /** * Return the Expression language prefix (join path). */ - String getElPrefix(); + String elPrefix(); /** * Return the underlying scalar type for the property (for findSingleAttribute). */ - ScalarType getScalarType(); + ScalarType scalarType(); /** * For RawSql build the select chain. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java index cdeb345c0..5ea33f112 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java @@ -63,7 +63,7 @@ public final class SqlBeanLoad { return prop.readSet(ctx, bean); } catch (Exception e) { bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e); - ctx.handleLoadError(prop.getFullBeanName(), e); + ctx.handleLoadError(prop.fullName(), e); return prop.getValue(bean); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index f0b43ef16..551e224fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -417,7 +417,7 @@ public final class SqlTreeBuilder { // add the embedded bean or the *ToOne assoc bean. We skip the check that the *ToOne propName maps to Id property ... selectProps.add(p); } else { - logger.error("property [" + p.getFullBeanName() + "] expected to be an embedded or *ToOne bean for query - excluding it."); + logger.error("property [" + p.fullName() + "] expected to be an embedded or *ToOne bean for query - excluding it."); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java index 31af8813a..623b1dd36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java @@ -39,7 +39,7 @@ public final class SqlTreeProperties { if (prop.isAggregation()) { if (!aggregation) { aggregation = true; - aggregationPath = prop.getElPrefix(); + aggregationPath = prop.elPrefix(); } if (prop.isAggregationManyToOne()) { aggregationManyToOne = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java index c9ed9ca11..8d452adb4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java @@ -28,7 +28,7 @@ public final class DefaultUpdateQuery implements UpdateQuery { values.setNull(property); } else { final BeanProperty beanProperty = descriptor.getBeanProperty(property); - final ScalarType scalarType = (beanProperty == null) ? null: beanProperty.getScalarType(); + final ScalarType scalarType = (beanProperty == null) ? null: beanProperty.scalarType(); values.set(property, value, scalarType); } return this; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index a8a453bee..85a709118 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -312,7 +312,7 @@ public final class OrmQueryDetail implements Serializable { throw new PersistenceException("Path [" + parentPath + "] not valid from " + d.fullName()); } // add a missing parent path just fetching the Id property - BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.getBeanProperty(); + BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.beanProperty(); if (addId) { parentProp = new OrmQueryProperties(parentPath, assocOne.getTargetIdProperty()); } else { @@ -549,8 +549,8 @@ public final class OrmQueryDetail implements Serializable { */ @Override public int compareTo(FetchEntry other) { - int fp = elProp.getFetchPreference(); - int op = other.elProp.getFetchPreference(); + int fp = elProp.fetchPreference(); + int op = other.elProp.fetchPreference(); if (fp == op) { return Integer.compare(index, other.index); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index 0b9bc22d9..bc40fbc54 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -247,7 +247,7 @@ public class TCsvReader implements CsvReader { addDateTime(aLine, null, null); } else if (elProp.isAssocProperty()) { - BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) elProp.getBeanProperty(); + BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) elProp.beanProperty(); String idProp = assocOne.getBeanDescriptor().getIdBinder().getIdProperty(); addProperty(aLine + "." + idProp); } else { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 0b095dc54..5a09b7286 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -22,10 +22,10 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { BeanDescriptor desc = server.getBeanDescriptor(Customer.class); BeanProperty whenCreatedProperty = desc.whenCreatedProperty(); - assertEquals("cretime", whenCreatedProperty.getDbColumn()); + assertEquals("cretime", whenCreatedProperty.dbColumn()); BeanProperty whenModifiedProperty = desc.whenModifiedProperty(); - assertEquals("updtime", whenModifiedProperty.getDbColumn()); + assertEquals("updtime", whenModifiedProperty.dbColumn()); BeanDescriptor eBasicDesc = server.getBeanDescriptor(EBasic.class); diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index 56ffb4c38..70ce4a9b1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -21,7 +21,7 @@ public class TestJodaType extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); - ScalarType scalarType = beanProperty.getScalarType(); + ScalarType scalarType = beanProperty.scalarType(); assertNotNull(scalarType); } diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index 50c0a7284..159c7453b 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -31,17 +31,17 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); assertTrue(elBillAddressId instanceof BeanFkeyProperty); - assertEquals("billing_address_id", elBillAddressId.getDbColumn()); + assertEquals("billing_address_id", elBillAddressId.dbColumn()); assertEquals("billingAddress.id", elBillAddressId.name()); - assertNull(elBillAddressId.getElPrefix()); + assertNull(elBillAddressId.elPrefix()); ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); assertTrue(elBillAddressCity instanceof ElPropertyChain); - assertEquals("billingAddress", elBillAddressCity.getElPrefix()); + assertEquals("billingAddress", elBillAddressCity.elPrefix()); assertEquals("city", elBillAddressCity.name()); - assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); - assertEquals("city", elBillAddressCity.getDbColumn()); + assertEquals("${billingAddress}city", elBillAddressCity.elPlaceholder(false)); + assertEquals("city", elBillAddressCity.dbColumn()); // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); @@ -51,10 +51,10 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); assertTrue(elOrderStatus instanceof ElPropertyChain); - assertEquals("orders", elOrderStatus.getElPrefix()); + assertEquals("orders", elOrderStatus.elPrefix()); assertEquals("status", elOrderStatus.name()); - assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); - assertEquals("status", elOrderStatus.getDbColumn()); + assertEquals("${orders}status", elOrderStatus.elPlaceholder(false)); + assertEquals("status", elOrderStatus.dbColumn()); ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); assertTrue(elOrderCust instanceof ElPropertyChain); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 6dcf22b5a..6cfe3dd5f 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -98,7 +98,7 @@ public class MTable { withHistory = true; BeanProperty whenCreated = descriptor.whenCreatedProperty(); if (whenCreated != null) { - whenCreatedColumn = whenCreated.getDbColumn(); + whenCreatedColumn = whenCreated.dbColumn(); } } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java index 2dc0b245d..6fe58fe6c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java @@ -145,7 +145,7 @@ public class ModelBuildContext { public String getColumnDefn(BeanProperty p, boolean strict) { DbPlatformType dbType = getDbType(p); if (dbType == null) { - throw new IllegalStateException("Unknown DbType mapping for " + p.getFullBeanName()); + throw new IllegalStateException("Unknown DbType mapping for " + p.fullName()); } return p.renderDbType(dbType, strict); } @@ -157,7 +157,7 @@ public class ModelBuildContext { } if (p.isLocalEncrypted()) { // scalar type potentially wrapping varbinary db type - ScalarType scalarType = p.getScalarType(); + ScalarType scalarType = p.scalarType(); int jdbcType = scalarType.getJdbcType(); return dbTypeMap.get(jdbcType); } @@ -165,7 +165,7 @@ public class ModelBuildContext { // can be the logical JSON types (JSON, JSONB, JSONClob, JSONBlob, JSONVarchar) int dbType = p.getDbType(platformTypes); if (dbType == 0) { - throw new RuntimeException("No scalarType defined for " + p.getFullBeanName()); + throw new RuntimeException("No scalarType defined for " + p.fullName()); } return dbTypeMap.get(dbType); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java index e117c3ead..e6c0d897d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java @@ -5,7 +5,6 @@ import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import io.ebeaninternal.server.deploy.PropertyForeignKey; import io.ebeaninternal.server.deploy.TableJoin; import io.ebeaninternal.server.deploy.TableJoinColumn; @@ -34,7 +33,7 @@ class ModelBuildIntersectionTable { intersectionTable = createTable(); MTable existingTable = ctx.addTable(intersectionTable); if (existingTable != null) { - throw new IllegalStateException("Property " + manyProp.getFullBeanName() + " has duplicate ManyToMany intersection table " + intersectionTable.getName() + throw new IllegalStateException("Property " + manyProp.fullName() + " has duplicate ManyToMany intersection table " + intersectionTable.getName() + ". Please use @JoinTable to define unique table to use"); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java index 4505808ee..e184ea065 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -189,7 +189,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { TableJoinColumn[] columns = p.getTableJoin().columns(); if (columns.length == 0) { - throw new RuntimeException("No join columns for " + p.getFullBeanName()); + throw new RuntimeException("No join columns for " + p.fullName()); } ImportedId importedId = p.getImportedId(); @@ -214,7 +214,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { throw new RuntimeException("Imported BeanProperty not found?"); } String columnDefn = ctx.getColumnDefn(importedProperty, true); - String refColumn = importedProperty.getDbColumn(); + String refColumn = importedProperty.dbColumn(); MColumn col = table.addColumn(dbCol, columnDefn, !p.isNullable()); col.setDbMigrationInfos(p.getDbMigrationInfos()); @@ -268,7 +268,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { // using non-strict mode to render the DB type such that we have a // "logical" type like jsonb(200) that can map to JSONB or VARCHAR(200) - MColumn col = new MColumn(p.getDbColumn(), ctx.getColumnDefn(p, false)); + MColumn col = new MColumn(p.dbColumn(), ctx.getColumnDefn(p, false)); col.setComment(p.getDbComment()); col.setDraftOnly(p.isDraftOnly()); col.setHistoryExclude(p.isExcludedFromHistory()); @@ -309,7 +309,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); inheritInfo.appendCheckConstraintValues(p.name(), checkConstraintValues); } - col.setCheckConstraint(buildCheckConstraint(p.getDbColumn(), checkConstraintValues)); + col.setCheckConstraint(buildCheckConstraint(p.dbColumn(), checkConstraintValues)); col.setCheckConstraintName(checkConstraintName(col.getName())); } From d389ac680f044bdf2dc50ecc26f2514e49be73dc Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 15:17:17 +1200 Subject: [PATCH 081/102] #2359 - Rename internal methods - BeanDescriptor --- .../service/ProfileOriginNodeUsage.java | 8 +- .../io/ebeaninternal/api/LoadManyRequest.java | 10 +- .../io/ebeaninternal/api/ManyWhereJoins.java | 2 +- .../server/cache/CachedBeanDataFromBean.java | 8 +- .../server/cache/CachedBeanDataToBean.java | 6 +- .../server/core/DefaultBeanLoader.java | 8 +- .../server/core/DefaultServer.java | 8 +- .../server/core/OrmQueryRequest.java | 14 +- .../core/PersistDeferredRelationship.java | 4 +- .../server/core/PersistRequestBean.java | 34 +-- .../deploy/AssocOneHelpRefExported.java | 2 +- .../server/deploy/BaseCollectionHelp.java | 2 +- .../server/deploy/BeanChangeJson.java | 2 +- .../deploy/BeanCollectionHelpFactory.java | 4 +- .../server/deploy/BeanDescriptor.java | 198 +++++++++--------- .../deploy/BeanDescriptorCacheHelp.java | 4 +- .../deploy/BeanDescriptorDraftHelp.java | 8 +- .../server/deploy/BeanDescriptorElement.java | 2 +- .../deploy/BeanDescriptorElementEmbedded.java | 2 +- .../server/deploy/BeanDescriptorJsonHelp.java | 4 +- .../server/deploy/BeanDescriptorManager.java | 8 +- .../deploy/BeanEmbeddedMetaFactory.java | 6 +- .../server/deploy/BeanListHelp.java | 8 +- .../server/deploy/BeanMapHelp.java | 16 +- .../server/deploy/BeanProperty.java | 58 ++--- .../server/deploy/BeanPropertyAssoc.java | 44 ++-- .../server/deploy/BeanPropertyAssocMany.java | 58 ++--- .../deploy/BeanPropertyAssocManyJsonHelp.java | 2 +- .../BeanPropertyAssocManyJsonTransient.java | 6 +- .../deploy/BeanPropertyAssocManySqlHelp.java | 10 +- .../server/deploy/BeanPropertyAssocOne.java | 42 ++-- .../server/deploy/BeanSetHelp.java | 8 +- .../server/deploy/BeanTable.java | 2 +- .../server/deploy/DeployPropertyParser.java | 2 +- .../server/deploy/DeployUpdateParser.java | 2 +- .../DynamicPropertyAggregationFormulaMTO.java | 2 +- .../server/deploy/FormulaPropertyPath.java | 6 +- .../server/deploy/InheritInfo.java | 6 +- .../server/deploy/IntersectionRow.java | 2 +- .../server/deploy/id/IdBinderEmbedded.java | 6 +- .../server/deploy/id/ImportedIdEmbedded.java | 6 +- .../server/deploy/id/ImportedIdSimple.java | 4 +- .../deploy/meta/DeployBeanPropertyLists.java | 10 +- .../deploy/visitor/VisitProperties.java | 6 +- .../io/ebeaninternal/server/el/ElFilter.java | 6 +- .../server/expression/AbstractExpression.java | 6 +- .../expression/AllEqualsExpression.java | 2 +- .../expression/BetweenPropertyExpression.java | 6 +- .../CaseInsensitiveEqualExpression.java | 4 +- .../expression/DefaultExampleExpression.java | 2 +- .../server/expression/IdExpression.java | 4 +- .../server/expression/IdInExpression.java | 10 +- .../server/expression/LikeExpression.java | 4 +- .../expression/NativeILikeExpression.java | 4 +- .../server/expression/NullExpression.java | 2 +- .../server/expression/SimpleExpression.java | 4 +- .../server/loadcontext/DLoadBeanContext.java | 2 +- .../server/loadcontext/DLoadContext.java | 10 +- .../server/loadcontext/DLoadManyContext.java | 4 +- .../server/persist/DefaultPersister.java | 12 +- .../server/persist/MergeHandler.java | 2 +- .../server/persist/MergeNode.java | 2 +- .../persist/MergeNodeAssocManyToMany.java | 4 +- .../persist/MergeNodeAssocOneToMany.java | 4 +- .../server/persist/SaveManyBase.java | 2 +- .../server/persist/SaveManyBeans.java | 22 +- .../server/persist/dml/DeleteMeta.java | 2 +- .../persist/dml/GeneratedProperties.java | 2 +- .../dml/GeneratedPropertyCollector.java | 2 +- .../server/persist/dml/InsertMeta.java | 4 +- .../server/persist/dml/MetaFactory.java | 4 +- .../server/persist/dml/UpdateMeta.java | 4 +- .../persist/dmlbind/BindableAssocOne.java | 2 +- .../dmlbind/BindableEncryptedProperty.java | 4 +- .../persist/dmlbind/BindableIdEmbedded.java | 2 +- .../dmlbind/BindablePropertyJsonInsert.java | 2 +- .../dmlbind/BindablePropertyJsonUpdate.java | 2 +- .../dmlbind/BindablePropertyVersion.java | 2 +- .../dmlbind/BindableUnidirectional.java | 4 +- .../persist/dmlbind/FactoryEmbedded.java | 2 +- .../server/persist/dmlbind/FactoryId.java | 2 +- .../persist/dmlbind/FactoryVersion.java | 6 +- .../dmlbind/MatchedImportedFactory.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 4 +- .../server/query/CQueryBuilder.java | 16 +- .../server/query/CQueryBuilderRawSql.java | 2 +- .../server/query/CQueryOrderBy.java | 4 +- .../server/query/CQueryPlan.java | 4 +- .../server/query/CQueryPredicates.java | 4 +- .../server/query/STreePropertyAssoc.java | 6 +- .../server/query/STreePropertyAssocMany.java | 2 +- .../server/query/STreePropertyAssocOne.java | 2 +- .../ebeaninternal/server/query/STreeType.java | 8 +- .../server/query/SqlBeanLoad.java | 4 +- .../server/query/SqlTreeBuilder.java | 4 +- .../server/query/SqlTreeNodeBean.java | 22 +- .../server/query/SqlTreeNodeExtraJoin.java | 6 +- .../query/SqlTreeNodeManyWhereJoin.java | 8 +- .../server/querydefn/DefaultOrmQuery.java | 18 +- .../server/querydefn/DefaultUpdateQuery.java | 2 +- .../server/querydefn/OrmQueryDetail.java | 12 +- .../server/text/csv/TCsvReader.java | 4 +- .../server/text/json/WriteJson.java | 2 +- .../server/transaction/BeanPersistIds.java | 6 +- .../server/transaction/DeleteByIdMap.java | 2 +- .../server/util/BindParamsParser.java | 2 +- .../api/support/DocStoreBeanBaseAdapter.java | 10 +- .../docstore/api/support/DocStructure.java | 2 +- .../server/cache/CacheBeanDataTest.java | 2 +- .../deploy/BeanPropertyAssocManyTest.java | 2 +- .../TestBeanDescriptorHasIdProperty.java | 8 +- .../deploy/TestCollectionLoadedStatus.java | 8 +- .../GeneratedCounterLongTest.java | 4 +- .../server/loadcontext/DLoadContextTest.java | 2 +- .../org/tests/basic/TestAnnotationBase.java | 6 +- .../java/org/tests/basic/TestJodaType.java | 2 +- .../org/tests/basic/TestQueryWithCache.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 2 +- .../test/java/org/tests/el/TestELBasic.java | 18 +- .../org/tests/family/TestInheritance.java | 4 +- .../joins/TestQueryJoinQueryNonRoot.java | 3 +- .../query/other/TestManyLazyLoadingQuery.java | 2 +- .../org/tests/test/TestInheritWithMany.java | 2 +- .../dbmigration/model/MTable.java | 8 +- .../model/build/ModelBuildBeanVisitor.java | 2 +- .../model/build/ModelBuildContext.java | 4 +- .../model/build/ModelBuildElementTable.java | 4 +- .../build/ModelBuildIntersectionTable.java | 16 +- .../build/ModelBuildPropertyVisitor.java | 34 +-- 129 files changed, 552 insertions(+), 555 deletions(-) diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index d684d063a..1f2a655dc 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -43,14 +43,14 @@ public class ProfileOriginNodeUsage { try { BeanDescriptor desc = rootDesc; if (path != null) { - ElPropertyValue elGetValue = rootDesc.getElGetValue(path); + ElPropertyValue elGetValue = rootDesc.elGetValue(path); if (elGetValue == null) { logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name()); return; } else { BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { - desc = ((BeanPropertyAssoc) beanProperty).getTargetDescriptor(); + desc = ((BeanPropertyAssoc) beanProperty).targetDescriptor(); } } } @@ -83,7 +83,7 @@ public class ProfileOriginNodeUsage { } if ((modified || addVersionProperty) && desc != null) { - BeanProperty versionProp = desc.getVersionProperty(); + BeanProperty versionProp = desc.versionProperty(); if (versionProp != null) { addedToPath = true; pathProps.addToPath(path, versionProp.name()); @@ -92,7 +92,7 @@ public class ProfileOriginNodeUsage { if (toOneIdProperty != null && !addedToPath) { // add ToOne property to parent path - ElPropertyValue assocOne = rootDesc.getElGetValue(path); + ElPropertyValue assocOne = rootDesc.elGetValue(path); pathProps.addToPath(SplitName.parent(path), assocOne.name()); } } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index d3326e504..a304be78d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -60,10 +60,10 @@ public final class LoadManyRequest extends LoadRequest { List idList = new ArrayList<>(); BeanPropertyAssocMany many = many(); for (BeanCollection bc : batch) { - idList.add(many.getParentId(bc.getOwnerBean())); + idList.add(many.parentId(bc.getOwnerBean())); bc.setLoader(server); // don't use the load buffer again } - if (many.getTargetDescriptor().isPadInExpression()) { + if (many.targetDescriptor().isPadInExpression()) { BindPadding.padIds(idList); } return idList; @@ -76,11 +76,11 @@ public final class LoadManyRequest extends LoadRequest { public SpiQuery createQuery(SpiEbeanServer server) { BeanPropertyAssocMany many = many(); SpiQuery query = many.newQuery(server); - String orderBy = many.getLazyFetchOrderBy(); + String orderBy = many.lazyFetchOrderBy(); if (orderBy != null) { query.order(orderBy); } - String extraWhere = many.getExtraWhere(); + String extraWhere = many.extraWhere(); if (extraWhere != null) { // replace special ${ta} placeholder with the base table alias // which is always t0 and add the extra where clause @@ -99,7 +99,7 @@ public final class LoadManyRequest extends LoadRequest { loadContext.configureQuery(query); if (onlyIds) { // lazy loading invoked via clear() and removeAll() - query.select(many.getTargetIdProperty()); + query.select(many.targetIdProperty()); } return query; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 50fac9299..93e4111ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -57,7 +57,7 @@ public final class ManyWhereJoins implements Serializable { if (join != null) { addJoin(join); if (p != null) { - String secondaryTableJoinPrefix = p.getSecondaryTableJoinPrefix(); + String secondaryTableJoinPrefix = p.secondaryTableJoinPrefix(); if (secondaryTableJoinPrefix != null) { addJoin(join + "." + secondaryTableJoinPrefix); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java index 02353ba17..2405e03bc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -17,7 +17,7 @@ public final class CachedBeanDataFromBean { BeanProperty idProperty = desc.idProperty(); if (idProperty != null) { - int propertyIndex = idProperty.getPropertyIndex(); + int propertyIndex = idProperty.propertyIndex(); if (ebi.isLoadedProperty(propertyIndex)) { data.put(idProperty.name(), idProperty.getCacheDataValue(bean)); } @@ -26,9 +26,9 @@ public final class CachedBeanDataFromBean { // extract all the non-many properties final boolean dirty = ebi.isDirty(); for (BeanProperty prop : desc.propertiesNonMany()) { - if (dirty && ebi.isDirtyProperty(prop.getPropertyIndex())) { + if (dirty && ebi.isDirtyProperty(prop.propertyIndex())) { data.put(prop.name(), prop.getCacheDataValueOrig(ebi)); - } else if (ebi.isLoadedProperty(prop.getPropertyIndex())) { + } else if (ebi.isLoadedProperty(prop.propertyIndex())) { data.put(prop.name(), prop.getCacheDataValue(bean)); } } @@ -41,7 +41,7 @@ public final class CachedBeanDataFromBean { long version = desc.getVersion(bean); EntityBean sharableBean = createSharableBean(desc, bean, ebi); - return new CachedBeanData(sharableBean, desc.getDiscValue(), data, version); + return new CachedBeanData(sharableBean, desc.discValue(), data, version); } private static EntityBean createSharableBean(BeanDescriptor desc, EntityBean bean, EntityBeanIntercept beanEbi) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java index 1c3f4996f..ae5b922a9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java @@ -14,8 +14,8 @@ public final class CachedBeanDataToBean { // any future lazy loading skips L2 bean cache ebi.setLoadedFromCache(true); BeanProperty idProperty = desc.idProperty(); - if (desc.getInheritInfo() != null) { - desc = desc.getInheritInfo().readType(bean.getClass()).desc(); + if (desc.inheritInfo() != null) { + desc = desc.inheritInfo().readType(bean.getClass()).desc(); } if (idProperty != null) { // load the id property @@ -37,7 +37,7 @@ public final class CachedBeanDataToBean { private static void loadProperty(EntityBean bean, CachedBeanData cacheBeanData, EntityBeanIntercept ebi, BeanProperty prop, PersistenceContext context) { if (cacheBeanData.isLoaded(prop.name())) { - if (!ebi.isLoadedProperty(prop.getPropertyIndex())) { + if (!ebi.isLoadedProperty(prop.propertyIndex())) { Object value = cacheBeanData.getData(prop.name()); prop.setCacheDataValue(bean, value, context); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index ef0efe603..834b6ed7c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -55,7 +55,7 @@ final class DefaultBeanLoader { EntityBeanIntercept ebi = parentBean._ebean_getIntercept(); PersistenceContext pc = ebi.getPersistenceContext(); BeanDescriptor parentDesc = server.getBeanDescriptor(parentBean.getClass()); - BeanPropertyAssocMany many = (BeanPropertyAssocMany) parentDesc.getBeanProperty(propertyName); + BeanPropertyAssocMany many = (BeanPropertyAssocMany) parentDesc.beanProperty(propertyName); BeanCollection beanCollection = null; ExpressionList filterMany = null; @@ -91,9 +91,9 @@ final class DefaultBeanLoader { query.setLoadDescription("+lazy", null); } - query.select(parentDesc.getIdBinder().getIdProperty()); + query.select(parentDesc.idBinder().getIdProperty()); if (onlyIds) { - query.fetch(many.name(), many.getTargetIdProperty()); + query.fetch(many.name(), many.targetIdProperty()); } else { query.fetch(many.name()); } @@ -177,7 +177,7 @@ final class DefaultBeanLoader { } BeanDescriptor desc = server.getBeanDescriptor(bean.getClass()); - if (EntityType.EMBEDDED == desc.getEntityType()) { + if (EntityType.EMBEDDED == desc.entityType()) { // lazy loading on an embedded bean property EntityBean embeddedOwner = (EntityBean) ebi.getEmbeddedOwner(); refreshBeanInternal(embeddedOwner, mode, ebi.getEmbeddedOwnerIndex()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index d3e6eba47..44d5b5814 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -703,7 +703,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } - InheritInfo inheritInfo = desc.getInheritInfo(); + InheritInfo inheritInfo = desc.inheritInfo(); if (inheritInfo == null || inheritInfo.isConcrete()) { return (T) desc.contextRef(pc, null, false, id); } @@ -952,11 +952,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (desc == null) { throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?"); } - String named = desc.getNamedQuery(namedQuery); + String named = desc.namedQuery(namedQuery); if (named != null) { return createQuery(beanType, named); } - SpiRawSql rawSql = desc.getNamedRawSql(namedQuery); + SpiRawSql rawSql = desc.namedRawSql(namedQuery); if (rawSql != null) { DefaultOrmQuery query = createQuery(beanType); query.setRawSql(rawSql); @@ -2293,7 +2293,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return Collections.singleton(idProperty); } } - for (BeanProperty[] props : beanDesc.getUniqueProps()) { + for (BeanProperty[] props : beanDesc.uniqueProps()) { Set ret = checkUniqueness(entityBean, beanDesc, props, transaction); if (ret != null) { return ret; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index c236f64f6..11bdc6470 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -78,7 +78,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery query, SpiTransaction t) { super(server, t); this.beanDescriptor = query.getBeanDescriptor(); - this.finder = beanDescriptor.getBeanFinder(); + this.finder = beanDescriptor.beanFinder(); this.queryEngine = queryEngine; this.query = query; this.readOnly = query.isReadOnly(); @@ -499,7 +499,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Determine and return the ToMany property that is included in the query. */ public BeanPropertyAssocMany determineMany() { - manyProperty = beanDescriptor.getManyProperty(query); + manyProperty = beanDescriptor.manyProperty(query); return manyProperty; } @@ -515,7 +515,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * query plan for this query exists. */ public CQueryPlan queryPlan() { - return beanDescriptor.getQueryPlan(queryPlanKey); + return beanDescriptor.queryPlan(queryPlanKey); } /** @@ -533,7 +533,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Put the QueryPlan into the cache. */ public void putQueryPlan(CQueryPlan queryPlan) { - beanDescriptor.putQueryPlan(queryPlanKey, queryPlan); + beanDescriptor.queryPlan(queryPlanKey, queryPlan); } @Override @@ -617,7 +617,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery } private ElPropertyValue mapProperty() { - ElPropertyValue property = beanDescriptor.getElGetValue(query.getMapKey()); + ElPropertyValue property = beanDescriptor.elGetValue(query.getMapKey()); if (property == null) { throw new IllegalStateException("Unknown map key property "+query.getMapKey()); } @@ -684,7 +684,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery Collection actualDetails = ((BeanCollection)cached).getActualDetails(); List ids = new ArrayList<>(actualDetails.size()); for (T bean : actualDetails) { - ids.add(beanDescriptor.getIdForJson(bean)); + ids.add(beanDescriptor.idForJson(bean)); } beanDescriptor.readAuditMany(queryPlanKey.getPartialKey(), "l2-query-cache", ids); } @@ -761,7 +761,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return the base table alias for this query. */ public String baseTableAlias() { - return query.getAlias(beanDescriptor.getBaseTableAlias()); + return query.getAlias(beanDescriptor.baseTableAlias()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java index 41bbb20ef..279bf6329 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java @@ -35,13 +35,13 @@ public final class PersistDeferredRelationship { */ public void execute(SpiTransaction transaction) { - String sql = beanDescriptor.getUpdateImportedIdSql(importedId); + String sql = beanDescriptor.updateImportedIdSql(importedId); SqlUpdate sqlUpdate = ebeanServer.sqlUpdate(sql); // bind the set clause for the importedId int pos = importedId.bind(1, sqlUpdate, assocBean); // bind the where clause for the bean - Object[] idValues = beanDescriptor.getIdBinder().getIdValues(bean); + Object[] idValues = beanDescriptor.idBinder().getIdValues(bean); for (int j = 0; j < idValues.length; j++) { sqlUpdate.setParameter(pos + j, idValues[j]); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 727f9a132..81eef4eb0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -169,7 +169,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP // Mark Mutable scalar properties (like Hstore) as dirty where necessary beanDescriptor.checkMutableProperties(intercept); } - this.concurrencyMode = beanDescriptor.getConcurrencyMode(intercept); + this.concurrencyMode = beanDescriptor.concurrencyMode(intercept); this.publish = Flags.isPublish(flags); if (isMarkDraftDirty(publish)) { beanDescriptor.setDraftDirty(entityBean, true); @@ -210,7 +210,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ private DocStoreMode calcDocStoreMode(SpiTransaction txn, Type type) { DocStoreMode txnMode = (txn == null) ? null : txn.getDocStoreMode(); - return beanDescriptor.getDocStoreMode(type, txnMode); + return beanDescriptor.docStoreMode(type, txnMode); } /** @@ -272,28 +272,28 @@ public final class PersistRequestBean extends PersistRequest implements BeanP private void onUpdateGeneratedProperties() { for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) { - GeneratedProperty generatedProperty = prop.getGeneratedProperty(); + GeneratedProperty generatedProperty = prop.generatedProperty(); if (prop.isVersion()) { if (isLoadedProperty(prop)) { // @Version property must be loaded to be involved Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); Object oldVal = prop.getValue(entityBean); setVersionValue(value); - intercept.setOldValue(prop.getPropertyIndex(), oldVal); + intercept.setOldValue(prop.propertyIndex(), oldVal); } } else { // @WhenModified set without invoking interception Object oldVal = prop.getValue(entityBean); Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); prop.setValueChanged(entityBean, value); - intercept.setOldValue(prop.getPropertyIndex(), oldVal); + intercept.setOldValue(prop.propertyIndex(), oldVal); } } } private void onInsertGeneratedProperties() { for (BeanProperty prop : beanDescriptor.propertiesGenInsert()) { - Object value = prop.getGeneratedProperty().getInsertValue(prop, entityBean, now()); + Object value = prop.generatedProperty().getInsertValue(prop, entityBean, now()); prop.setValueChanged(entityBean, value); } } @@ -704,21 +704,21 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return true if this property is loaded (full bean or included in partial bean). */ public boolean isLoadedProperty(BeanProperty prop) { - return intercept.isLoadedProperty(prop.getPropertyIndex()); + return intercept.isLoadedProperty(prop.propertyIndex()); } /** * Return true if the property is dirty. */ public boolean isDirtyProperty(BeanProperty prop) { - return intercept.isDirtyProperty(prop.getPropertyIndex()); + return intercept.isDirtyProperty(prop.propertyIndex()); } /** * Return the original / old value for the given property. */ public Object getOrigValue(BeanProperty prop) { - return intercept.getOrigValue(prop.getPropertyIndex()); + return intercept.getOrigValue(prop.propertyIndex()); } @Override @@ -752,7 +752,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Soft delete is executed as update so we want to set deleted=true property. */ private void prepareForSoftDelete() { - beanDescriptor.setSoftDeleteValue(entityBean); + beanDescriptor.softDeleteValue(entityBean); } @Override @@ -855,7 +855,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } private void changeLog() { - BeanChange changeLogBean = beanDescriptor.getChangeLogBean(this); + BeanChange changeLogBean = beanDescriptor.changeLogBean(this); if (changeLogBean != null) { transaction.addBeanChange(changeLogBean); } @@ -971,9 +971,9 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ public boolean isAddToUpdate(BeanProperty prop) { if (requestUpdateAllLoadedProps) { - return intercept.isLoadedProperty(prop.getPropertyIndex()); + return intercept.isLoadedProperty(prop.propertyIndex()); } else { - return intercept.isDirtyProperty(prop.getPropertyIndex()); + return intercept.isDirtyProperty(prop.propertyIndex()); } } @@ -1154,9 +1154,9 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } else { key = intercept.getDirtyPropertyKey(); } - BeanProperty versionProperty = beanDescriptor.getVersionProperty(); + BeanProperty versionProperty = beanDescriptor.versionProperty(); if (versionProperty != null) { - if (intercept.isLoadedProperty(versionProperty.getPropertyIndex())) { + if (intercept.isLoadedProperty(versionProperty.propertyIndex())) { key.append('v'); } } @@ -1170,7 +1170,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return the table to update depending if the request is a 'publish' one or normal. */ public String updateTable() { - return publish ? beanDescriptor.baseTable() : beanDescriptor.getDraftTable(); + return publish ? beanDescriptor.baseTable() : beanDescriptor.draftTable(); } /** @@ -1377,7 +1377,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Return the SQL used to fetch the last inserted id value. */ public String getSelectLastInsertedId() { - return beanDescriptor.getSelectLastInsertedId(publish); + return beanDescriptor.selectLastInsertedId(publish); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java index 37a73536b..8b2fbe7bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java @@ -13,7 +13,7 @@ final class AssocOneHelpRefExported extends AssocOneHelp { AssocOneHelpRefExported(BeanPropertyAssocOne property) { super(property); this.softDelete = property.targetDescriptor.isSoftDelete(); - this.softDeletePredicate = (softDelete) ? property.targetDescriptor.getSoftDeletePredicate("") : null; + this.softDeletePredicate = (softDelete) ? property.targetDescriptor.softDeletePredicate("") : null; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java index 6bc473db6..817f4e1de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java @@ -17,7 +17,7 @@ abstract class BaseCollectionHelp implements BeanCollectionHelp { BaseCollectionHelp(BeanPropertyAssocMany many) { this.many = many; - this.targetDescriptor = many.getTargetDescriptor(); + this.targetDescriptor = many.targetDescriptor(); this.propertyName = many.name(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java index 69dfcf2b9..66b3faa45 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java @@ -54,7 +54,7 @@ final class BeanChangeJson implements BeanDiffVisitor { public void visitPush(int position) { stack.push(descriptor); BeanPropertyAssocOne embedded = (BeanPropertyAssocOne)descriptor.propertiesIndex[position]; - descriptor = embedded.getTargetDescriptor(); + descriptor = embedded.targetDescriptor(); newJson.writeStartObject(embedded.name()); if (oldJson != null) { oldJson.writeStartObject(embedded.name()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index 209767fc6..c0ce6c264 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -22,7 +22,7 @@ public final class BeanCollectionHelpFactory { */ public static BeanCollectionHelp create(BeanPropertyAssocMany many) { boolean elementCollection = many.isElementCollection(); - ManyType manyType = many.getManyType(); + ManyType manyType = many.manyType(); switch (manyType) { case LIST: return elementCollection ? new BeanListHelpElement<>(many) : new BeanListHelp<>(many); @@ -45,7 +45,7 @@ public final class BeanCollectionHelpFactory { } else if (manyType == SpiQuery.Type.MAP) { BeanDescriptor target = request.descriptor(); - ElPropertyValue elProperty = target.getElGetValue(request.query().getMapKey()); + ElPropertyValue elProperty = target.elGetValue(request.query().getMapKey()); return new BeanMapQueryHelp<>(elProperty); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 37e9e4bb3..5a809be00 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -452,7 +452,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the DatabaseConfig. */ - public DatabaseConfig getConfig() { + public DatabaseConfig config() { return owner.getConfig(); } @@ -470,7 +470,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the EbeanServer instance that owns this BeanDescriptor. */ - public SpiEbeanServer getEbeanServer() { + public SpiEbeanServer ebeanServer() { return ebeanServer; } @@ -492,11 +492,11 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the type of this domain object. */ - public EntityType getEntityType() { + public EntityType entityType() { return entityType; } - private String[] getProperties() { + private String[] properties() { return properties; } @@ -545,7 +545,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { for (BeanPropertyAssocMany manyToMany : propertiesManyToMany) { // register associated history table for M2M intersection if (!manyToMany.isExcludedFromHistory()) { - TableJoin intersectionTableJoin = manyToMany.getIntersectionTableJoin(); + TableJoin intersectionTableJoin = manyToMany.intersectionTableJoin(); initContext.addHistoryIntersection(intersectionTableJoin.getTable()); } } @@ -570,8 +570,8 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { whereIdInSql = " where " + idBinderInLHSSqlNoAlias + " "; deleteByIdInSql = "delete from " + baseTable + whereIdInSql; if (softDelete) { - softDeleteByIdSql = "update " + baseTable + " set " + getSoftDeleteDbSet() + " where " + idEqualsSql; - softDeleteByIdInSql = "update " + baseTable + " set " + getSoftDeleteDbSet() + " where " + idBinderInLHSSqlNoAlias + " "; + softDeleteByIdSql = "update " + baseTable + " set " + softDeleteDbSet() + " where " + idEqualsSql; + softDeleteByIdInSql = "update " + baseTable + " set " + softDeleteDbSet() + " where " + idBinderInLHSSqlNoAlias + " "; } else { softDeleteByIdSql = null; softDeleteByIdInSql = null; @@ -584,7 +584,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (naturalKey != null && naturalKey.length != 0) { BeanProperty[] props = new BeanProperty[naturalKey.length]; for (int i = 0; i < naturalKey.length; i++) { - props[i] = getBeanProperty(naturalKey[i]); + props[i] = beanProperty(naturalKey[i]); } this.beanNaturalKey = new BeanNaturalKey(naturalKey, props); } @@ -601,7 +601,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { boolean hasCircularImportedIdTo(BeanDescriptor sourceDesc) { for (BeanPropertyAssocOne assocOne : propertiesOneImportedSave) { - if (assocOne.getTargetDescriptor() == sourceDesc) { + if (assocOne.targetDescriptor() == sourceDesc) { return true; } } @@ -731,10 +731,10 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { EntityBeanIntercept fromEbi = bean._ebean_getIntercept(); EntityBeanIntercept toEbi = existing._ebean_getIntercept(); int propertyLength = toEbi.getPropertyLength(); - String[] names = getProperties(); + String[] names = properties(); for (int i = 0; i < propertyLength; i++) { if (fromEbi.isLoadedProperty(i)) { - BeanProperty property = getBeanProperty(names[i]); + BeanProperty property = beanProperty(names[i]); if (!toEbi.isLoadedProperty(i)) { Object val = property.getValue(bean); property.setValue(existing, val); @@ -758,14 +758,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the ReadAuditLogger for logging read audit events. */ - public ReadAuditLogger getReadAuditLogger() { + public ReadAuditLogger readAuditLogger() { return ebeanServer.getReadAuditLogger(); } /** * Return the ReadAuditPrepare for preparing read audit events prior to logging. */ - private ReadAuditPrepare getReadAuditPrepare() { + private ReadAuditPrepare readAuditPrepare() { return ebeanServer.getReadAuditPrepare(); } @@ -776,7 +776,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return true if this request should be included in the change log. */ - public BeanChange getChangeLogBean(PersistRequestBean request) { + public BeanChange changeLogBean(PersistRequestBean request) { switch (request.type()) { case INSERT: return changeLogFilter.includeInsert(request) ? insertBeanChange(request) : null; @@ -869,14 +869,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the "where id in" sql (for use with UpdateQuery). */ - public String getWhereIdInSql() { + public String whereIdInSql() { return whereIdInSql; } /** * Return the "delete by id" sql. */ - public String getDeleteByIdInSql() { + public String deleteByIdInSql() { return deleteByIdInSql; } @@ -927,32 +927,32 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the cache options. */ - public CacheOptions getCacheOptions() { + public CacheOptions cacheOptions() { return cacheHelp.getCacheOptions(); } /** * Return the Encrypt key given the BeanProperty. */ - public EncryptKey getEncryptKey(BeanProperty p) { + public EncryptKey encryptKey(BeanProperty p) { return owner.getEncryptKey(baseTable, p.dbColumn()); } /** * Return the Encrypt key given the table and column name. */ - public EncryptKey getEncryptKey(String tableName, String columnName) { + public EncryptKey encryptKey(String tableName, String columnName) { return owner.getEncryptKey(tableName, columnName); } /** * Return the Scalar type for the given JDBC type. */ - public ScalarType getScalarType(int jdbcType) { + public ScalarType scalarType(int jdbcType) { return owner.getScalarType(jdbcType); } - public ScalarType getScalarType(String cast) { + public ScalarType scalarType(String cast) { return owner.getScalarType(cast); } @@ -967,7 +967,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the default select clause. */ - public String getDefaultSelectClause() { + public String defaultSelectClause() { return defaultSelectClause; } @@ -1075,14 +1075,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the named ORM query. */ - public String getNamedQuery(String name) { + public String namedQuery(String name) { return namedQuery.get(name); } /** * Return the named RawSql query. */ - public SpiRawSql getNamedRawSql(String named) { + public SpiRawSql namedRawSql(String named) { return namedRawSql.get(named); } @@ -1090,7 +1090,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the type of DocStoreMode that should occur for this type of persist request * given the transactions requested mode. */ - public DocStoreMode getDocStoreMode(PersistRequest.Type persistType, DocStoreMode txnMode) { + public DocStoreMode docStoreMode(PersistRequest.Type persistType, DocStoreMode txnMode) { return docStoreAdapter.getMode(persistType, txnMode); } @@ -1127,7 +1127,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the draft dirty boolean property or null if there is not one assigned to this bean type. */ - BeanProperty getDraftDirty() { + BeanProperty draftDirty() { return draftDirty; } @@ -1149,7 +1149,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the natural key. */ - public BeanNaturalKey getNaturalKey() { + public BeanNaturalKey naturalKey() { return beanNaturalKey; } @@ -1421,13 +1421,13 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Write a bean read to the read audit log. */ public void readAuditBean(String queryKey, String bindLog, Object bean) { - ReadEvent event = new ReadEvent(fullName, queryKey, bindLog, getIdForJson(bean)); + ReadEvent event = new ReadEvent(fullName, queryKey, bindLog, idForJson(bean)); readAuditPrepare(event); - getReadAuditLogger().auditBean(event); + readAuditLogger().auditBean(event); } private void readAuditPrepare(ReadEvent event) { - ReadAuditPrepare prepare = getReadAuditPrepare(); + ReadAuditPrepare prepare = readAuditPrepare(); if (prepare != null) { prepare.prepare(event); } @@ -1439,7 +1439,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public void readAuditMany(String queryKey, String bindLog, List ids) { ReadEvent event = new ReadEvent(fullName, queryKey, bindLog, ids); readAuditPrepare(event); - getReadAuditLogger().auditMany(event); + readAuditLogger().auditMany(event); } /** @@ -1447,13 +1447,13 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ public void readAuditFutureMany(ReadEvent event) { // this has already been prepared (in foreground thread) - getReadAuditLogger().auditMany(event); + readAuditLogger().auditMany(event); } /** * Return the base table alias. This is always the first letter of the bean name. */ - public String getBaseTableAlias() { + public String baseTableAlias() { return baseTableAlias; } @@ -1530,32 +1530,32 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } } - public CQueryPlan getQueryPlan(CQueryPlanKey key) { + public CQueryPlan queryPlan(CQueryPlanKey key) { return queryPlanCache.get(key); } - public void putQueryPlan(CQueryPlanKey key, CQueryPlan plan) { + public void queryPlan(CQueryPlanKey key, CQueryPlan plan) { queryPlanCache.put(key, plan); } /** * Get a UpdatePlan for a given hash. */ - public SpiUpdatePlan getUpdatePlan(String key) { + public SpiUpdatePlan updatePlan(String key) { return updatePlanCache.get(key); } /** * Add a UpdatePlan to the cache with a given hash. */ - public void putUpdatePlan(String key, SpiUpdatePlan plan) { + public void updatePlan(String key, SpiUpdatePlan plan) { updatePlanCache.put(key, plan); } /** * Return a Sql update statement to set the importedId value (deferred execution). */ - public String getUpdateImportedIdSql(ImportedId prop) { + public String updateImportedIdSql(ImportedId prop) { return "update " + baseTable + " set " + prop.importedIdClause() + " where " + idBinder.getBindIdSql(null); } @@ -1636,7 +1636,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the many property included in the query or null if one is not. */ - public BeanPropertyAssocMany getManyProperty(SpiQuery query) { + public BeanPropertyAssocMany manyProperty(SpiQuery query) { OrmQueryDetail detail = query.getDetail(); for (BeanPropertyAssocMany many : propertiesMany) { if (detail.includesPath(many.name())) { @@ -1649,7 +1649,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return a raw expression for 'where parent id in ...' clause. */ - String getParentIdInExpr(int parentIdSize, String rawWhere) { + String parentIdInExpr(int parentIdSize, String rawWhere) { String inClause = idBinder.getIdInValueExpr(false, parentIdSize); return idBinder.isIdInExpandedForm() ? inClause : rawWhere + inClause; } @@ -1658,7 +1658,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the IdBinder which is helpful for handling the various types of Id. */ @Override - public IdBinder getIdBinder() { + public IdBinder idBinder() { return idBinder; } @@ -1699,7 +1699,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the sql for binding an id. This is the columns with table alias that * make up the id. */ - public String getIdBinderIdSql(String alias) { + public String idBinderIdSql(String alias) { if (alias == null) { return idBinderIdSql; } else { @@ -1710,7 +1710,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the sql for binding id's using an IN clause. */ - public String getIdBinderInLHSSql() { + public String idBinderInLHSSql() { return idBinderInLHSSql; } @@ -1728,7 +1728,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { *

    * This 'flattens' any EmbeddedId or multiple Id property cases. */ - public Object[] getBindIdValues(Object idValue) { + public Object[] bindIdValues(Object idValue) { return idBinder.getBindValues(idValue); } @@ -1904,7 +1904,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (assocProp == null) { throw new IllegalStateException("Unknown property path [" + split[0] + "] from[" + path + "]"); } - BeanDescriptor targetDesc = assocProp.getTargetDescriptor(); + BeanDescriptor targetDesc = assocProp.targetDescriptor(); path = split[1]; other = targetDesc; } @@ -1912,13 +1912,13 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public BeanType beanTypeAtPath(String path) { - return getBeanDescriptor(path); + return descriptor(path); } /** * Return the BeanDescriptor for a given path of Associated One or Many beans. */ - public BeanDescriptor getBeanDescriptor(String path) { + public BeanDescriptor descriptor(String path) { BeanDescriptor result = this; while (true) { if (path == null) { @@ -1929,7 +1929,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc assocProp = (BeanPropertyAssoc) beanProperty; path = splitBegin[1]; - result = assocProp.getTargetDescriptor(); + result = assocProp.targetDescriptor(); } else { throw new PersistenceException("Invalid path " + path + " from " + result.fullName()); } @@ -1939,7 +1939,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the BeanDescriptor of another bean type. */ - public BeanDescriptor getBeanDescriptor(Class otherType) { + public BeanDescriptor descriptor(Class otherType) { return owner.getBeanDescriptor(otherType); } @@ -1953,7 +1953,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the order column property. */ - public BeanProperty getOrderColumn() { + public BeanProperty orderColumn() { return orderColumn; } @@ -1964,7 +1964,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * relationships we have this 'shadow' property which is not externally * visible. */ - public BeanPropertyAssocOne getUnidirectional() { + public BeanPropertyAssocOne unidirectional() { BeanDescriptor other = this; while (true) { if (other.unidirectional != null) { @@ -1991,7 +1991,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return bean class name. */ - public String getDescriptorId() { + public String descriptorId() { return fullName; } @@ -2028,7 +2028,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the simple name of the entity bean. */ - public String getSimpleName() { + public String simpleName() { return beanType.getSimpleName(); } @@ -2093,7 +2093,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the Id property name or null if no Id property exists. */ - public String getIdName() { + public String idName() { return (idProperty == null) ? null : idProperty.name(); } @@ -2136,7 +2136,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { *

    * The usage is to provide simple id types for JSON processing (for embeddedId's). */ - public Object getIdForJson(Object bean) { + public Object idForJson(Object bean) { return idBinder.getIdForJson((EntityBean) bean); } @@ -2153,7 +2153,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the default order by that may need to be added if a many property is * included in the query. */ - public String getDefaultOrderBy() { + public String defaultOrderBy() { return idBinder.getDefaultOrderBy(); } @@ -2197,15 +2197,15 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Get a BeanProperty by its name. */ - public BeanProperty getBeanProperty(String propName) { + public BeanProperty beanProperty(String propName) { return propMap.get(propName); } public void sort(List list, String sortByClause) { - list.sort(getElComparator(sortByClause)); + list.sort(elComparator(sortByClause)); } - public ElComparator getElComparator(String propNameOrSortBy) { + public ElComparator elComparator(String propNameOrSortBy) { return comparatorCache.computeIfAbsent(propNameOrSortBy, this::createComparator); } @@ -2217,7 +2217,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public void lazyLoadRegister(String prefix, EntityBeanIntercept ebi, EntityBean bean, LoadContext loadContext) { // load the List/Set/Map proxy objects (deferred fetching of lists) for (BeanPropertyAssocMany many : propertiesMany()) { - if (!ebi.isLoadedProperty(many.getPropertyIndex())) { + if (!ebi.isLoadedProperty(many.propertyIndex())) { BeanCollection ref = many.createReferenceIfNull(bean); if (ref != null && !ref.isRegisteredWithLoadContext()) { String path = SplitName.add(prefix, many.name()); @@ -2301,7 +2301,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } private ElComparator createPropertyComparator(SortByClause.Property sortProp) { - ElPropertyValue elGetValue = getElGetValue(sortProp.getName()); + ElPropertyValue elGetValue = elGetValue(sortProp.getName()); if (elGetValue == null) { logger.error("Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort."); return new ElComparatorNoop<>(); @@ -2320,7 +2320,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public boolean isValidExpression(String propertyName) { try { - return (getElGetValue(propertyName) != null); + return (elGetValue(propertyName) != null); } catch (PersistenceException e) { return false; } @@ -2329,7 +2329,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Get an Expression language Value object. */ - public ElPropertyValue getElGetValue(String propName) { + public ElPropertyValue elGetValue(String propName) { ElPropertyValue elGetValue = elCache.get(propName); if (elGetValue != null) { return elGetValue; @@ -2343,7 +2343,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public ExpressionPath expressionPath(String path) { - return getElGetValue(path); + return elGetValue(path); } /** @@ -2351,7 +2351,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { *

    * The foreign key shortcuts means we can avoid unnecessary joins. */ - public ElPropertyDeploy getElPropertyDeploy(String propName) { + public ElPropertyDeploy elPropertyDeploy(String propName) { ElPropertyDeploy elProp = elDeployCache.get(propName); if (elProp != null) { return elProp; @@ -2359,7 +2359,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (!propName.contains(".")) { // No period means simple property and no need to look for // foreign key properties (in order to avoid an extra join) - elProp = getElGetValue(propName); + elProp = elGetValue(propName); } else { elProp = buildElGetValue(propName, null, true); } @@ -2414,7 +2414,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { assocProperty = tablePath.get(schemaName + "." + tableName); } if (assocProperty != null) { - String relativePath = assocProperty.getTargetDescriptor().findBeanPath(schemaName, tableName, columnName); + String relativePath = assocProperty.targetDescriptor().findBeanPath(schemaName, tableName, columnName); if (relativePath != null) { return SplitName.add(assocProperty.name(), relativePath); } @@ -2510,7 +2510,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * of bean is not involved in any ORM inheritance mapping. */ @Override - public InheritInfo getInheritInfo() { + public InheritInfo inheritInfo() { return inheritInfo; } @@ -2527,7 +2527,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the discriminator value for this bean type (or null when there is no inheritance). */ - public String getDiscValue() { + public String discValue() { return inheritInfo == null ? null : inheritInfo.getDiscriminatorStringValue(); } @@ -2554,7 +2554,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the compound unique constraints. */ - public IndexDefinition[] getIndexDefinitions() { + public IndexDefinition[] indexDefinitions() { return indexDefinitions; } @@ -2569,7 +2569,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the beanFinder (Migrate over to getFindController). */ - public BeanFindController getBeanFinder() { + public BeanFindController beanFinder() { return beanFinder; } @@ -2676,7 +2676,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the DB comment for the base table. */ - public String getDbComment() { + public String dbComment() { return dbComment; } @@ -2690,21 +2690,21 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the partition details of the bean. */ - public PartitionMeta getPartitionMeta() { + public PartitionMeta partitionMeta() { return partitionMeta; } /** * Return the storage engine. */ - public String getStorageEngine() { + public String storageEngine() { return storageEngine; } /** * Return the dependent tables for a view based entity. */ - public String[] getDependentTables() { + public String[] dependentTables() { return dependentTables; } @@ -2727,7 +2727,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the base table to use given the query temporal mode. */ @Override - public String getBaseTable(SpiQuery.TemporalMode mode) { + public String baseTable(SpiQuery.TemporalMode mode) { switch (mode) { case DRAFT: return draftTable; @@ -2743,7 +2743,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the associated draft table. */ - public String getDraftTable() { + public String draftTable() { return draftTable; } @@ -2759,17 +2759,17 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return softDelete; } - public void setSoftDeleteValue(EntityBean bean) { + public void softDeleteValue(EntityBean bean) { softDeleteProperty.setSoftDeleteValue(bean); } - String getSoftDeleteDbSet() { - return softDeleteProperty.getSoftDeleteDbSet(); + String softDeleteDbSet() { + return softDeleteProperty.softDeleteDbSet(); } @Override - public String getSoftDeletePredicate(String tableAlias) { - return softDeleteProperty.getSoftDeleteDbPredicate(tableAlias); + public String softDeletePredicate(String tableAlias) { + return softDeleteProperty.softDeleteDbPredicate(tableAlias); } @Override @@ -2779,7 +2779,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { logger.info("(Lazy) loading unsuccessful for type:{} id:{} - expecting when bean has been deleted", name(), id); bean._ebean_getIntercept().setLazyLoadFailure(id); } else { - setSoftDeleteValue(bean); + softDeleteValue(bean); bean._ebean_getIntercept().setLoaded(); setAllLoaded(bean); } @@ -2801,7 +2801,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public boolean isEmbeddedPath(String propertyPath) { - ElPropertyDeploy elProp = getElPropertyDeploy(propertyPath); + ElPropertyDeploy elProp = elPropertyDeploy(propertyPath); if (elProp == null) { throw new PersistenceException("Invalid path " + propertyPath + " from " + fullName()); } @@ -2810,7 +2810,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public ExtraJoin extraJoin(String propertyPath) { - ElPropertyValue elGetValue = getElGetValue(propertyPath); + ElPropertyValue elGetValue = elGetValue(propertyPath); if (elGetValue != null) { BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { @@ -2825,7 +2825,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public void inheritanceLoad(SqlBeanLoad sqlBeanLoad, STreeProperty property, DbReadContext ctx) { - BeanProperty p = getBeanProperty(property.name()); + BeanProperty p = beanProperty(property.name()); if (p != null) { p.load(sqlBeanLoad); } else { @@ -2874,7 +2874,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public boolean isToManyDirty(EntityBean bean) { final EntityBeanIntercept ebi = bean._ebean_getIntercept(); for (BeanPropertyAssocMany many : propertiesManySave) { - if (ebi.isLoadedProperty(many.getPropertyIndex())) { + if (ebi.isLoadedProperty(many.propertyIndex())) { final BeanCollection value = (BeanCollection) many.getValue(bean); if (value != null && value.hasModifications()) { return true; @@ -2902,7 +2902,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (draftDirty != null) { // check to see if the dirty property has already // been set and if so do not set the value - if (!entityBean._ebean_getIntercept().isChangedProperty(draftDirty.getPropertyIndex())) { + if (!entityBean._ebean_getIntercept().isChangedProperty(draftDirty.propertyIndex())) { draftDirty.setValueIntercept(entityBean, value); } } @@ -2952,7 +2952,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return idGeneratedValue; } - public IdentityMode getIdentityMode() { + public IdentityMode identityMode() { return identityMode; } @@ -2962,7 +2962,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * This is only used with Identity columns and getGeneratedKeys is not * supported. */ - public String getSelectLastInsertedId(boolean publish) { + public String selectLastInsertedId(boolean publish) { return publish ? selectLastInsertedId : selectLastInsertedIdDraft; } @@ -3045,7 +3045,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } } - public TableJoin getPrimaryKeyJoin() { + public TableJoin primaryKeyJoin() { return primaryKeyJoin; } @@ -3124,7 +3124,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { */ public void checkMutableProperties(EntityBeanIntercept ebi) { for (BeanProperty beanProperty : propertiesMutable) { - int propertyIndex = beanProperty.getPropertyIndex(); + int propertyIndex = beanProperty.propertyIndex(); if (ebi.isLoadedProperty(propertyIndex)) { Object value = beanProperty.getValue(ebi.getOwner()); if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) { @@ -3136,7 +3136,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } } - public ConcurrencyMode getConcurrencyMode(EntityBeanIntercept ebi) { + public ConcurrencyMode concurrencyMode(EntityBeanIntercept ebi) { if (!hasVersionProperty(ebi)) { return ConcurrencyMode.NONE; } else { @@ -3287,7 +3287,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { *

    * Note that this DOES NOT find a version property on an embedded bean. */ - public BeanProperty getVersionProperty() { + public BeanProperty versionProperty() { return versionProperty; } @@ -3301,7 +3301,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return the tenant property when multi-tenant partitioning support is used. */ - public BeanProperty getTenantProperty() { + public BeanProperty tenantProperty() { return tenant; } @@ -3377,14 +3377,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return jsonHelp.jsonRead(jsonRead, path, false); } - public List getUniqueProps() { + public List uniqueProps() { return propertiesUnique; } @Override public List> inheritanceChildren() { if (hasInheritance()) { - return getInheritInfo().getChildren() + return inheritInfo().getChildren() .stream() .map(InheritInfo::desc) .collect(Collectors.toList()); @@ -3395,13 +3395,13 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { @Override public BeanType inheritanceParent() { - return getInheritInfo() == null ? null : getInheritInfo().getParent().desc(); + return inheritInfo() == null ? null : inheritInfo().getParent().desc(); } @Override public void visitAllInheritanceChildren(Consumer> visitor) { if (hasInheritance()) { - getInheritInfo().visitChildren(info -> visitor.accept(info.desc())); + inheritInfo().visitChildren(info -> visitor.accept(info.desc())); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 4e6333203..66ea0ffef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -290,7 +290,7 @@ final class BeanDescriptorCacheHelp { EntityBean ownerBean = bc.getOwnerBean(); EntityBeanIntercept ebi = ownerBean._ebean_getIntercept(); PersistenceContext persistenceContext = ebi.getPersistenceContext(); - BeanDescriptor targetDescriptor = many.getTargetDescriptor(); + BeanDescriptor targetDescriptor = many.targetDescriptor(); List idList = entry.getIdList(); bc.checkEmptyLazyLoad(); @@ -349,7 +349,7 @@ final class BeanDescriptorCacheHelp { return null; } - BeanDescriptor targetDescriptor = many.getTargetDescriptor(); + BeanDescriptor targetDescriptor = many.targetDescriptor(); List idList = new ArrayList<>(actualDetails.size()); for (Object bean : actualDetails) { idList.add(targetDescriptor.id(bean)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java index 07482486d..f11a921c7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java @@ -19,7 +19,7 @@ final class BeanDescriptorDraftHelp { BeanDescriptorDraftHelp(BeanDescriptor desc) { this.desc = desc; - this.draftDirty = desc.getDraftDirty(); + this.draftDirty = desc.draftDirty(); this.resetProperties = resetProperties(); } @@ -74,7 +74,7 @@ final class BeanDescriptorDraftHelp { prop.publish(draft, live); } for (BeanPropertyAssocMany many : desc.propertiesMany()) { - if (many.getTargetDescriptor().isDraftable()) { + if (many.targetDescriptor().isDraftable()) { many.publishMany(draft, live); } } @@ -86,12 +86,12 @@ final class BeanDescriptorDraftHelp { */ void draftQueryOptimise(Query query) { for (BeanPropertyAssocOne anOne : desc.propertiesOne()) { - if (anOne.getTargetDescriptor().isDraftableElement()) { + if (anOne.targetDescriptor().isDraftableElement()) { query.fetch(anOne.name()); } } for (BeanPropertyAssocMany aMany : desc.propertiesMany()) { - if (aMany.getTargetDescriptor().isDraftableElement()) { + if (aMany.targetDescriptor().isDraftableElement()) { query.fetch(aMany.name()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java index ccc22836f..c69fbb265 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java @@ -35,7 +35,7 @@ abstract class BeanDescriptorElement extends BeanDescriptor { } @Override - public String getSimpleName() { + public String simpleName() { return simpleName; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java index 6758d4b09..5c620fd73 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java @@ -42,7 +42,7 @@ class BeanDescriptorElementEmbedded extends BeanDescriptorElement { @Override public void initialiseOther(BeanDescriptorInitContext initContext) { super.initialiseOther(initContext); - this.targetDescriptor = embeddedProperty.getTargetDescriptor(); + this.targetDescriptor = embeddedProperty.targetDescriptor(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index 50076db15..5abb988c7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -57,7 +57,7 @@ final class BeanDescriptorJsonHelp { // render the dirty properties BeanProperty[] props = desc.propertiesNonTransient(); for (BeanProperty prop : props) { - if (dirtyProps[prop.getPropertyIndex()]) { + if (dirtyProps[prop.propertyIndex()]) { prop.jsonWrite(writeJson, bean); } } @@ -123,7 +123,7 @@ final class BeanDescriptorJsonHelp { JsonToken event = parser.nextToken(); if (JsonToken.FIELD_NAME == event) { String key = parser.getCurrentName(); - BeanProperty p = desc.getBeanProperty(key); + BeanProperty p = desc.beanProperty(key); if (p != null) { p.jsonRead(readJson, bean); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 41d5157d8..88b0d95e8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -439,10 +439,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy List> list = tableToDescMap.computeIfAbsent(baseTable, k -> new ArrayList<>(1)); list.add(desc); } - if (desc.getEntityType() == EntityType.VIEW && desc.isQueryCaching()) { + if (desc.entityType() == EntityType.VIEW && desc.isQueryCaching()) { // build map of tables to view entities dependent on those tables // for the purpose of invalidating appropriate query caches - String[] dependentTables = desc.getDependentTables(); + String[] dependentTables = desc.dependentTables(); if (dependentTables != null && dependentTables.length > 0) { for (String depTable : dependentTables) { depTable = depTable.toLowerCase(); @@ -515,7 +515,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } private void checkForValidEmbeddedId(BeanDescriptor d) { - IdBinder idBinder = d.getIdBinder(); + IdBinder idBinder = d.idBinder(); if (idBinder instanceof IdBinderEmbedded) { IdBinderEmbedded embId = (IdBinderEmbedded) idBinder; BeanDescriptor idBeanDescriptor = embId.getIdBeanDescriptor(); @@ -603,7 +603,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } for (BeanPropertyAssocMany many : desc.propertiesMany()) { if (many.isElementCollection()) { - elementDescriptors.add(many.getElementDescriptor()); + elementDescriptors.add(many.elementDescriptor()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index d99d58444..70a3f5061 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -58,15 +58,15 @@ final class BeanEmbeddedMetaFactory { } private static int dbLength(Column override, BeanProperty source) { - return (override != null && (override.length() != 255)) ? override.length() : source.getDbLength(); + return (override != null && (override.length() != 255)) ? override.length() : source.dbLength(); } private static int dbScale(Column override, BeanProperty source) { - return (override != null && (override.scale() != 0)) ? override.scale() : source.getDbScale(); + return (override != null && (override.scale() != 0)) ? override.scale() : source.dbScale(); } private static String getDbColumnDefn(Column override, BeanProperty source) { - return (override != null && !override.columnDefinition().isEmpty()) ? override.columnDefinition() : source.getDbColumnDefn(); + return (override != null && !override.columnDefinition().isEmpty()) ? override.columnDefinition() : source.dbColumnDefn(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java index 64cd91494..5696e9b19 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java @@ -50,7 +50,7 @@ public class BeanListHelp extends BaseCollectionHelp { public BeanCollection createEmpty(EntityBean parentBean) { BeanList beanList = new BeanList<>(loader, parentBean, propertyName); if (many != null) { - beanList.setModifyListening(many.getModifyListenMode()); + beanList.setModifyListening(many.modifyListenMode()); } return beanList; } @@ -59,7 +59,7 @@ public class BeanListHelp extends BaseCollectionHelp { public BeanCollection createReference(EntityBean parentBean) { BeanList beanList = new BeanList<>(loader, parentBean, propertyName); - beanList.setModifyListening(many.getModifyListenMode()); + beanList.setModifyListening(many.modifyListenMode()); return beanList; } @@ -77,7 +77,7 @@ public class BeanListHelp extends BaseCollectionHelp { List currentList = (List) many.getValue(parentBean); - newBeanList.setModifyListening(many.getModifyListenMode()); + newBeanList.setModifyListening(many.modifyListenMode()); if (currentList == null) { // the currentList is null? Not really expecting this... @@ -87,7 +87,7 @@ public class BeanListHelp extends BaseCollectionHelp { // normally this case, replace just the underlying list BeanList currentBeanList = (BeanList) currentList; currentBeanList.setActualList(newBeanList.getActualList()); - currentBeanList.setModifyListening(many.getModifyListenMode()); + currentBeanList.setModifyListening(many.modifyListenMode()); } else { // replace the entire list with the BeanList diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index 026b20f01..d2cec7d13 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -29,9 +29,9 @@ public class BeanMapHelp extends BaseCollectionHelp { */ BeanMapHelp(BeanPropertyAssocMany many) { this.many = many; - this.targetDescriptor = many.getTargetDescriptor(); + this.targetDescriptor = many.targetDescriptor(); this.propertyName = many.name(); - this.beanProperty = targetDescriptor.getBeanProperty(many.getMapKey()); + this.beanProperty = targetDescriptor.beanProperty(many.mapKey()); } @Override @@ -39,9 +39,9 @@ public class BeanMapHelp extends BaseCollectionHelp { public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) { if (mapKey == null) { - mapKey = many.getMapKey(); + mapKey = many.mapKey(); } - BeanProperty beanProp = targetDescriptor.getBeanProperty(mapKey); + BeanProperty beanProp = targetDescriptor.beanProperty(mapKey); if (bc instanceof BeanMap) { BeanMap bm = (BeanMap) bc; @@ -85,7 +85,7 @@ public class BeanMapHelp extends BaseCollectionHelp { BeanMap beanMap = new BeanMap<>(loader, ownerBean, propertyName); if (many != null) { - beanMap.setModifyListening(many.getModifyListenMode()); + beanMap.setModifyListening(many.modifyListenMode()); } return beanMap; } @@ -108,7 +108,7 @@ public class BeanMapHelp extends BaseCollectionHelp { BeanMap beanMap = new BeanMap(loader, parentBean, propertyName); if (many != null) { - beanMap.setModifyListening(many.getModifyListenMode()); + beanMap.setModifyListening(many.modifyListenMode()); } return beanMap; } @@ -125,7 +125,7 @@ public class BeanMapHelp extends BaseCollectionHelp { BeanMap newBeanMap = (BeanMap) bc; Map current = (Map) many.getValue(parentBean); - newBeanMap.setModifyListening(many.getModifyListenMode()); + newBeanMap.setModifyListening(many.modifyListenMode()); if (current == null) { // the currentMap is null? Not really expecting this... many.setValue(parentBean, newBeanMap); @@ -134,7 +134,7 @@ public class BeanMapHelp extends BaseCollectionHelp { // normally this case, replace just the underlying list BeanMap currentBeanMap = (BeanMap) current; currentBeanMap.setActualMap(newBeanMap.getActualMap()); - currentBeanMap.setModifyListening(many.getModifyListenMode()); + currentBeanMap.setModifyListening(many.modifyListenMode()); } else { // replace the entire set diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 1a49e2a3e..31fe858ce 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -314,9 +314,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.secondaryTableJoin = source.secondaryTableJoin; this.secondaryTableJoinPrefix = source.secondaryTableJoinPrefix; this.dbComment = source.dbComment; - this.dbBind = source.getDbBind(); + this.dbBind = source.dbBind(); this.dbEncrypted = source.isDbEncrypted(); - this.dbEncryptedType = source.getDbEncryptedType(); + this.dbEncryptedType = source.dbEncryptedType(); this.dbEncryptFunction = source.dbEncryptFunction; this.dbRead = source.isDbRead(); this.dbInsertable = source.isDbInsertable(); @@ -331,14 +331,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.version = source.isVersion(); this.embedded = source.isEmbedded(); this.id = source.isId(); - this.generatedProperty = source.getGeneratedProperty(); + this.generatedProperty = source.generatedProperty(); this.getter = source.getter; this.setter = source.setter; - this.dbType = source.getDbType(true); + this.dbType = source.dbType(true); this.scalarType = source.scalarType; this.lob = isLobType(dbType); this.propertyType = source.type(); - this.field = source.getField(); + this.field = source.field(); this.docOptions = source.docOptions; this.unmappedJson = source.unmappedJson; this.elPrefix = override.replace(source.elPrefix, source.dbColumn); @@ -363,7 +363,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the order this property appears in the bean. */ - public int getDeployOrder() { + public int deployOrder() { return deployOrder; } @@ -381,7 +381,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the BeanDescriptor that owns this property. */ - public BeanDescriptor getBeanDescriptor() { + public BeanDescriptor descriptor() { return descriptor; } @@ -424,23 +424,23 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the encrypt key for the column matching this property. */ - public EncryptKey getEncryptKey() { - return descriptor.getEncryptKey(this); + public EncryptKey encryptKey() { + return descriptor.encryptKey(this); } @Override public String encryptKeyAsString() { - return getEncryptKey().getStringValue(); + return encryptKey().getStringValue(); } - public String getDecryptProperty(String propertyName) { + public String decryptProperty(String propertyName) { return dbEncryptFunction.getDecryptSql(propertyName); } /** * Return the SQL for the column including decryption function and column alias. */ - private String getDecryptSqlWithColumnAlias(String tableAlias) { + private String decryptSqlWithColumnAlias(String tableAlias) { return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.dbColumn()) + ENC_PREFIX + tableAlias + "_" + this.dbColumn(); } @@ -468,7 +468,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Returns null unless this property is using a secondary table. In that * case this returns the logical property prefix. */ - public String getSecondaryTableJoinPrefix() { + public String secondaryTableJoinPrefix() { return secondaryTableJoinPrefix; } @@ -488,7 +488,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { ctx.pushTableAlias(ctx.getRelativePrefix(secondaryTableJoinPrefix)); } if (dbEncrypted) { - ctx.appendRawColumn(getDecryptSqlWithColumnAlias(ctx.peekTableAlias())); + ctx.appendRawColumn(decryptSqlWithColumnAlias(ctx.peekTableAlias())); ctx.addEncryptedProp(this); } else { ctx.appendColumn(dbColumn); @@ -604,14 +604,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the DB literal expression to set the deleted state to true. */ - String getSoftDeleteDbSet() { + String softDeleteDbSet() { return softDeleteDbSet; } /** * Return the DB literal predicate used to filter out soft deleted rows from a query. */ - String getSoftDeleteDbPredicate(String tableAlias) { + String softDeleteDbPredicate(String tableAlias) { return tableAlias + softDeleteDbPredicate; } @@ -824,7 +824,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the position of this property in the enhanced bean. */ - public int getPropertyIndex() { + public int propertyIndex() { return propertyIndex; } @@ -961,21 +961,21 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the DB max length (varchar) or precision (decimal). */ - public int getDbLength() { + public int dbLength() { return dbLength; } /** * Return the DB scale for numeric columns. */ - public int getDbScale() { + public int dbScale() { return dbScale; } /** * Return a specific column DDL definition if specified (otherwise null). */ - public String getDbColumnDefn() { + public String dbColumnDefn() { return dbColumnDefn; } @@ -985,7 +985,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * For an Enum returns IN expression for the set of Enum values. *

    */ - public Set getDbCheckConstraintValues() { + public Set dbCheckConstraintValues() { if (scalarType instanceof ScalarTypeEnum) { return ((ScalarTypeEnum) scalarType).getDbCheckConstraintValues(); } @@ -1005,28 +1005,28 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the DB column default to use for DDL. */ - public String getDbColumnDefault() { + public String dbColumnDefault() { return dbColumnDefn != null ? null : dbColumnDefault; } /** * Return the DDL-Migration Infos */ - public List getDbMigrationInfos() { + public List dbMigrationInfos() { return dbMigrationInfos; } /** * Return the bean Field associated with this property. */ - private Field getField() { + private Field field() { return field; } /** * Return the GeneratedValue. Used to generate update timestamp etc. */ - public GeneratedProperty getGeneratedProperty() { + public GeneratedProperty generatedProperty() { return generatedProperty; } @@ -1124,7 +1124,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the comment for the associated DB column. */ - public String getDbComment() { + public String dbComment() { return dbComment; } @@ -1133,7 +1133,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * * @param platformTypes Set as false when we want logical platform agnostic types. */ - public int getDbType(boolean platformTypes) { + public int dbType(boolean platformTypes) { if (platformTypes || !(scalarType instanceof ScalarTypeLogicalType)) { return dbType; } @@ -1182,7 +1182,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return the DB bind parameter. Typically is "?" but different for * encrypted bind. */ - public String getDbBind() { + public String dbBind() { return dbBind; } @@ -1207,7 +1207,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { return dbEncrypted; } - public int getDbEncryptedType() { + public int dbEncryptedType() { return dbEncryptedType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index c88c66d15..a00942e03 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -117,10 +117,10 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } void initialiseTargetDescriptor(BeanDescriptorInitContext initContext) { - targetDescriptor = descriptor.getBeanDescriptor(targetType); + targetDescriptor = descriptor.descriptor(targetType); if (!isTransient) { - targetIdBinder = targetDescriptor.getIdBinder(); - targetInheritInfo = targetDescriptor.getInheritInfo(); + targetIdBinder = targetDescriptor.idBinder(); + targetInheritInfo = targetDescriptor.inheritInfo(); saveRecurseSkippable = targetDescriptor.isSaveRecurseSkippable(); if (!targetIdBinder.isComplexId()) { targetIdProperty = targetIdBinder.getIdProperty(); @@ -136,7 +136,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree /** * Return the extra configuration for the foreign key. */ - public PropertyForeignKey getForeignKey() { + public PropertyForeignKey foreignKey() { return foreignKey; } @@ -159,7 +159,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree */ ElPropertyValue createElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) { // associated or embedded bean - BeanDescriptor embDesc = getTargetDescriptor(); + BeanDescriptor embDesc = targetDescriptor(); if (chain == null) { chain = new ElPropertyChainBuilder(isEmbedded(), propName); } @@ -198,7 +198,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * Return the mappedBy property. * This will be null on the owning side. */ - public String getMappedBy() { + public String mappedBy() { return mappedBy; } @@ -208,19 +208,19 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * This will return null for multiple Id properties. *

    */ - public String getTargetIdProperty() { + public String targetIdProperty() { return targetIdProperty; } /** * Return the BeanDescriptor of the target. */ - public BeanDescriptor getTargetDescriptor() { + public BeanDescriptor targetDescriptor() { return targetDescriptor; } SpiEbeanServer server() { - return descriptor.getEbeanServer(); + return descriptor.ebeanServer(); } /** @@ -233,8 +233,8 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } @Override - public IdBinder getIdBinder() { - return descriptor.getIdBinder(); + public IdBinder idBinder() { + return descriptor.idBinder(); } @Override @@ -251,8 +251,8 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } @Override - public String getSoftDeletePredicate(String tableAlias) { - return targetDescriptor.getSoftDeletePredicate(tableAlias); + public String softDeletePredicate(String tableAlias) { + return targetDescriptor.softDeletePredicate(tableAlias); } /** @@ -283,7 +283,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * Return true if the unique id properties are all not null for this bean. */ public boolean hasId(EntityBean bean) { - BeanDescriptor targetDesc = getTargetDescriptor(); + BeanDescriptor targetDesc = targetDescriptor(); BeanProperty idProp = targetDesc.idProperty(); // all the unique properties are non-null return idProp == null || idProp.getValue(bean) != null; @@ -296,7 +296,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * set or map. *

    */ - public Class getTargetType() { + public Class targetType() { return targetType; } @@ -305,14 +305,14 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * to this bean type. */ @Override - public String getExtraWhere() { + public String extraWhere() { return extraWhere; } /** * Return the elastic search doc for this embedded property. */ - private String getDocStoreDoc() { + private String docStoreDoc() { return docStoreDoc; } @@ -321,7 +321,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree */ @Override public void docStoreInclude(boolean includeByDefault, DocStructure docStructure) { - String embeddedDoc = getDocStoreDoc(); + String embeddedDoc = docStoreDoc(); if (embeddedDoc == null) { // not annotated so use include by default // which is *ToOne included and *ToMany excluded @@ -399,21 +399,21 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree /** * Return the underlying BeanTable for this property. */ - public BeanTable getBeanTable() { + public BeanTable beanTable() { return beanTable; } /** * return the join to use for the bean. */ - public TableJoin getTableJoin() { + public TableJoin tableJoin() { return tableJoin; } /** * Get the persist info. */ - public BeanCascadeInfo getCascadeInfo() { + public BeanCascadeInfo cascadeInfo() { return cascadeInfo; } @@ -445,7 +445,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } else { // embedded id BeanPropertyAssocOne embProp = (BeanPropertyAssocOne) idProp; - BeanProperty[] embBaseProps = embProp.getTargetDescriptor().propertiesBaseScalar(); + BeanProperty[] embBaseProps = embProp.targetDescriptor().propertiesBaseScalar(); ImportedIdSimple[] scalars = createImportedList(owner, cols, embBaseProps, others); return new ImportedIdEmbedded(owner, embProp, scalars); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 2e8b08c02..761309045 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -175,7 +175,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ void initialisePostTarget() { if (childMasterProperty != null) { - BeanProperty masterId = childMasterProperty.getTargetDescriptor().idProperty(); + BeanProperty masterId = childMasterProperty.targetDescriptor().idProperty(); if (masterId != null) { // in docstore only, the master-id may be not available childMasterIdProperty = childMasterProperty.name() + "." + masterId.name(); } @@ -208,7 +208,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the underlying collection of beans. */ @SuppressWarnings("rawtypes") - public Collection getRawCollection(EntityBean bean) { + public Collection rawCollection(EntityBean bean) { return help.underlying(value(bean)); } @@ -375,7 +375,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * Return the mode for listening to modifications to collections for this association. */ - public ModifyListenMode getModifyListenMode() { + public ModifyListenMode modifyListenMode() { return modifyListenMode; } @@ -412,17 +412,17 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST @Override public String assocIsEmpty(SpiExpressionRequest request, String path) { boolean softDelete = targetDescriptor.isSoftDelete(); - boolean needsX2Table = softDelete || getExtraWhere() != null; + boolean needsX2Table = softDelete || extraWhere() != null; StringBuilder sb = new StringBuilder(50); SpiQuery query = request.getQueryRequest().query(); if (hasJoinTable()) { sb.append(query.isAsDraft() ? intersectionDraftTable : intersectionPublishTable); } else { - sb.append(targetDescriptor.getBaseTable(query.getTemporalMode())); + sb.append(targetDescriptor.baseTable(query.getTemporalMode())); } if (needsX2Table && hasJoinTable()) { sb.append(" x join "); - sb.append(targetDescriptor.getBaseTable(query.getTemporalMode())); + sb.append(targetDescriptor.baseTable(query.getTemporalMode())); sb.append(" x2 on "); inverseJoin.addJoin("x2", "x", sb); } else { @@ -435,17 +435,17 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } exportedProperties[i].appendWhere(sb, "x.", path); } - if (getExtraWhere() != null) { + if (extraWhere() != null) { sb.append(" and "); if (hasJoinTable()) { - sb.append(getExtraWhere().replace("${ta}", "x2").replace("${mta}", "x")); + sb.append(extraWhere().replace("${ta}", "x2").replace("${mta}", "x")); } else { - sb.append(getExtraWhere().replace("${ta}", "x")); + sb.append(extraWhere().replace("${ta}", "x")); } } if (softDelete) { String alias = hasJoinTable() ? "x2" : "x"; - sb.append(" and ").append(targetDescriptor.getSoftDeletePredicate(alias)); + sb.append(" and ").append(targetDescriptor.softDeletePredicate(alias)); } return sb.toString(); } @@ -455,7 +455,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @Override public Object[] assocIdValues(EntityBean bean) { - return targetDescriptor.getIdBinder().getIdValues(bean); + return targetDescriptor.idBinder().getIdValues(bean); } /** @@ -463,7 +463,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @Override public String assocIdExpression(String prefix, String operator) { - return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator); + return targetDescriptor.idBinder().getAssocOneIdExpr(prefix, operator); } /** @@ -471,7 +471,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @Override public String assocIdInValueExpr(boolean not, int size) { - return targetDescriptor.getIdBinder().getIdInValueExpr(not, size); + return targetDescriptor.idBinder().getIdInValueExpr(not, size); } /** @@ -479,7 +479,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ @Override public String assocIdInExpr(String prefix) { - return targetDescriptor.getIdBinder().getAssocIdInExpr(prefix); + return targetDescriptor.idBinder().getAssocIdInExpr(prefix); } @Override @@ -521,7 +521,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * Return the many type. */ - public ManyType getManyType() { + public ManyType manyType() { return manyType; } @@ -554,7 +554,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * Return the element bean descriptor (for an element collection only). */ - public BeanDescriptor getElementDescriptor() { + public BeanDescriptor elementDescriptor() { return elementDescriptor; } @@ -562,7 +562,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * ManyToMany only, join from local table to intersection table. */ @Override - public TableJoin getIntersectionTableJoin() { + public TableJoin intersectionTableJoin() { return intersectionJoin; } @@ -585,21 +585,21 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Return the order by clause used to order the fetching of the data for * this list, set or map. */ - public String getFetchOrderBy() { + public String fetchOrderBy() { return fetchOrderBy; } /** * Return the order by for use when lazy loading the associated collection. */ - public String getLazyFetchOrderBy() { + public String lazyFetchOrderBy() { return lazyFetchOrderBy; } /** * Return the default mapKey when returning a Map. */ - public String getMapKey() { + public String mapKey() { return mapKey; } @@ -631,11 +631,11 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return help.createEmpty(parentBean); } - private BeanCollectionAdd getBeanCollectionAdd(Object bc) { + private BeanCollectionAdd beanCollectionAdd(Object bc) { return help.getBeanCollectionAdd(bc, null); } - public Object getParentId(EntityBean parentBean) { + public Object parentId(EntityBean parentBean) { return descriptor.getId(parentBean); } @@ -659,7 +659,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST if (idProp != null && idProp.isEmbedded()) { BeanPropertyAssocOne one = (BeanPropertyAssocOne) idProp; try { - for (BeanProperty emId : one.getTargetDescriptor().propertiesBaseScalar()) { + for (BeanProperty emId : one.targetDescriptor().propertiesBaseScalar()) { list.add(findMatch(true, emId)); } } catch (PersistenceException e) { @@ -698,7 +698,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } // search for the property, to see if it exists Class beanType = descriptor.type(); - BeanDescriptor targetDesc = getTargetDescriptor(); + BeanDescriptor targetDesc = targetDescriptor(); for (BeanPropertyAssocOne prop : targetDesc.propertiesOne()) { if (mappedBy != null) { // match using mappedBy as property name @@ -707,7 +707,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } } else { // assume only one property that matches parent object type - if (prop.getTargetType().equals(beanType)) { + if (prop.targetType().equals(beanType)) { // found it, stop search return prop; } @@ -721,7 +721,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST */ private BeanProperty initMapKeyProperty() { // search for the property - BeanDescriptor targetDesc = getTargetDescriptor(); + BeanDescriptor targetDesc = targetDescriptor(); for (BeanProperty prop : targetDesc.propertiesAll()) { if (mapKey.equalsIgnoreCase(prop.name())) { return prop; @@ -735,7 +735,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST public IntersectionRow buildManyDeleteChildren(EntityBean parentBean, List excludeDetailIds) { IntersectionRow row = new IntersectionRow(tableJoin.getTable(), targetDescriptor); if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) { - row.setExcludeIds(excludeDetailIds, getTargetDescriptor()); + row.setExcludeIds(excludeDetailIds, targetDescriptor()); } buildExport(row, parentBean); return row; @@ -1016,7 +1016,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return elementDescriptor.jsonReadCollection(readJson, parentBean); } BeanCollection collection = createEmpty(parentBean); - BeanCollectionAdd add = getBeanCollectionAdd(collection); + BeanCollectionAdd add = beanCollectionAdd(collection); do { EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name); if (detailBean == null) { @@ -1044,7 +1044,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Returns true, if we must create a m2m join table. */ public boolean createJoinTable() { - if (hasJoinTable() && getMappedBy() == null) { + if (hasJoinTable() && mappedBy() == null) { // only create on other 'owning' side return !descriptor.isTableManaged(intersectionJoin.getTable()); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index 1aa792f30..f7ff9fe73 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -27,7 +27,7 @@ class BeanPropertyAssocManyJsonHelp { */ BeanPropertyAssocManyJsonHelp(BeanPropertyAssocMany many) { this.many = many; - boolean objectMapperPresent = many.getBeanDescriptor().getConfig().getClassLoadConfig().isJacksonObjectMapperPresent(); + boolean objectMapperPresent = many.descriptor().config().getClassLoadConfig().isJacksonObjectMapperPresent(); this.jsonTransient = !objectMapperPresent ? null : new BeanPropertyAssocManyJsonTransient(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java index cc43cb9e7..32a84d584 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java @@ -21,18 +21,18 @@ class BeanPropertyAssocManyJsonTransient { */ void jsonReadUsingObjectMapper(BeanPropertyAssocMany many, SpiJsonReader readJson, EntityBean parentBean) throws IOException { ObjectMapper mapper = readJson.getObjectMapper(); - ManyType manyType = many.getManyType(); + ManyType manyType = many.manyType(); Object value; if (manyType.isMap()) { // read map using Jackson object mapper with unknown key type TypeFactory typeFactory = mapper.getTypeFactory(); - JavaType target = typeFactory.constructType(many.getTargetType()); + JavaType target = typeFactory.constructType(many.targetType()); MapType jacksonType = typeFactory.constructMapType(LinkedHashMap.class, TypeFactory.unknownType(), target); value = mapper.readValue(readJson.getParser(), jacksonType); } else { // read list or set using Jackson object mapper - CollectionType jacksonType = mapper.getTypeFactory().constructCollectionType(manyType.getCollectionType(), many.getTargetType()); + CollectionType jacksonType = mapper.getTypeFactory().constructCollectionType(manyType.getCollectionType(), many.targetType()); value = mapper.readValue(readJson.getParser(), jacksonType); } many.setValue(parentBean, value); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java index 11fc94c4a..73caed716 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java @@ -26,7 +26,7 @@ class BeanPropertyAssocManySqlHelp { this.many = many; this.exportedProperties = exportedProperties; this.hasJoinTable = many.hasJoinTable(); - this.descriptor = many.getBeanDescriptor(); + this.descriptor = many.descriptor(); this.exportedPropertyBindProto = deriveExportedPropertyBindProto(); String delStmt; @@ -118,13 +118,13 @@ class BeanPropertyAssocManySqlHelp { query.setM2MIncludeJoin(many.inverseJoin); } String rawWhere = deriveWhereParentIdSql(true, tableAlias); - String expr = descriptor.getParentIdInExpr(parentIds.size(), rawWhere); + String expr = descriptor.parentIdInExpr(parentIds.size(), rawWhere); many.bindParentIdsIn(expr, parentIds, query); } List findIdsByParentId(Object parentId, Transaction t, List excludeDetailIds, boolean hard) { String rawWhere = deriveWhereParentIdSql(false, ""); - SpiEbeanServer server = descriptor.getEbeanServer(); + SpiEbeanServer server = descriptor.ebeanServer(); SpiQuery q = many.newQuery(server); many.bindParentIdEq(rawWhere, parentId, q); if (hard) { @@ -141,7 +141,7 @@ class BeanPropertyAssocManySqlHelp { String inClause = buildInClauseBinding(parentIds.size(), exportedPropertyBindProto); String expr = rawWhere + inClause; - SpiEbeanServer server = descriptor.getEbeanServer(); + SpiEbeanServer server = descriptor.ebeanServer(); SpiQuery q = many.newQuery(server); //Query q = server.find(propertyType); many.bindParentIdsIn(expr, parentIds, q); @@ -209,7 +209,7 @@ class BeanPropertyAssocManySqlHelp { private String buildInClauseBinding(int size, String bindProto) { if (descriptor.isSimpleId()) { - return descriptor.getIdBinder().getIdInValueExpr(false, size); + return descriptor.idBinder().getIdInValueExpr(false, size); } StringBuilder sb = new StringBuilder(10 + (size * (bindProto.length() + 1))); sb.append(" in"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index de55dbcad..f8f1c73c7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -275,7 +275,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr private List findIdsByParentIdList(List parentIds, Transaction t) { String rawWhere = deriveWhereParentIdSql(true); - String inClause = getIdBinder().getIdInValueExpr(false, parentIds.size()); + String inClause = idBinder().getIdInValueExpr(false, parentIds.size()); String expr = rawWhere + inClause; SpiEbeanServer server = server(); Query q = server.find(type()); @@ -297,7 +297,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } } else { if (targetIdProperty != null) { - BeanDescriptor target = getTargetDescriptor(); + BeanDescriptor target = targetDescriptor(); String basePath = SplitName.add(prefix, name); if (dbColumn != null) { BeanProperty idProperty = target.idProperty(); @@ -312,7 +312,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Return meta data for the deployment of the embedded bean specific to this * property. */ - public BeanProperty[] getProperties() { + public BeanProperty[] properties() { return embeddedProps; } @@ -320,7 +320,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr public void buildRawSqlSelectChain(String prefix, List selectChain) { prefix = SplitName.add(prefix, name); if (!embedded) { - InheritInfo inheritInfo = targetDescriptor.getInheritInfo(); + InheritInfo inheritInfo = targetDescriptor.inheritInfo(); if (inheritInfo != null) { // expect the discriminator column to be included in order // to determine the inheritance type so we add it to the @@ -374,7 +374,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr String nextPrefix = (prefix == null) ? name : prefix + "." + name; if (embedded) { - BeanDescriptor targetDescriptor = getTargetDescriptor(); + BeanDescriptor targetDescriptor = targetDescriptor(); targetDescriptor.diff(nextPrefix, map, (EntityBean) newEmb, (EntityBean) oldEmb); } else { @@ -382,7 +382,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr newBean = (EntityBean) newEmb; oldBean = (EntityBean) oldEmb; - BeanDescriptor targetDescriptor = getTargetDescriptor(); + BeanDescriptor targetDescriptor = targetDescriptor(); BeanProperty idProperty = targetDescriptor.idProperty(); Object newId = (newBean == null) ? null : idProperty.getValue(newBean); @@ -398,7 +398,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * represents. */ @Override - public Class getTargetType() { + public Class targetType() { return type(); } @@ -431,12 +431,12 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr private Object createCacheBeanId(Object bean) { final BeanDescriptor desc = targetDescriptor.descOf(bean.getClass()); final Object id = desc.idProperty().getCacheDataValue((EntityBean) bean); - return new CachedBeanId(desc.getDiscValue(), id); + return new CachedBeanId(desc.discValue(), id); } @Override public String format(Object value) { - return targetDescriptor.getIdBinder().cacheKey(value); + return targetDescriptor.idBinder().cacheKey(value); } @Override @@ -473,11 +473,11 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } @Override - public ScalarDataReader getIdReader() { + public ScalarDataReader idReader() { return targetDescriptor.idProperty(); } - ScalarType getIdScalarType() { + ScalarType idScalarType() { return targetDescriptor.idProperty().scalarType; } @@ -486,7 +486,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ @Override public Object[] assocIdValues(EntityBean bean) { - return targetDescriptor.getIdBinder().getIdValues(bean); + return targetDescriptor.idBinder().getIdValues(bean); } /** @@ -494,7 +494,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ @Override public String assocIdExpression(String prefix, String operator) { - return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator); + return targetDescriptor.idBinder().getAssocOneIdExpr(prefix, operator); } /** @@ -502,7 +502,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ @Override public String assocIdInValueExpr(boolean not, int size) { - return targetDescriptor.getIdBinder().getIdInValueExpr(not, size); + return targetDescriptor.idBinder().getIdInValueExpr(not, size); } /** @@ -510,7 +510,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr */ @Override public String assocIdInExpr(String prefix) { - return targetDescriptor.getIdBinder().getAssocIdInExpr(prefix); + return targetDescriptor.idBinder().getAssocIdInExpr(prefix); } @Override @@ -528,7 +528,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * value. */ public Object createEmbeddedId() { - return getTargetDescriptor().createEntityBean(); + return targetDescriptor().createEntityBean(); } @Override @@ -541,7 +541,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr return value; } - public ImportedId getImportedId() { + public ImportedId importedId() { return importedId; } @@ -569,7 +569,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr ArrayList list = new ArrayList<>(); if (idProp != null && idProp.isEmbedded()) { BeanPropertyAssocOne one = (BeanPropertyAssocOne) idProp; - BeanDescriptor targetDesc = one.getTargetDescriptor(); + BeanDescriptor targetDesc = one.targetDescriptor(); BeanProperty[] emIds = targetDesc.propertiesBaseScalar(); try { for (BeanProperty emId : emIds) { @@ -732,7 +732,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr if (value instanceof EntityBean) { if (embedded) { writeJson.writeFieldName(name); - BeanDescriptor refDesc = descriptor.getBeanDescriptor(value.getClass()); + BeanDescriptor refDesc = descriptor.descriptor(value.getClass()); refDesc.jsonWriteForInsert(writeJson, (EntityBean) value); } else { jsonWriteTargetId(writeJson, (EntityBean) value); @@ -765,7 +765,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr // Hmmm, not writing complex non-entity bean if (value instanceof EntityBean) { writeJson.beginAssocOne(name, bean); - BeanDescriptor refDesc = descriptor.getBeanDescriptor(value.getClass()); + BeanDescriptor refDesc = descriptor.descriptor(value.getClass()); refDesc.jsonWrite(writeJson, (EntityBean) value, name); writeJson.endAssocOne(); } @@ -795,7 +795,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr targetDescriptor.convertSetId(parentId, child); } if (mappedBy != null) { - BeanProperty beanProperty = targetDescriptor.getBeanProperty(mappedBy); + BeanProperty beanProperty = targetDescriptor.beanProperty(mappedBy); if (beanProperty != null && beanProperty.getValue(child) == null) { // set the 'parent' bean to the 'child' bean beanProperty.setValue(child, parent); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java index f275d0988..fd27bac16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java @@ -54,7 +54,7 @@ public class BeanSetHelp extends BaseCollectionHelp { public BeanCollection createEmpty(EntityBean ownerBean) { BeanSet beanSet = new BeanSet<>(loader, ownerBean, propertyName); if (many != null) { - beanSet.setModifyListening(many.getModifyListenMode()); + beanSet.setModifyListening(many.modifyListenMode()); } return beanSet; } @@ -62,7 +62,7 @@ public class BeanSetHelp extends BaseCollectionHelp { @Override public BeanCollection createReference(EntityBean parentBean) { BeanSet beanSet = new BeanSet<>(loader, parentBean, propertyName); - beanSet.setModifyListening(many.getModifyListenMode()); + beanSet.setModifyListening(many.modifyListenMode()); return beanSet; } @@ -76,7 +76,7 @@ public class BeanSetHelp extends BaseCollectionHelp { public void refresh(BeanCollection bc, EntityBean parentBean) { BeanSet newBeanSet = (BeanSet) bc; Set current = (Set) many.getValue(parentBean); - newBeanSet.setModifyListening(many.getModifyListenMode()); + newBeanSet.setModifyListening(many.modifyListenMode()); if (current == null) { // the currentList is null? Not really expecting this... many.setValue(parentBean, newBeanSet); @@ -85,7 +85,7 @@ public class BeanSetHelp extends BaseCollectionHelp { // normally this case, replace just the underlying list BeanSet currentBeanSet = (BeanSet) current; currentBeanSet.setActualSet(newBeanSet.getActualSet()); - currentBeanSet.setModifyListening(many.getModifyListenMode()); + currentBeanSet.setModifyListening(many.modifyListenMode()); } else { // replace the entire set diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index 4bc051ebb..8491e7fdc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -90,7 +90,7 @@ public final class BeanTable { } if (idProperty instanceof BeanPropertyAssocOne) { BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) idProperty; - BeanProperty[] props = assocOne.getProperties(); + BeanProperty[] props = assocOne.properties(); for (BeanProperty prop : props) { addToJoin(foreignKeyPrefix, join, reverse, sqlFormulaSelect, true, prop); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index a6d3650d6..a964ef1ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -56,7 +56,7 @@ public final class DeployPropertyParser extends DeployParser { @Override public String getDeployWord(String expression) { - ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); + ElPropertyDeploy elProp = beanDescriptor.elPropertyDeploy(expression); if (elProp == null) { return null; } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index 045417445..a59269eed 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java @@ -76,7 +76,7 @@ public final class DeployUpdateParser extends DeployParser { if (expression.equalsIgnoreCase(beanDescriptor.name())) { return beanDescriptor.baseTable(); } - ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); + ElPropertyDeploy elProp = beanDescriptor.elPropertyDeploy(expression); return elProp != null ? elProp.dbColumn() : null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java index b9a8f008d..2b7127d8c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java @@ -8,7 +8,7 @@ public final class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyA private final BeanPropertyAssocOne prop; DynamicPropertyAggregationFormulaMTO(BeanPropertyAssocOne prop, String name, String parsedFormula, boolean aggregate, BeanProperty asTarget, String alias) { - super(name, prop.getIdScalarType(), parsedFormula, aggregate, asTarget, alias); + super(name, prop.idScalarType(), parsedFormula, aggregate, asTarget, alias); this.prop = prop; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java index aa1ec102a..ac9aaabb5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java @@ -97,17 +97,17 @@ final class FormulaPropertyPath { STreeProperty build() { if (cast != null) { - ScalarType scalarType = descriptor.getScalarType(cast); + ScalarType scalarType = descriptor.scalarType(cast); if (scalarType == null) { throw new IllegalStateException("Unable to find scalarType for cast of [" + cast + "] on formula [" + formula + "] for type " + descriptor); } return create(scalarType); } if (isCount()) { - return create(descriptor.getScalarType(Types.BIGINT)); + return create(descriptor.scalarType(Types.BIGINT)); } if (isConcat()) { - return create(descriptor.getScalarType(Types.VARCHAR)); + return create(descriptor.scalarType(Types.VARCHAR)); } if (firstProp == null) { throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index 2985170bf..3f0c5c8cb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -80,9 +80,9 @@ public final class InheritInfo { */ public void appendCheckConstraintValues(final String propertyName, final Set checkConstraintValues) { visitChildren(inheritInfo -> { - BeanProperty prop = inheritInfo.desc().getBeanProperty(propertyName); + BeanProperty prop = inheritInfo.desc().beanProperty(propertyName); if (prop != null) { - Set values = prop.getDbCheckConstraintValues(); + Set values = prop.dbCheckConstraintValues(); if (values != null) { checkConstraintValues.addAll(values); } @@ -236,7 +236,7 @@ public final class InheritInfo { * Return the IdBinder for this type. */ public IdBinder getIdBinder() { - return descriptor.getIdBinder(); + return descriptor.idBinder(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java index 3284032bb..f5480ac77 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java @@ -72,7 +72,7 @@ public final class IntersectionRow { sb.append("delete from ").append(tableName); } else { sb.append("update ").append(tableName).append(" set "); - sb.append(targetDescriptor.getSoftDeleteDbSet()); + sb.append(targetDescriptor.softDeleteDbSet()); } sb.append(" where "); int count = setBindParams(bindParams, sb); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index b16d39184..e3b23e9fb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -40,8 +40,8 @@ public final class IdBinderEmbedded implements IdBinder { @Override public void initialise() { - this.idDesc = embIdProperty.getTargetDescriptor(); - this.props = embIdProperty.getProperties(); + this.idDesc = embIdProperty.targetDescriptor(); + this.props = embIdProperty.properties(); this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed(); } @@ -57,7 +57,7 @@ public final class IdBinderEmbedded implements IdBinder { if (i > 0) { sb.append(" and "); } - sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].dbColumn()).append("=?"); + sb.append(idDesc.baseTableAlias()).append(".").append(props[i].dbColumn()).append("=?"); } sb.append(")"); return sb.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index ab1909714..5776b7ccc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -32,11 +32,11 @@ public final class ImportedIdEmbedded implements ImportedId { @Override public void addFkeys(String name) { - BeanProperty[] embeddedProps = foreignAssocOne.getProperties(); + BeanProperty[] embeddedProps = foreignAssocOne.properties(); for (int i = 0; i < imported.length; i++) { String n = name + "." + foreignAssocOne.name() + "." + embeddedProps[i].name(); - BeanFkeyProperty fkey = new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.getDeployOrder()); - owner.getBeanDescriptor().add(fkey); + BeanFkeyProperty fkey = new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.deployOrder()); + owner.descriptor().add(fkey); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index db098cb16..df4c3272c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -88,8 +88,8 @@ public final class ImportedIdSimple implements ImportedId, Comparable list = new ArrayList<>(); for (BeanProperty prop : nonTransients) { - GeneratedProperty gen = prop.getGeneratedProperty(); + GeneratedProperty gen = prop.generatedProperty(); if (gen != null && gen.includeInInsert()) { list.add(prop); } @@ -370,7 +370,7 @@ public final class DeployBeanPropertyLists { public BeanProperty[] getGeneratedUpdate() { List list = new ArrayList<>(); for (BeanProperty prop : nonTransients) { - GeneratedProperty gen = prop.getGeneratedProperty(); + GeneratedProperty gen = prop.generatedProperty(); if (gen != null && gen.includeInUpdate()) { list.add(prop); } @@ -391,12 +391,12 @@ public final class DeployBeanPropertyLists { if (imported != prop.isOneToOneExported()) { switch (mode) { case Save: - if (prop.getCascadeInfo().isSave()) { + if (prop.cascadeInfo().isSave()) { list.add(prop); } break; case Delete: - if (prop.getCascadeInfo().isDelete()) { + if (prop.cascadeInfo().isDelete()) { list.add(prop); } break; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java index b140c2f1c..8997c8380 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java @@ -25,7 +25,7 @@ public class VisitProperties { if (idProp != null) { visit(propertyVisitor, idProp); } - BeanPropertyAssocOne unidirectional = desc.getUnidirectional(); + BeanPropertyAssocOne unidirectional = desc.unidirectional(); if (unidirectional != null) { visit(propertyVisitor, unidirectional); } @@ -51,7 +51,7 @@ public class VisitProperties { if (assocOne.isEmbedded()) { // Embedded bean pv.visitEmbedded(assocOne); - BeanProperty[] embProps = assocOne.getProperties(); + BeanProperty[] embProps = assocOne.properties(); for (BeanProperty embProp : embProps) { pv.visitEmbeddedScalar(embProp, assocOne); } @@ -73,7 +73,7 @@ public class VisitProperties { * Visit all the other inheritance properties that are not on the root. */ protected void visitInheritanceProperties(BeanDescriptor descriptor, BeanPropertyVisitor pv) { - InheritInfo inheritInfo = descriptor.getInheritInfo(); + InheritInfo inheritInfo = descriptor.inheritInfo(); if (inheritInfo != null && inheritInfo.isRoot()) { // add all properties on the children objects inheritInfo.visitChildren(new InheritChildVisitor(this, pv)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java index 470345a31..6f8aec3aa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java @@ -24,18 +24,18 @@ public final class ElFilter implements Filter { private Object convertValue(String propertyName, Object value) { // convert type of value to match expected type - ElPropertyValue elGetValue = beanDescriptor.getElGetValue(propertyName); + ElPropertyValue elGetValue = beanDescriptor.elGetValue(propertyName); return elGetValue.convert(value); } private ElComparator getElComparator(String propertyName) { - return beanDescriptor.getElComparator(propertyName); + return beanDescriptor.elComparator(propertyName); } private ElPropertyValue getElGetValue(String propertyName) { - return beanDescriptor.getElGetValue(propertyName); + return beanDescriptor.elGetValue(propertyName); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java index f3c9d5aae..cd18cec99 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java @@ -56,7 +56,7 @@ abstract class AbstractExpression implements SpiExpression { protected String propertyNestedPath(String propertyName, BeanDescriptor desc) { if (propertyName != null) { - ElPropertyDeploy elProp = desc.getElPropertyDeploy(propertyName); + ElPropertyDeploy elProp = desc.elPropertyDeploy(propertyName); if (elProp != null && elProp.containsMany()) { return SplitName.begin(propName); } @@ -74,7 +74,7 @@ abstract class AbstractExpression implements SpiExpression { */ protected void propertyContainsMany(String propertyName, BeanDescriptor desc, ManyWhereJoins manyWhereJoin) { if (propertyName != null) { - ElPropertyDeploy elProp = desc.getElPropertyDeploy(propertyName); + ElPropertyDeploy elProp = desc.elPropertyDeploy(propertyName); if (elProp != null) { if (elProp.containsFormulaWithJoin()) { // for findCount query select clause @@ -102,6 +102,6 @@ abstract class AbstractExpression implements SpiExpression { } protected final ElPropertyValue getElProp(SpiExpressionRequest request) { - return request.getBeanDescriptor().getElGetValue(propName); + return request.getBeanDescriptor().elGetValue(propName); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java index fafb3bc96..52d31c6dc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java @@ -39,7 +39,7 @@ final class AllEqualsExpression extends NonPrepareExpression { public void containsMany(BeanDescriptor desc, ManyWhereJoins manyWhereJoin) { if (propMap != null) { for (String propertyName : propMap.keySet()) { - ElPropertyDeploy elProp = desc.getElPropertyDeploy(name(propertyName)); + ElPropertyDeploy elProp = desc.elPropertyDeploy(name(propertyName)); if (elProp != null && elProp.containsMany()) { manyWhereJoin.add(elProp); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java index 74129849d..0dfa1fc33 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -52,7 +52,7 @@ final class BetweenPropertyExpression extends NonPrepareExpression { @Override public String nestedPath(BeanDescriptor desc) { - ElPropertyDeploy elProp = desc.getElPropertyDeploy(name(lowProperty)); + ElPropertyDeploy elProp = desc.elPropertyDeploy(name(lowProperty)); if (elProp != null && elProp.containsMany()) { // assumes highProperty is also nested property which seems reasonable return SplitName.begin(lowProperty); @@ -62,11 +62,11 @@ final class BetweenPropertyExpression extends NonPrepareExpression { @Override public void containsMany(BeanDescriptor desc, ManyWhereJoins manyWhereJoin) { - ElPropertyDeploy elProp = desc.getElPropertyDeploy(name(lowProperty)); + ElPropertyDeploy elProp = desc.elPropertyDeploy(name(lowProperty)); if (elProp != null && elProp.containsMany()) { manyWhereJoin.add(elProp); } - elProp = desc.getElPropertyDeploy(name(highProperty)); + elProp = desc.elPropertyDeploy(name(highProperty)); if (elProp != null && elProp.containsMany()) { manyWhereJoin.add(elProp); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index 418ead12e..0d9f39fc5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -37,7 +37,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().encryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } @@ -49,7 +49,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.beanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().decryptProperty(propName); } if (not) { request.append("lower(").append(pname).append(") != ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index c82a47426..372e5ecab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -290,7 +290,7 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression } else if ((beanProperty instanceof BeanPropertyAssocOne) && (value instanceof EntityBean)) { BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) beanProperty; - BeanDescriptor targetDescriptor = assocOne.getTargetDescriptor(); + BeanDescriptor targetDescriptor = assocOne.targetDescriptor(); addExpressions(list, targetDescriptor, (EntityBean) value, propName); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java index c61f884a4..d7f5e5a16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java @@ -54,7 +54,7 @@ final class IdExpression extends NonPrepareExpression implements SpiExpression { // 'flatten' EmbeddedId and multiple Id cases // into an array of the underlying scalar field values DefaultExpressionRequest r = (DefaultExpressionRequest) request; - Object[] bindIdValues = r.getBeanDescriptor().getBindIdValues(value); + Object[] bindIdValues = r.getBeanDescriptor().bindIdValues(value); for (Object bindIdValue : bindIdValues) { request.addBindValue(bindIdValue); } @@ -64,7 +64,7 @@ final class IdExpression extends NonPrepareExpression implements SpiExpression { public void addSql(SpiExpressionRequest request) { DefaultExpressionRequest r = (DefaultExpressionRequest) request; - String idSql = r.getBeanDescriptor().getIdBinderIdSql(null); + String idSql = r.getBeanDescriptor().idBinderIdSql(null); request.append(idSql); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java index 040cc8a36..18e1c8be6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java @@ -81,7 +81,7 @@ public final class IdInExpression extends NonPrepareExpression { DefaultExpressionRequest r = (DefaultExpressionRequest) request; BeanDescriptor descriptor = r.getBeanDescriptor(); - IdBinder idBinder = descriptor.getIdBinder(); + IdBinder idBinder = descriptor.idBinder(); idBinder.addIdInBindValues(request, idCollection); } @@ -92,11 +92,11 @@ public final class IdInExpression extends NonPrepareExpression { DefaultExpressionRequest r = (DefaultExpressionRequest) request; BeanDescriptor descriptor = r.getBeanDescriptor(); - IdBinder idBinder = descriptor.getIdBinder(); + IdBinder idBinder = descriptor.idBinder(); if (idCollection.isEmpty()) { request.append(SQL_FALSE); // append false for this stage } else { - request.append(descriptor.getIdBinder().getBindIdInSql(null)); + request.append(descriptor.idBinder().getBindIdInSql(null)); String inClause = idBinder.getIdInValueExpr(false, idCollection.size()); request.append(inClause); } @@ -105,12 +105,12 @@ public final class IdInExpression extends NonPrepareExpression { @Override public void addSql(SpiExpressionRequest request) { BeanDescriptor descriptor = request.getBeanDescriptor(); - IdBinder idBinder = descriptor.getIdBinder(); + IdBinder idBinder = descriptor.idBinder(); if (idCollection.isEmpty()) { request.append(SQL_FALSE); // append false for this stage } else { if (idBinder.isComplexId()) { - request.append(descriptor.getIdBinderInLHSSql()); + request.append(descriptor.idBinderInLHSSql()); request.append(idBinder.getIdInValueExpr(false, idCollection.size())); } else { request.append(idBinder.getBeanProperty().name()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java index 5d9a74759..e0b137154 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java @@ -29,7 +29,7 @@ final class LikeExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().encryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } String bindValue = getValue(strValue(), caseInsensitive, type, request); @@ -41,7 +41,7 @@ final class LikeExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.beanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().decryptProperty(propName); } if (caseInsensitive) { request.append("lower(").append(pname).append(")"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java index 552f8d71f..9977c92e2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java @@ -28,7 +28,7 @@ final class NativeILikeExpression extends AbstractExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().encryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } request.addBindValue(val); @@ -40,7 +40,7 @@ final class NativeILikeExpression extends AbstractExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.beanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().decryptProperty(propName); } request.append(pname).append(" ilike ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java index e754d1957..0c3eb00b5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java @@ -31,7 +31,7 @@ final class NullExpression extends AbstractExpression { @Override public void containsMany(BeanDescriptor desc, ManyWhereJoins manyWhereJoin) { - elProperty = desc.getElGetValue(propName); + elProperty = desc.elGetValue(propName); if (elProperty != null && elProperty.isAssocMany()) { // it is OneToMany or ManyToMany so going to be treated as isEmpty() expression assocMany = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index b24f9b485..aed3825ca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -83,7 +83,7 @@ public final class SimpleExpression extends AbstractValueExpression { } if (prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().encryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } else if (prop.isLocalEncrypted()) { Object bindVal = prop.localEncrypt(value()); @@ -105,7 +105,7 @@ public final class SimpleExpression extends AbstractValueExpression { return; } if (prop.isDbEncrypted()) { - String dsql = prop.beanProperty().getDecryptProperty(propName); + String dsql = prop.beanProperty().decryptProperty(propName); request.append(dsql).append(type.bind()); return; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index 012e7a09e..2dd6c1378 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -203,7 +203,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext } LoadBeanRequest req = new LoadBeanRequest(this, ebi, context.hitCache); - context.desc.getEbeanServer().loadBean(req); + context.desc.ebeanServer().loadBean(req); list.clear(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index 7d7fcfebb..018a9f647 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -67,7 +67,7 @@ public final class DLoadContext implements LoadContext { public DLoadContext(BeanDescriptor rootDescriptor, PersistenceContext persistenceContext) { this.useDocStore = true; this.rootDescriptor = rootDescriptor; - this.ebeanServer = rootDescriptor.getEbeanServer(); + this.ebeanServer = rootDescriptor.ebeanServer(); this.persistenceContext = persistenceContext; this.origin = initOrigin(); this.defaultBatchSize = 100; @@ -161,7 +161,7 @@ public final class DLoadContext implements LoadContext { * used to build the appropriate query for +query or +lazy loading. */ private void registerSecondaryQuery(OrmQueryProperties props) { - ElPropertyValue elGetValue = rootDescriptor.getElGetValue(props.getPath()); + ElPropertyValue elGetValue = rootDescriptor.elGetValue(props.getPath()); boolean many = elGetValue.beanProperty().containsMany(); registerSecondaryNode(many, props); } @@ -295,7 +295,7 @@ public final class DLoadContext implements LoadContext { } DLoadBeanContext getBeanContextWithInherit(String path, BeanPropertyAssocOne property) { - String key = path + ":" + property.getTargetDescriptor().name(); + String key = path + ":" + property.targetDescriptor().name(); return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path, null)); } @@ -323,11 +323,11 @@ public final class DLoadContext implements LoadContext { private DLoadBeanContext createBeanContext(String path, OrmQueryProperties queryProps) { BeanPropertyAssoc p = (BeanPropertyAssoc) getBeanProperty(rootDescriptor, path); - return new DLoadBeanContext(this, p.getTargetDescriptor(), path, queryProps); + return new DLoadBeanContext(this, p.targetDescriptor(), path, queryProps); } private DLoadBeanContext createBeanContext(BeanPropertyAssoc property, String path, OrmQueryProperties queryProps) { - return new DLoadBeanContext(this, property.getTargetDescriptor(), path, queryProps); + return new DLoadBeanContext(this, property.targetDescriptor(), path, queryProps); } private BeanProperty getBeanProperty(BeanDescriptor desc, String path) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index e549d49fb..8473e148b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -29,7 +29,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext private LoadBuffer currentBuffer; DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany property, String path, OrmQueryProperties queryProps) { - super(parent, property.getBeanDescriptor(), path, queryProps); + super(parent, property.descriptor(), path, queryProps); this.property = property; this.docStoreMapped = property.isTargetDocStoreMapped(); // bufferList only required when using query joins (queryFetch) @@ -203,7 +203,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext boolean useCache = !onlyIds && context.hitCache && context.property.isUseCache(); if (useCache) { EntityBean ownerBean = bc.getOwnerBean(); - BeanDescriptor parentDesc = context.desc.getBeanDescriptor(ownerBean.getClass()); + BeanDescriptor parentDesc = context.desc.descriptor(ownerBean.getClass()); Object parentId = parentDesc.getId(ownerBean); if (parentDesc.cacheManyPropLoad(context.property, bc, parentId, context.parent.isReadOnly())) { // we loaded the bean collection from cache so remove it from the buffer diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index c20e68496..f33ebe235 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -739,7 +739,7 @@ public final class DefaultPersister implements Persister { // OneToOne exported side with delete cascade BeanPropertyAssocOne[] expOnes = descriptor.propertiesOneExportedDelete(); for (BeanPropertyAssocOne expOne : expOnes) { - BeanDescriptor targetDesc = expOne.getTargetDescriptor(); + BeanDescriptor targetDesc = expOne.targetDescriptor(); // only cascade soft deletes when supported by target if (deleteMode.isHard() || targetDesc.isSoftDelete()) { if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) { @@ -758,7 +758,7 @@ public final class DefaultPersister implements Persister { BeanPropertyAssocMany[] manys = descriptor.propertiesManyDelete(); for (BeanPropertyAssocMany many : manys) { if (!many.isManyToMany()) { - BeanDescriptor targetDesc = many.getTargetDescriptor(); + BeanDescriptor targetDesc = many.targetDescriptor(); // only cascade soft deletes when supported by target if (deleteMode.isHard() || targetDesc.isSoftDelete()) { if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) { @@ -948,7 +948,7 @@ public final class DefaultPersister implements Persister { private SaveManyBase saveManyRequest(boolean insertedParent, BeanPropertyAssocMany many, EntityBean parentBean, PersistRequestBean request) { if (!many.isElementCollection()) { return new SaveManyBeans(this, insertedParent, many, parentBean, request); - } else if (many.getManyType().isMap()) { + } else if (many.manyType().isMap()) { return new SaveManyElementCollectionMap(this, insertedParent, many, parentBean, request); } else { return new SaveManyElementCollection(this, insertedParent, many, parentBean, request); @@ -1019,7 +1019,7 @@ public final class DefaultPersister implements Persister { } } else { - if (ModifyListenMode.REMOVALS == many.getModifyListenMode()) { + if (ModifyListenMode.REMOVALS == many.modifyListenMode()) { // PrivateOwned ... // if soft delete then check target also supports soft delete if (deleteMode.isHard() || many.isTargetSoftDelete()) { @@ -1059,9 +1059,9 @@ public final class DefaultPersister implements Persister { void deleteManyDetails(SpiTransaction t, BeanDescriptor desc, EntityBean parentBean, BeanPropertyAssocMany many, List excludeDetailIds, DeleteMode deleteMode) { - if (many.getCascadeInfo().isDelete()) { + if (many.cascadeInfo().isDelete()) { // cascade delete the beans in the collection - BeanDescriptor targetDesc = many.getTargetDescriptor(); + BeanDescriptor targetDesc = many.targetDescriptor(); if (deleteMode.isHard() || targetDesc.isSoftDelete()) { if (targetDesc.isDeleteByStatement()) { // Just delete all the children with one statement diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index c5c22225a..d71ed62c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -126,7 +126,7 @@ final class MergeHandler { } static MergeNode createMergeNode(String fullPath, BeanDescriptor targetDesc, String path) { - BeanProperty prop = targetDesc.getBeanProperty(path); + BeanProperty prop = targetDesc.beanProperty(path); if (!(prop instanceof BeanPropertyAssoc)) { throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.fullName()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java index e068990f1..afb94a45c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java @@ -22,7 +22,7 @@ abstract class MergeNode { MergeNode(String fullPath, BeanPropertyAssoc property) { this.fullPath = fullPath; - this.targetDescriptor = property.getTargetDescriptor(); + this.targetDescriptor = property.targetDescriptor(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java index 02acdf3f9..cd476ae61 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java @@ -27,8 +27,8 @@ final class MergeNodeAssocManyToMany extends MergeNode { @Override public void merge(MergeRequest request) { EntityBean parentBean = request.getBean(); - Collection beans = many.getRawCollection(parentBean); - Collection outlines = many.getRawCollection(request.getOutline()); + Collection beans = many.rawCollection(parentBean); + Collection outlines = many.rawCollection(request.getOutline()); Map outlineIds = toMap(outlines); List additions = new ArrayList<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java index 8372c955d..3221cc651 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java @@ -20,8 +20,8 @@ final class MergeNodeAssocOneToMany extends MergeNode { @Override public void merge(MergeRequest request) { - Collection beans = many.getRawCollection(request.getBean()); - Collection outlines = many.getRawCollection(request.getOutline()); + Collection beans = many.rawCollection(request.getBean()); + Collection outlines = many.rawCollection(request.getOutline()); Map outlineIds = toMap(outlines); if (beans != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java index 26549227f..ceb8f4626 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java @@ -62,7 +62,7 @@ abstract class SaveManyBase implements SaveMany { final void modifyListenReset(BeanCollection c) { if (insertedParent) { // after insert set the modify listening mode for private owned etc - c.setModifyListening(many.getModifyListenMode()); + c.setModifyListening(many.modifyListenMode()); } c.modifyReset(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index dd4f6c670..2993bdde1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -41,10 +41,10 @@ public final class SaveManyBeans extends SaveManyBase { SaveManyBeans(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany many, EntityBean parentBean, PersistRequestBean request) { super(persister, insertedParent, many, parentBean, request); - this.cascade = many.getCascadeInfo().isSave(); + this.cascade = many.cascadeInfo().isSave(); this.publish = request.isPublish(); - this.targetDescriptor = many.getTargetDescriptor(); - this.isMap = many.getManyType().isMap(); + this.targetDescriptor = many.targetDescriptor(); + this.isMap = many.manyType().isMap(); this.saveRecurseSkippable = many.isSaveRecurseSkippable(); this.deleteMode = targetDescriptor.isSoftDelete() ? DeleteMode.SOFT : DeleteMode.HARD; this.untouchedBeanCollection = untouchedBeanCollection(); @@ -95,11 +95,11 @@ public final class SaveManyBeans extends SaveManyBase { if (!many.isManyToMany()) { return true; } - return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().rootName()); + return transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName()); } private boolean isModifyListenMode() { - return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode(); + return BeanCollection.ModifyListenMode.REMOVALS == many.modifyListenMode(); } /** @@ -120,7 +120,7 @@ public final class SaveManyBeans extends SaveManyBase { if (!insertedParent && canSkipForOrderColumn() && saveRecurseSkippable) { return; } - orderColumn = targetDescriptor.getOrderColumn(); + orderColumn = targetDescriptor.orderColumn(); } if (insertedParent) { @@ -132,7 +132,7 @@ public final class SaveManyBeans extends SaveManyBase { // collect the Id's (to exclude from deleteManyDetails) List detailIds = collectIds(collection, targetDescriptor, isMap); // deleting missing children - children not in our collected detailIds - persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, deleteMode); + persister.deleteManyDetails(transaction, many.descriptor(), parentBean, many, detailIds, deleteMode); } transaction.depth(+1); @@ -189,7 +189,7 @@ public final class SaveManyBeans extends SaveManyBase { persister.saveRecurse(detail, transaction, parentBean, request.flags()); if (many.hasOrderColumn()) { // Clear the bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed - final BeanDescriptor beanDescriptor = many.getBeanDescriptor(); + final BeanDescriptor beanDescriptor = many.descriptor(); beanDescriptor.contextClear(transaction.getPersistenceContext(), beanDescriptor.getId(parentBean)); } } @@ -335,7 +335,7 @@ public final class SaveManyBeans extends SaveManyBase { } private boolean isChangedProperty() { - return parentBean._ebean_getIntercept().isChangedProperty(many.getPropertyIndex()); + return parentBean._ebean_getIntercept().isChangedProperty(many.propertyIndex()); } private void removeAssocManyOrphans() { @@ -351,7 +351,7 @@ public final class SaveManyBeans extends SaveManyBase { Set modifyRemovals = c.getModifyRemovals(); if (insertedParent) { // after insert set the modify listening mode for private owned etc - c.setModifyListening(many.getModifyListenMode()); + c.setModifyListening(many.modifyListenMode()); } // We must not reset when we still have to update other entities in the collection and set their new orderColumn value if (!many.hasOrderColumn()) { @@ -378,7 +378,7 @@ public final class SaveManyBeans extends SaveManyBase { BeanCollection.ModifyListenMode mode = manyValue.getModifyListening(); if (mode == null) { // new collection persisted for the first time - manyValue.setModifyListening(prop.getModifyListenMode()); + manyValue.setModifyListening(prop.modifyListenMode()); return true; } return false; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index c51f99a42..6fab530ae 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -27,7 +27,7 @@ final class DeleteMeta extends BaseMeta { this.sqlNone = genSql(ConcurrencyMode.NONE, tableName); this.sqlVersion = genSql(ConcurrencyMode.VERSION, tableName); if (desc.isDraftable()) { - String draftTableName = desc.getDraftTable(); + String draftTableName = desc.draftTable(); this.sqlDraftNone = genSql(ConcurrencyMode.NONE, draftTableName); this.sqlDraftVersion = genSql(ConcurrencyMode.VERSION, draftTableName); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java index 44a1d919b..fad7f8672 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java @@ -61,7 +61,7 @@ final class GeneratedProperties { SetValue(BeanProperty property) { this.property = property; - this.generatedProperty = property.getGeneratedProperty(); + this.generatedProperty = property.generatedProperty(); } void preInsert(EntityBean bean, long now) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java index 33b804a6c..3ca5a567d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java @@ -26,7 +26,7 @@ final class GeneratedPropertyCollector { } private void add(BeanProperty prop) { - GeneratedProperty gen = prop.getGeneratedProperty(); + GeneratedProperty gen = prop.generatedProperty(); if (gen != null) { if (gen.includeInInsert()) { preInsert.add(prop); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java index 73096138e..64b7d6f3a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java @@ -49,7 +49,7 @@ final class InsertMeta { this.shadowFKey = shadowFKey; String tableName = desc.baseTable(); - String draftTableName = desc.getDraftTable(); + String draftTableName = desc.draftTable(); this.sqlWithId = genSql(false, tableName, false); this.sqlDraftWithId = desc.isDraftable() ? genSql(false, draftTableName, true) : sqlWithId; @@ -81,7 +81,7 @@ final class InsertMeta { } private static Bindable getDiscriminator(BeanDescriptor desc) { - InheritInfo inheritInfo = desc.getInheritInfo(); + InheritInfo inheritInfo = desc.inheritInfo(); return inheritInfo != null ? new BindableDiscriminator(inheritInfo) : null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java index 7ad52d87f..9819aaf77 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java @@ -55,7 +55,7 @@ final class MetaFactory { embeddedFact.create(setList, desc, DmlMode.UPDATE, includeLobs); assocOneFact.create(setList, desc, DmlMode.UPDATE); - BeanProperty orderColumn = desc.getOrderColumn(); + BeanProperty orderColumn = desc.orderColumn(); if (orderColumn != null) { setList.add(new BindableOrderColumn(orderColumn)); } @@ -89,7 +89,7 @@ final class MetaFactory { assocOneFact.create(allList, desc, DmlMode.INSERT); BindableList allBindable = new BindableList(allList); - BeanPropertyAssocOne unidirectional = desc.getUnidirectional(); + BeanPropertyAssocOne unidirectional = desc.unidirectional(); Bindable shadowFkey; if (unidirectional == null) { shadowFkey = null; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java index d2c511a50..79f06940e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -52,7 +52,7 @@ final class UpdateMeta extends BaseMeta { String key = persistRequest.updatePlanHash(); // check if we can use a cached UpdatePlan BeanDescriptor beanDescriptor = persistRequest.descriptor(); - SpiUpdatePlan updatePlan = beanDescriptor.getUpdatePlan(key); + SpiUpdatePlan updatePlan = beanDescriptor.updatePlan(key); if (updatePlan != null) { return updatePlan; } @@ -70,7 +70,7 @@ final class UpdateMeta extends BaseMeta { updatePlan = new UpdatePlan(key, mode, sql, bindableList); // add the UpdatePlan to the cache - beanDescriptor.putUpdatePlan(key, updatePlan); + beanDescriptor.updatePlan(key, updatePlan); return updatePlan; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java index 8eaa091a0..bf63accde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java @@ -20,7 +20,7 @@ class BindableAssocOne implements Bindable { BindableAssocOne(BeanPropertyAssocOne assocOne) { this.assocOne = assocOne; - this.importedId = assocOne.getImportedId(); + this.importedId = assocOne.importedId(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index 4ebba440e..20451be3a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -44,7 +44,7 @@ final class BindableEncryptedProperty implements Bindable { public void dmlAppend(GenerateDmlRequest request) { // columnName = AES_ENCRYPT(?,?) - request.appendColumn(prop.dbColumn(), prop.getDbBind()); + request.appendColumn(prop.dbColumn(), prop.dbBind()); } @@ -60,7 +60,7 @@ final class BindableEncryptedProperty implements Bindable { } // get Encrypt key - String encryptKeyValue = prop.getEncryptKey().getStringValue(); + String encryptKeyValue = prop.encryptKey().getStringValue(); if (!bindEncryptDataFirst) { // H2 encrypt function ... different parameter order diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 7cb2b104d..43109f2bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -24,7 +24,7 @@ final class BindableIdEmbedded implements BindableId { BindableIdEmbedded(BeanPropertyAssocOne embId, MatchedImportedProperty[] matches) { this.embId = embId; - this.props = embId.getProperties(); + this.props = embId.properties(); this.matches = matches; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java index a6d6d6cb6..3014dd36b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java @@ -15,7 +15,7 @@ final class BindablePropertyJsonInsert extends BindableProperty { BindablePropertyJsonInsert(BeanProperty prop) { super(prop); - this.propertyIndex = prop.getPropertyIndex(); + this.propertyIndex = prop.propertyIndex(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java index 7501fd92b..029e5fcea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java @@ -14,7 +14,7 @@ final class BindablePropertyJsonUpdate extends BindableProperty { BindablePropertyJsonUpdate(BeanProperty prop) { super(prop); - this.propertyIndex = prop.getPropertyIndex(); + this.propertyIndex = prop.propertyIndex(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java index 56eddd8e1..9c6354e70 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java @@ -48,7 +48,7 @@ final class BindablePropertyVersion implements Bindable { public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { // get prior version value from 'old values' - Object value = bean._ebean_getIntercept().getOrigValue(prop.getPropertyIndex()); + Object value = bean._ebean_getIntercept().getOrigValue(prop.propertyIndex()); request.bind(value, prop); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index af7f2546b..495e89d6b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -27,7 +27,7 @@ public final class BindableUnidirectional implements Bindable { public BindableUnidirectional(BeanDescriptor desc, BeanPropertyAssocOne unidirectional) { this.desc = desc; this.unidirectional = unidirectional; - this.importedId = unidirectional.getImportedId(); + this.importedId = unidirectional.importedId(); } @Override @@ -57,7 +57,7 @@ public final class BindableUnidirectional implements Bindable { Object parentBean = persistRequest.parentBean(); if (parentBean == null) { Class localType = desc.type(); - Class targetType = unidirectional.getTargetType(); + Class targetType = unidirectional.targetType(); String msg = "Error inserting bean [" + localType + "] with unidirectional relationship. "; msg += "For inserts you must use cascade save on the master bean [" + targetType + "]."; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java index cef891682..228fbe9e6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java @@ -24,7 +24,7 @@ public final class FactoryEmbedded { */ public void create(List list, BeanDescriptor desc, DmlMode mode, boolean withLobs) { for (BeanPropertyAssocOne anEmbedded : desc.propertiesEmbedded()) { - BeanProperty[] props = anEmbedded.getProperties(); + BeanProperty[] props = anEmbedded.properties(); List bindList = new ArrayList<>(props.length); for (BeanProperty prop : props) { Bindable item = factoryProperty.create(prop, mode, withLobs, true); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java index b72e9b8e6..563da85c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java @@ -21,7 +21,7 @@ public final class FactoryId { return new BindableIdScalar(id); } else { BeanPropertyAssocOne embId = (BeanPropertyAssocOne) id; - MatchedImportedProperty[] matches = MatchedImportedFactory.build(embId.getProperties(), desc); + MatchedImportedProperty[] matches = MatchedImportedFactory.build(embId.properties(), desc); return new BindableIdEmbedded(embId, matches); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java index 7c418af31..8474f7f01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java @@ -13,7 +13,7 @@ public final class FactoryVersion { * Create a Bindable for the version property(s) for a bean type. */ public Bindable create(BeanDescriptor desc) { - BeanProperty versionProperty = desc.getVersionProperty(); + BeanProperty versionProperty = desc.versionProperty(); return (versionProperty == null) ? null : new BindablePropertyVersion(versionProperty); } @@ -21,7 +21,7 @@ public final class FactoryVersion { * Create a Bindable for the version property(s) for a bean type. */ public Bindable createForDelete(BeanDescriptor desc) { - BeanProperty versionProperty = desc.getVersionProperty(); + BeanProperty versionProperty = desc.versionProperty(); return (versionProperty == null) ? null : new BindableProperty(versionProperty); } @@ -29,7 +29,7 @@ public final class FactoryVersion { * Create a Bindable for TenantId If multi-tenant with partitioning is on this bean type. */ public Bindable createTenantId(BeanDescriptor desc) { - BeanProperty tenant = desc.getTenantProperty(); + BeanProperty tenant = desc.tenantProperty(); if (tenant == null) { return null; } else if (tenant instanceof BeanPropertyAssocOne) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java index 60079c015..80586ad71 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java @@ -28,7 +28,7 @@ final class MatchedImportedFactory { for (BeanPropertyAssocOne assocOne1 : desc.propertiesOne()) { if (assocOne1.isImportedPrimaryKey()) { // search using the ImportedId from the assoc one - BeanProperty foreignMatch = assocOne1.getImportedId().findMatchImport(dbColumn); + BeanProperty foreignMatch = assocOne1.importedId().findMatchImport(dbColumn); if (foreignMatch != null) { return new MatchedImportedEmbedded(prop, assocOne1, foreignMatch); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index f8117276e..724cd06bb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -378,7 +378,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi if (lazyLoadParentId != null) { if (!lazyLoadParentId.equals(this.lazyLoadParentId)) { // get the appropriate parent bean from the persistence context - this.lazyLoadParentBean = (EntityBean) lazyLoadManyProperty.getBeanDescriptor().contextGet(getPersistenceContext(), lazyLoadParentId); + this.lazyLoadParentBean = (EntityBean) lazyLoadManyProperty.descriptor().contextGet(getPersistenceContext(), lazyLoadParentId); this.lazyLoadParentId = lazyLoadParentId; } // add the loadedBean to the appropriate collection of lazyLoadParentBean @@ -747,7 +747,7 @@ public final class CQuery implements DbReadContext, CancelableQuery, SpiProfi if (auditIds == null) { auditIds = new ArrayList<>(100); } - auditIds.add(desc.getIdForJson(nextBean)); + auditIds.add(desc.idForJson(nextBean)); if (auditFindIterate && auditIds.size() >= 100) { auditIterateLogMessage(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index e7de1fbd4..7aa16981d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -130,7 +130,7 @@ final class CQueryBuilder { } // wrap as - delete from table where id in (select id ...) String sql = buildSqlDelete(null, request, predicates, sqlTree).getSql(); - sql = request.descriptor().getDeleteByIdInSql() + "in (" + sql + ")"; + sql = request.descriptor().deleteByIdInSql() + "in (" + sql + ")"; sql = aliasReplace(sql, alias); return sql; } @@ -157,7 +157,7 @@ final class CQueryBuilder { } // wrap as - update table set ... where id in (select id ...) String sql = buildSqlUpdate(null, request, predicates, sqlTree).getSql(); - sql = updateClause + " " + request.descriptor().getWhereIdInSql() + "in (" + sql + ")"; + sql = updateClause + " " + request.descriptor().whereIdInSql() + "in (" + sql + ")"; sql = aliasReplace(sql, alias(rootTableAlias)); return sql; } @@ -182,7 +182,7 @@ final class CQueryBuilder { if (!query.isIncludeSoftDeletes()) { BeanDescriptor desc = request.descriptor(); if (desc.isSoftDelete()) { - query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias()))); + query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.getAlias()))); } } @@ -212,7 +212,7 @@ final class CQueryBuilder { query.setSelectId(); BeanDescriptor desc = request.descriptor(); if (!query.isIncludeSoftDeletes() && desc.isSoftDelete()) { - query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias()))); + query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.getAlias()))); } return buildFetchAttributeQuery(request); } @@ -361,7 +361,7 @@ final class CQueryBuilder { BeanDescriptor desc = request.descriptor(); if (desc.isReadAuditing()) { // log the query plan based bean type (i.e. ignoring query disabling for logging the sql/plan) - desc.getReadAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.fullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql())); + desc.readAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.fullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql())); } // cache the query plan because we can reuse it and also // gather query performance statistics based on it. @@ -455,11 +455,11 @@ final class CQueryBuilder { SpiRawSql.ColumnMapping.Column column = it.next(); String propertyName = column.getPropertyName(); if (!SpiRawSql.IGNORE_COLUMN.equals(propertyName)) { - ElPropertyValue el = descriptor.getElGetValue(propertyName); + ElPropertyValue el = descriptor.elGetValue(propertyName); if (el == null && propertyName.endsWith("Id")) { // try default naming convention for foreign key columns String foreignIdPath = assocOneIdPath(propertyName); - el = descriptor.getElGetValue(foreignIdPath); + el = descriptor.elGetValue(foreignIdPath); if (el != null) { propertyName = foreignIdPath; } @@ -661,7 +661,7 @@ final class CQueryBuilder { appendAndOrWhere(); BeanDescriptor desc = request.descriptor(); - String idSql = desc.getIdBinderIdSql(query.getAlias()); + String idSql = desc.idBinderIdSql(query.getAlias()); if (idSql.isEmpty()) { throw new IllegalStateException("Executing FindById query on entity bean " + desc.name() + " that doesn't have an @Id property??"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index a46d571c2..5c0ccfe3f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -85,7 +85,7 @@ final class CQueryBuilderRawSql { BeanDescriptor descriptor = request.descriptor(); //FIXME: I think this is broken... needs to be logical // and then parsed for RawSqlSelect... - dynamicWhere = descriptor.getIdBinderIdSql(null); + dynamicWhere = descriptor.idBinderIdSql(null); } String dbWhere = predicates.getDbWhere(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java index 4323a5a01..0f369fef8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java @@ -54,7 +54,7 @@ final class CQueryOrderBy { private String parseProperty(Property p) { String propName = p.getProperty(); - ElPropertyValue el = desc.getElGetValue(propName); + ElPropertyValue el = desc.elGetValue(propName); if (el == null) { return p.toStringFormat(); } @@ -62,7 +62,7 @@ final class CQueryOrderBy { BeanProperty beanProperty = el.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc ap = (BeanPropertyAssoc) beanProperty; - IdBinder idBinder = ap.getTargetDescriptor().getIdBinder(); + IdBinder idBinder = ap.targetDescriptor().idBinder(); return idBinder.getOrderBy(el.elName(), p.isAscending()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index f7f63ef5b..10b243f1e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -93,7 +93,7 @@ public class CQueryPlan implements SpiQueryPlan { this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.descriptor().getSimpleName()); + this.name = deriveName(label, query.getType(), request.descriptor().simpleName()); this.asOfTableCount = query.getAsOfTableCount(); this.sql = sqlRes.getSql(); this.sqlTree = sqlTree; @@ -117,7 +117,7 @@ public class CQueryPlan implements SpiQueryPlan { this.profileLocation = query.getProfileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.descriptor().getSimpleName()); + this.name = deriveName(label, query.getType(), request.descriptor().simpleName()); this.planKey = buildPlanKey(sql, logWhereSql); this.asOfTableCount = 0; this.sql = sql; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index cb83c3006..2129141f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -328,14 +328,14 @@ public final class CQueryPredicates { String orderBy = parseOrderBy(); BeanDescriptor desc = request.descriptor(); - String orderById = desc.getDefaultOrderBy(); + String orderById = desc.defaultOrderBy(); if (orderBy == null) { orderBy = orderById; } // check for default ordering on the many property... - String manyOrderBy = manyProp.getFetchOrderBy(); + String manyOrderBy = manyProp.fetchOrderBy(); if (manyOrderBy != null) { orderBy = orderBy + ", " + CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java index 4f28bf803..06e241f75 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java @@ -9,7 +9,7 @@ public interface STreePropertyAssoc extends STreeProperty { /** * Return the extra where clause if set. */ - String getExtraWhere(); + String extraWhere(); /** * Return the type of the target (other side). @@ -19,7 +19,7 @@ public interface STreePropertyAssoc extends STreeProperty { /** * Return the IdBinder of the underlying type. */ - IdBinder getIdBinder(); + IdBinder idBinder(); /** * Add a Join with the given alias. @@ -44,5 +44,5 @@ public interface STreePropertyAssoc extends STreeProperty { /** * Return the soft delete predicate. */ - String getSoftDeletePredicate(String tableAlias); + String softDeletePredicate(String tableAlias); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java index 63e2b81c0..c827a255e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java @@ -41,7 +41,7 @@ public interface STreePropertyAssocMany extends STreePropertyAssoc { /** * Return the intersection table join. */ - TableJoin getIntersectionTableJoin(); + TableJoin intersectionTableJoin(); /** * Add a bean to the collection. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java index 6e441a617..d7ff3016d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java @@ -13,7 +13,7 @@ public interface STreePropertyAssocOne extends STreePropertyAssoc { /** * Return the scalar type of the associated id property. */ - ScalarDataReader getIdReader(); + ScalarDataReader idReader(); /** * Returns true, if this relation has a foreign key. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java index fae7ab110..3bb58dd1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java @@ -40,7 +40,7 @@ public interface STreeType { /** * Return the soft delete predicate using the given table alias. */ - String getSoftDeletePredicate(String baseTableAlias); + String softDeletePredicate(String baseTableAlias); /** * Return the scalar properties. @@ -65,12 +65,12 @@ public interface STreeType { /** * Return the inheritance information for this type. */ - InheritInfo getInheritInfo(); + InheritInfo inheritInfo(); /** * Return the IdBinder for this type. */ - IdBinder getIdBinder(); + IdBinder idBinder(); /** * Create a new entity bean instance. @@ -95,7 +95,7 @@ public interface STreeType { /** * Return the base table to use given the temporalMode. */ - String getBaseTable(SpiQuery.TemporalMode temporalMode); + String baseTable(SpiQuery.TemporalMode temporalMode); /** * Return true if the given path is an embedded bean. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java index 5ea33f112..27b6d6fbf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java @@ -50,7 +50,7 @@ public final class SqlBeanLoad { return null; } if ((bean == null) - || (lazyLoading && ebi.isLoadedProperty(prop.getPropertyIndex())) + || (lazyLoading && ebi.isLoadedProperty(prop.propertyIndex())) || (type != null && !prop.isAssignableFrom(type))) { // ignore this property // ... null: bean already in persistence context @@ -62,7 +62,7 @@ public final class SqlBeanLoad { try { return prop.readSet(ctx, bean); } catch (Exception e) { - bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e); + bean._ebean_getIntercept().setLoadError(prop.propertyIndex(), e); ctx.handleLoadError(prop.fullName(), e); return prop.getValue(bean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index 551e224fa..e462313c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -294,7 +294,7 @@ public final class SqlTreeBuilder { String baseTable = (query == null) ? null : query.getBaseTable(); if (baseTable == null) { - baseTable = desc.getBaseTable(temporalMode); + baseTable = desc.baseTable(temporalMode); } return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct, baseTable); @@ -507,7 +507,7 @@ public final class SqlTreeBuilder { } } - InheritInfo inheritInfo = desc.getInheritInfo(); + InheritInfo inheritInfo = desc.inheritInfo(); if (inheritInfo != null) { // add sub type properties inheritInfo.addChildrenProperties(selectProps); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 87b5d204a..82ae6654f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -87,15 +87,15 @@ class SqlTreeNodeBean implements SqlTreeNode { List myChildren, boolean withId, STreePropertyAssocMany lazyLoadParent, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) { this.lazyLoadParent = lazyLoadParent; - this.lazyLoadParentIdBinder = (lazyLoadParent == null) ? null : lazyLoadParent.getIdBinder(); + this.lazyLoadParentIdBinder = (lazyLoadParent == null) ? null : lazyLoadParent.idBinder(); this.prefix = prefix; this.desc = desc; - this.inheritInfo = desc.getInheritInfo(); - this.idBinder = desc.getIdBinder(); + this.inheritInfo = desc.inheritInfo(); + this.idBinder = desc.idBinder(); this.temporalMode = temporalMode; this.temporalVersions = temporalMode == SpiQuery.TemporalMode.VERSIONS; this.nodeBeanProp = beanProp; - this.extraWhere = (beanProp == null) ? null : beanProp.getExtraWhere(); + this.extraWhere = (beanProp == null) ? null : beanProp.extraWhere(); this.aggregation = props.isAggregation(); boolean aggregationRoot = props.isAggregationRoot(); // the bean has an Id property and we want to use it @@ -123,14 +123,14 @@ class SqlTreeNodeBean implements SqlTreeNode { // if we have no property ask first children (in a distinct select with join) if (children.length == 0) { // expected to be a findIds query - return desc.getIdBinder().getBeanProperty(); + return desc.idBinder().getBeanProperty(); } return children[0].getSingleAttributeReader(); } if (properties[0] instanceof STreePropertyAssocOne) { STreePropertyAssocOne assocOne = (STreePropertyAssocOne)properties[0]; if (assocOne.isAssocId()) { - return assocOne.getIdReader(); + return assocOne.idReader(); } } return properties[0]; @@ -184,7 +184,7 @@ class SqlTreeNodeBean implements SqlTreeNode { @Override void initBeanType() throws SQLException { - InheritInfo localInfo = readId ? inheritInfo.readType(ctx) : desc.getInheritInfo(); + InheritInfo localInfo = readId ? inheritInfo.readType(ctx) : desc.inheritInfo(); if (localInfo == null) { // the bean must be null localIdBinder = idBinder; @@ -602,7 +602,7 @@ class SqlTreeNodeBean implements SqlTreeNode { @Override public final void addSoftDeletePredicate(SpiQuery query) { if (desc.isSoftDelete()) { - query.addSoftDeletePredicate(desc.getSoftDeletePredicate(baseTableAlias)); + query.addSoftDeletePredicate(desc.softDeletePredicate(baseTableAlias)); } } @@ -626,7 +626,7 @@ class SqlTreeNodeBean implements SqlTreeNode { @Override public void dependentTables(Set tables) { - tables.add(nodeBeanProp.target().getBaseTable(temporalMode)); + tables.add(nodeBeanProp.target().baseTable(temporalMode)); for (SqlTreeNode child : children) { child.dependentTables(tables); } @@ -642,7 +642,7 @@ class SqlTreeNodeBean implements SqlTreeNode { appendJoinDiscriminator(ctx); } if (desc.isSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) { - ctx.append(" and ").append(desc.getSoftDeletePredicate(ctx.getTableAlias(prefix))); + ctx.append(" and ").append(desc.softDeletePredicate(ctx.getTableAlias(prefix))); } return sqlJoinType; } @@ -658,7 +658,7 @@ class SqlTreeNodeBean implements SqlTreeNode { String alias2 = alias + "z_"; // adding the additional join to the intersection table - TableJoin manyToManyJoin = manyProp.getIntersectionTableJoin(); + TableJoin manyToManyJoin = manyProp.intersectionTableJoin(); manyToManyJoin.addJoin(joinType, parentAlias, alias2, ctx); if (!manyProp.isExcludedFromHistory()) { intersectionAsOfTableAlias = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index ae5e5bf3f..35bd5adae 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -101,7 +101,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode { @Override public void dependentTables(Set tables) { - tables.add(assocBeanProperty.target().getBaseTable(SpiQuery.TemporalMode.CURRENT)); + tables.add(assocBeanProperty.target().baseTable(SpiQuery.TemporalMode.CURRENT)); if (children != null) { for (SqlTreeNode child : children) { child.dependentTables(tables); @@ -123,7 +123,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode { String parentAlias = ctx.getTableAlias(split[0]); String alias2 = alias + "z_"; - TableJoin manyToManyJoin = manyProp.getIntersectionTableJoin(); + TableJoin manyToManyJoin = manyProp.intersectionTableJoin(); manyToManyJoin.addJoin(joinType, parentAlias, alias2, ctx); assocBeanProperty.addJoin(joinType, alias2, alias, ctx); @@ -149,7 +149,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode { } joinType = assocBeanProperty.addJoin(joinType, prefix, ctx); if (!oneToOneExported && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) { - ctx.append(" and ").append(assocBeanProperty.getSoftDeletePredicate(ctx.getTableAlias(prefix))); + ctx.append(" and ").append(assocBeanProperty.softDeletePredicate(ctx.getTableAlias(prefix))); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java index c3f534a25..73c7a18b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java @@ -94,18 +94,18 @@ final class SqlTreeNodeManyWhereJoin implements SqlTreeNode { if (nodeBeanProp instanceof STreePropertyAssocOne) { nodeBeanProp.addJoin(joinType, parentAlias, alias, ctx); if (softDelete) { - ctx.append(" and ").append(target.getSoftDeletePredicate(alias)); + ctx.append(" and ").append(target.softDeletePredicate(alias)); } } else { STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp; if (!manyProp.hasJoinTable()) { manyProp.addJoin(joinType, parentAlias, alias, ctx); if (softDelete) { - ctx.append(" and ").append(target.getSoftDeletePredicate(alias)); + ctx.append(" and ").append(target.softDeletePredicate(alias)); } } else { String alias2 = alias + "z_"; - TableJoin manyToManyJoin = manyProp.getIntersectionTableJoin(); + TableJoin manyToManyJoin = manyProp.intersectionTableJoin(); manyToManyJoin.addJoin(joinType, parentAlias, alias2, ctx); manyProp.addJoin(joinType, alias2, alias, ctx); } @@ -114,7 +114,7 @@ final class SqlTreeNodeManyWhereJoin implements SqlTreeNode { @Override public void dependentTables(Set tables) { - tables.add(nodeBeanProp.target().getBaseTable(SpiQuery.TemporalMode.CURRENT)); + tables.add(nodeBeanProp.target().baseTable(SpiQuery.TemporalMode.CURRENT)); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 23768e29e..ccd17b9ce 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -201,7 +201,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< @Override public boolean isFindById() { if (id == null && whereExpressions != null) { - id = whereExpressions.idEqualTo(beanDescriptor.getIdName()); + id = whereExpressions.idEqualTo(beanDescriptor.idName()); if (id != null) { whereExpressions = null; } @@ -414,7 +414,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< } if (orderBy != null) { for (Property orderProperty : orderBy.getProperties()) { - ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(orderProperty.getProperty()); + ElPropertyDeploy elProp = beanDescriptor.elPropertyDeploy(orderProperty.getProperty()); if (elProp != null && elProp.containsFormulaWithJoin()) { manyWhereJoins.addFormulaWithJoin(orderProperty.getProperty()); } @@ -588,7 +588,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< public void setSelectId() { // clear select and fetch joins.. detail.clear(); - select(beanDescriptor.getIdBinder().getIdProperty()); + select(beanDescriptor.idBinder().getIdProperty()); } @Override @@ -641,7 +641,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< if (whereExpressions == null) { return null; } - BeanNaturalKey naturalKey = beanDescriptor.getNaturalKey(); + BeanNaturalKey naturalKey = beanDescriptor.naturalKey(); if (naturalKey == null) { return null; } @@ -838,7 +838,7 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< @Override public void setDefaultRawSqlIfRequired() { if (beanDescriptor.isRawSqlBased() && rawSql == null) { - rawSql = beanDescriptor.getNamedRawSql(DEFAULT_QUERY_NAME); + rawSql = beanDescriptor.namedRawSql(DEFAULT_QUERY_NAME); } } @@ -1014,8 +1014,8 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< if (useDocStore) { sb.append("/ds"); } - if (beanDescriptor.getDiscValue() != null) { - sb.append("/dv").append(beanDescriptor.getDiscValue()); + if (beanDescriptor.discValue() != null) { + sb.append("/dv").append(beanDescriptor.discValue()); } if (temporalMode != SpiQuery.TemporalMode.CURRENT) { sb.append("/tm").append(temporalMode.ordinal()); @@ -1697,12 +1697,12 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< if (type == beanType) { return this; } - InheritInfo inheritInfo = rootBeanDescriptor.getInheritInfo(); + InheritInfo inheritInfo = rootBeanDescriptor.inheritInfo(); inheritInfo = inheritInfo == null ? null : inheritInfo.readType(type); if (inheritInfo == null) { throw new IllegalArgumentException("Given type " + type + " is not a subtype of " + beanType); } - beanDescriptor = (BeanDescriptor) rootBeanDescriptor.getBeanDescriptor(type); + beanDescriptor = (BeanDescriptor) rootBeanDescriptor.descriptor(type); return this; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java index 8d452adb4..494f4227a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java @@ -27,7 +27,7 @@ public final class DefaultUpdateQuery implements UpdateQuery { if (value == null) { values.setNull(property); } else { - final BeanProperty beanProperty = descriptor.getBeanProperty(property); + final BeanProperty beanProperty = descriptor.beanProperty(property); final ScalarType scalarType = (beanProperty == null) ? null: beanProperty.scalarType(); values.set(property, value, scalarType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 85a709118..fab176ecb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -307,14 +307,14 @@ public final class OrmQueryDetail implements Serializable { } else { OrmQueryProperties parentProp = fetchPaths.get(parentPath); if (parentProp == null) { - ElPropertyValue el = d.getElGetValue(parentPath); + ElPropertyValue el = d.elGetValue(parentPath); if (el == null) { throw new PersistenceException("Path [" + parentPath + "] not valid from " + d.fullName()); } // add a missing parent path just fetching the Id property BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.beanProperty(); if (addId) { - parentProp = new OrmQueryProperties(parentPath, assocOne.getTargetIdProperty()); + parentProp = new OrmQueryProperties(parentPath, assocOne.targetIdProperty()); } else { parentProp = new OrmQueryProperties(parentPath, Collections.emptySet()); } @@ -370,7 +370,7 @@ public final class OrmQueryDetail implements Serializable { int idx = 0; for (Map.Entry entry : fetchPaths.entrySet()) { String fetchPath = entry.getKey(); - ElPropertyDeploy elProp = desc.getElPropertyDeploy(fetchPath); + ElPropertyDeploy elProp = desc.elPropertyDeploy(fetchPath); if (elProp == null) { throw new PersistenceException("Invalid fetch path " + fetchPath + " from " + desc.fullName()); } @@ -430,13 +430,13 @@ public final class OrmQueryDetail implements Serializable { */ public void setDefaultSelectClause(BeanDescriptor desc) { if (desc.hasDefaultSelectClause() && !hasSelectClause()) { - baseProps = new OrmQueryProperties(null, desc.getDefaultSelectClause()); + baseProps = new OrmQueryProperties(null, desc.defaultSelectClause()); } for (OrmQueryProperties joinProps : fetchPaths.values()) { if (!joinProps.hasSelectClause()) { - BeanDescriptor assocDesc = desc.getBeanDescriptor(joinProps.getPath()); + BeanDescriptor assocDesc = desc.descriptor(joinProps.getPath()); if (assocDesc != null && assocDesc.hasDefaultSelectClause()) { - fetch(joinProps.getPath(), assocDesc.getDefaultSelectClause(), joinProps.getFetchConfig()); + fetch(joinProps.getPath(), assocDesc.defaultSelectClause(), joinProps.getFetchConfig()); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index bc40fbc54..ddd309760 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -235,7 +235,7 @@ public class TCsvReader implements CsvReader { private void addPropertiesFromHeader(String[] line) { for (String aLine : line) { - ElPropertyValue elProp = descriptor.getElGetValue(aLine); + ElPropertyValue elProp = descriptor.elGetValue(aLine); if (elProp == null) { throw new TextException("Property [" + aLine + "] not found"); } @@ -248,7 +248,7 @@ public class TCsvReader implements CsvReader { } else if (elProp.isAssocProperty()) { BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) elProp.beanProperty(); - String idProp = assocOne.getBeanDescriptor().getIdBinder().getIdProperty(); + String idProp = assocOne.descriptor().idBinder().getIdProperty(); addProperty(aLine + "." + idProp); } else { addProperty(aLine); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index 3f69ac1b1..e458a7ce1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -509,7 +509,7 @@ public final class WriteJson implements SpiJsonWriter { return currentIncludeProps.contains(prop.name()); } else { // include only loaded properties - return currentBean._ebean_getIntercept().isLoadedProperty(prop.getPropertyIndex()); + return currentBean._ebean_getIntercept().isLoadedProperty(prop.propertyIndex()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java index 09195bae2..02b66191b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java @@ -42,7 +42,7 @@ public final class BeanPersistIds implements BinaryWritable { */ public BeanPersistIds(BeanDescriptor desc) { this.beanDescriptor = desc; - this.descriptorId = desc.getDescriptorId(); + this.descriptorId = desc.descriptorId(); } public static BeanPersistIds readBinaryMessage(SpiEbeanServer server, BinaryReadContext input) throws IOException { @@ -56,7 +56,7 @@ public final class BeanPersistIds implements BinaryWritable { private void read(BinaryReadContext dataInput) throws IOException { dataInput.readInt(); // legacy read type - ids = readIdList(dataInput.in(), beanDescriptor.getIdBinder()); + ids = readIdList(dataInput.in(), beanDescriptor.idBinder()); } @Override @@ -69,7 +69,7 @@ public final class BeanPersistIds implements BinaryWritable { os.writeInt(0); } else { os.writeInt(ids.size()); - IdBinder idBinder = beanDescriptor.getIdBinder(); + IdBinder idBinder = beanDescriptor.idBinder(); for (Object idValue : ids) { idBinder.writeData(os, idValue); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java index 89a831515..675169318 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -73,7 +73,7 @@ public final class DeleteByIdMap { void addDocStoreUpdates(DocStoreUpdates docStoreUpdates, DocStoreMode txnIndexMode) { for (BeanPersistIds deleteIds : beanMap.values()) { BeanDescriptor desc = deleteIds.getBeanDescriptor(); - DocStoreMode mode = desc.getDocStoreMode(PersistRequest.Type.DELETE, txnIndexMode); + DocStoreMode mode = desc.docStoreMode(PersistRequest.Type.DELETE, txnIndexMode); if (DocStoreMode.IGNORE != mode) { // Add to queue or bulk update entries boolean queue = (DocStoreMode.QUEUE == mode); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index b28f6b80f..cd14831e5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -206,7 +206,7 @@ public final class BindParamsParser { String tableName = keyNamedParam.substring(ENCRYPTKEY_PREFIX_LEN, pos); String columnName = keyNamedParam.substring(pos + ENCRYPTKEY_GAP_LEN); - EncryptKey key = beanDescriptor.getEncryptKey(tableName, columnName); + EncryptKey key = beanDescriptor.encryptKey(tableName, columnName); String strKey = key.getStringValue(); return params.setEncryptionKey(keyNamedParam, strKey); diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 99ac21e93..4cd2b692f 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -104,7 +104,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< public DocStoreBeanBaseAdapter(BeanDescriptor desc, DeployBeanDescriptor deploy) { this.desc = desc; - this.server = desc.getEbeanServer(); + this.server = desc.ebeanServer(); this.mapped = deploy.isDocStoreMapped(); this.pathProps = deploy.getDocStorePathProperties(); this.docStore = deploy.getDocStore(); @@ -174,7 +174,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< for (PathProperties.Props pathProp : pathProps) { String path = pathProp.getPath(); if (path != null) { - BeanDescriptor targetDesc = desc.getBeanDescriptor(path); + BeanDescriptor targetDesc = desc.descriptor(path); BeanProperty idProperty = targetDesc.idProperty(); if (idProperty != null) { // embedded beans don't have id property @@ -221,9 +221,9 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< protected int[] getPropertyPositions(Set properties) { List posList = new ArrayList<>(); for (String property : properties) { - BeanProperty prop = desc.getBeanProperty(property); + BeanProperty prop = desc.beanProperty(property); if (prop != null) { - posList.add(prop.getPropertyIndex()); + posList.add(prop.propertyIndex()); } } int[] pos = new int[posList.size()]; @@ -263,7 +263,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< property.docStoreInclude(includeByDefault, docStructure); } - InheritInfo inheritInfo = desc.getInheritInfo(); + InheritInfo inheritInfo = desc.inheritInfo(); if (inheritInfo != null) { inheritInfo.visitChildren(inheritInfo1 -> { for (BeanProperty localProperty : inheritInfo1.localProperties()) { diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java index 5dc796fe6..d2d3a3ac4 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java @@ -84,7 +84,7 @@ public class DocStructure { */ private void prepare(String prop, BeanPropertyAssoc embProp) { - BeanDescriptor targetDesc = embProp.getTargetDescriptor(); + BeanDescriptor targetDesc = embProp.targetDescriptor(); PathProperties manyRootPath = new PathProperties(); manyRootPath.addToPath(null, targetDesc.idProperty().name()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 739e427fb..3f6a1c21e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -79,7 +79,7 @@ public class CacheBeanDataTest extends BaseTestCase { SpiEbeanServer server = spiEbeanServer(); BeanDescriptor desc = server.getBeanDescriptor(EPerson.class); - BeanPropertyAssocOne addressBeanProperty = (BeanPropertyAssocOne) desc.getBeanProperty("address"); + BeanPropertyAssocOne addressBeanProperty = (BeanPropertyAssocOne) desc.beanProperty("address"); EAddress address = new EAddress(); address.setStreet("92 Someplace Else"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index b6b70d8dc..0a3ab0a0d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -24,7 +24,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { @SuppressWarnings("unchecked") private BeanPropertyAssocMany contacts() { - return (BeanPropertyAssocMany) customerDesc.getBeanProperty("contacts"); + return (BeanPropertyAssocMany) customerDesc.beanProperty("contacts"); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index e741e61dc..9bb323448 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -35,8 +35,8 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { assertNotNull(beanDescriptor.idProperty()); assertEquals("id", beanDescriptor.idProperty().name()); - assertNotNull(beanDescriptor.getVersionProperty()); - assertEquals("updtime", beanDescriptor.getVersionProperty().name()); + assertNotNull(beanDescriptor.versionProperty()); + assertEquals("updtime", beanDescriptor.versionProperty().name()); Order order = new Order(); @@ -82,7 +82,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { Order order = new Order(); order.setId(42); - assertEquals(42, orderDesc.getIdForJson(order)); + assertEquals(42, orderDesc.idForJson(order)); assertEquals(42, orderDesc.convertIdFromJson(42)); assertEquals(42, orderDesc.convertIdFromJson("42")); @@ -99,7 +99,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { BeanDescriptor rcustDesc = spiServer.getBeanDescriptor(RCustomer.class); @SuppressWarnings("unchecked") - Map idForJson = (Map) rcustDesc.getIdForJson(rCustomer); + Map idForJson = (Map) rcustDesc.idForJson(rCustomer); assertEquals("comp", idForJson.get("company")); assertEquals("fred", idForJson.get("name")); assertEquals(2, idForJson.size()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index b162952fa..2f1cb654a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -26,17 +26,17 @@ public class TestCollectionLoadedStatus extends BaseTestCase { EntityBean eb = (EntityBean) customer; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - BeanProperty contactsProperty = custDesc.getBeanProperty("contacts"); - assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + BeanProperty contactsProperty = custDesc.beanProperty("contacts"); + assertFalse(ebi.isLoadedProperty(contactsProperty.propertyIndex())); Object contactsViaInternal = contactsProperty.getValue(eb); assertNull(contactsViaInternal); - assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertFalse(ebi.isLoadedProperty(contactsProperty.propertyIndex())); List contacts = customer.getContacts(); assertNotNull(contacts); assertTrue(contacts instanceof BeanCollection); - assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertTrue(ebi.isLoadedProperty(contactsProperty.propertyIndex())); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java index 101212ca9..403fc3d8d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java @@ -6,8 +6,6 @@ import io.ebeaninternal.server.deploy.BeanProperty; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import java.util.EmptyStackException; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -16,7 +14,7 @@ public class GeneratedCounterLongTest extends BaseTestCase { private GeneratedCounterLong counter = new GeneratedCounterLong(); - private BeanProperty version = getBeanDescriptor(Customer.class).getBeanProperty("version"); + private BeanProperty version = getBeanDescriptor(Customer.class).beanProperty("version"); @Test public void when_null_expect_IllegalStateException() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index d9e207338..a90696702 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -89,7 +89,7 @@ public class DLoadContextTest extends BaseTestCase { @Test public void construct_when_fetch_expect_100_100_batchSize() { - BeanPropertyAssocMany many = (BeanPropertyAssocMany)getBeanDescriptor(Order.class).getBeanProperty("details"); + BeanPropertyAssocMany many = (BeanPropertyAssocMany)getBeanDescriptor(Order.class).beanProperty("details"); // the fetch is converted to a query join due to the maxRows OrmQueryRequest queryRequest = queryRequest(query().fetch("details").setMaxRows(50)); queryRequest.initTransIfRequired(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java index f8541b894..a1d2a8c38 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -212,20 +212,20 @@ public class TestAnnotationBase extends BaseTestCase { public void testFindMaxSize() throws SecurityException { BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("constraintAnnotation"); - assertEquals(40, bp.getDbLength()); + assertEquals(40, bp.dbLength()); } @Test public void testFindJakartaMaxSize() throws SecurityException { BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("constraintAnnotation"); - assertEquals(40, bp.getDbLength()); + assertEquals(40, bp.dbLength()); } @Test public void annotationClassIndexes() throws SecurityException { BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class); - final IndexDefinition[] indexDefinitions = descriptor.getIndexDefinitions(); + final IndexDefinition[] indexDefinitions = descriptor.indexDefinitions(); assertEquals(3, indexDefinitions.length); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index 70ce4a9b1..9a18772cf 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -20,7 +20,7 @@ public class TestJodaType extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); - BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); + BeanProperty beanProperty = beanDescriptor.beanProperty("localTime"); ScalarType scalarType = beanProperty.scalarType(); assertNotNull(scalarType); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 681c7807f..204131aa9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -24,7 +24,7 @@ public class TestQueryWithCache extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(Country.class); - CacheOptions cacheOptions = beanDescriptor.getCacheOptions(); + CacheOptions cacheOptions = beanDescriptor.cacheOptions(); assertNotNull(cacheOptions); assertTrue(cacheOptions.isReadOnly()); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index a01e301d1..390189e0a 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -81,7 +81,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); - BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) beanDescriptor.getBeanProperty("userRoles"); + BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) beanDescriptor.beanProperty("userRoles"); List ids = new ArrayList<>(); ids.add(1L); diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index 159c7453b..e0b7431cc 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -23,20 +23,20 @@ public class TestELBasic extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); - ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); + ElPropertyDeploy elId = descriptor.elPropertyDeploy("id"); assertTrue(elId instanceof BeanProperty); - ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress"); + ElPropertyDeploy elBillAddress = descriptor.elPropertyDeploy("billingAddress"); assertTrue(elBillAddress instanceof BeanPropertyAssocOne); - ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); + ElPropertyDeploy elBillAddressId = descriptor.elPropertyDeploy("billingAddress.id"); assertTrue(elBillAddressId instanceof BeanFkeyProperty); assertEquals("billing_address_id", elBillAddressId.dbColumn()); assertEquals("billingAddress.id", elBillAddressId.name()); assertNull(elBillAddressId.elPrefix()); - ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); + ElPropertyDeploy elBillAddressCity = descriptor.elPropertyDeploy("billingAddress.city"); assertTrue(elBillAddressCity instanceof ElPropertyChain); assertEquals("billingAddress", elBillAddressCity.elPrefix()); assertEquals("city", elBillAddressCity.name()); @@ -46,23 +46,23 @@ public class TestELBasic extends BaseTestCase { // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); - ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders"); + ElPropertyDeploy elOrders = descriptor.elPropertyDeploy("orders"); assertTrue(elOrders instanceof BeanPropertyAssocMany); - ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); + ElPropertyDeploy elOrderStatus = descriptor.elPropertyDeploy("orders.status"); assertTrue(elOrderStatus instanceof ElPropertyChain); assertEquals("orders", elOrderStatus.elPrefix()); assertEquals("status", elOrderStatus.name()); assertEquals("${orders}status", elOrderStatus.elPlaceholder(false)); assertEquals("status", elOrderStatus.dbColumn()); - ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); + ElPropertyDeploy elOrderCust = descriptor.elPropertyDeploy("orders.customer"); assertTrue(elOrderCust instanceof ElPropertyChain); - ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details"); + ElPropertyDeploy elOrderDetails = descriptor.elPropertyDeploy("orders.details"); assertTrue(elOrderDetails instanceof ElPropertyChain); - ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id"); + ElPropertyDeploy elOrderDetailsId = descriptor.elPropertyDeploy("orders.details.id"); assertTrue(elOrderDetailsId instanceof ElPropertyChain); } diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java index b02589728..910d4cf72 100644 --- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java @@ -25,8 +25,8 @@ public class TestInheritance extends BaseTestCase { @Test public void testDescriptor() { BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(GrandParentPerson.class); - BeanProperty prop1 = desc.getBeanProperty("someBean"); - BeanProperty prop2 = desc.getBeanProperty("effectiveBean"); + BeanProperty prop1 = desc.beanProperty("someBean"); + BeanProperty prop2 = desc.beanProperty("effectiveBean"); assertEquals(BeanPropertyAssocOne.class, prop1.getClass()); assertEquals(BeanPropertyAssocOne.class, prop2.getClass()); diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 9ef713127..cb3e22a07 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -2,7 +2,6 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyValue; @@ -23,7 +22,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor d = server.getBeanDescriptor(Order.class); - ElPropertyValue elGetValue = d.getElGetValue("customer.contacts"); + ElPropertyValue elGetValue = d.elGetValue("customer.contacts"); assertTrue(elGetValue.containsMany()); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index a0fc9fa7b..be7c97be1 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -26,7 +26,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor descOrder = server.getBeanDescriptor(Order.class); - BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) descOrder.getBeanProperty("details"); + BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) descOrder.beanProperty("details"); List parentIds = new ArrayList<>(); parentIds.add(1); diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java index 7380fec7c..e14ac0f18 100644 --- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java @@ -28,7 +28,7 @@ public class TestInheritWithMany extends BaseTestCase { SpiEbeanServer spiServer = (SpiEbeanServer) server; BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class); - InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); + InheritInfo inheritInfo = beanDescriptor.inheritInfo(); assertNotNull(inheritInfo); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 6cfe3dd5f..5bc946fa7 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -90,10 +90,10 @@ public class MTable { public MTable(BeanDescriptor descriptor) { this.name = descriptor.baseTable(); - this.identityMode = descriptor.getIdentityMode(); - this.storageEngine = descriptor.getStorageEngine(); - this.partitionMeta = descriptor.getPartitionMeta(); - this.comment = descriptor.getDbComment(); + this.identityMode = descriptor.identityMode(); + this.storageEngine = descriptor.storageEngine(); + this.partitionMeta = descriptor.partitionMeta(); + this.comment = descriptor.dbComment(); if (descriptor.isHistorySupport()) { withHistory = true; BeanProperty whenCreated = descriptor.whenCreatedProperty(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java index 4bbc055e2..704fcf0af 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java @@ -36,7 +36,7 @@ public class ModelBuildBeanVisitor implements BeanVisitor { // add the table to the model ctx.addTable(table); - InheritInfo inheritInfo = descriptor.getInheritInfo(); + InheritInfo inheritInfo = descriptor.inheritInfo(); if (inheritInfo != null && inheritInfo.isRoot()) { // add the discriminator column String discColumn = inheritInfo.getDiscriminatorColumn(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java index 6fe58fe6c..939592942 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java @@ -153,7 +153,7 @@ public class ModelBuildContext { private DbPlatformType getDbType(BeanProperty p) { if (p.isDbEncrypted()) { - return dbTypeMap.get(p.getDbEncryptedType()); + return dbTypeMap.get(p.dbEncryptedType()); } if (p.isLocalEncrypted()) { // scalar type potentially wrapping varbinary db type @@ -163,7 +163,7 @@ public class ModelBuildContext { } // can be the logical JSON types (JSON, JSONB, JSONClob, JSONBlob, JSONVarchar) - int dbType = p.getDbType(platformTypes); + int dbType = p.dbType(platformTypes); if (dbType == 0) { throw new RuntimeException("No scalarType defined for " + p.fullName()); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java index 157145d7d..a8a4d944e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java @@ -16,8 +16,8 @@ public class ModelBuildElementTable { */ public static void build(ModelBuildContext ctx, BeanPropertyAssocMany manyProp) { - BeanTable beanTable = manyProp.getBeanTable(); - BeanDescriptor targetDescriptor = manyProp.getTargetDescriptor(); + BeanTable beanTable = manyProp.beanTable(); + BeanDescriptor targetDescriptor = manyProp.targetDescriptor(); MTable table = new MTable(beanTable.getBaseTable()); VisitProperties.visit(targetDescriptor, new ModelBuildPropertyVisitor(ctx, table, targetDescriptor)); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java index e6c0d897d..179de2ef8 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java @@ -24,8 +24,8 @@ class ModelBuildIntersectionTable { ModelBuildIntersectionTable(ModelBuildContext ctx, BeanPropertyAssocMany manyProp) { this.ctx = ctx; this.manyProp = manyProp; - this.intersectionTableJoin = manyProp.getIntersectionTableJoin(); - this.tableJoin = manyProp.getTableJoin(); + this.intersectionTableJoin = manyProp.intersectionTableJoin(); + this.tableJoin = manyProp.tableJoin(); } public MTable build() { @@ -39,7 +39,7 @@ class ModelBuildIntersectionTable { buildFkConstraints(); - if (manyProp.getTargetDescriptor().isDraftable()) { + if (manyProp.targetDescriptor().isDraftable()) { ctx.createDraft(intersectionTable, false); } @@ -50,16 +50,16 @@ class ModelBuildIntersectionTable { if (manyProp.hasForeignKeyConstraint()) { ctx.fkeyBuilder(intersectionTable) - .addForeignKey(manyProp.getBeanDescriptor(), intersectionTableJoin, true) - .addForeignKey(manyProp.getTargetDescriptor(), tableJoin, false); + .addForeignKey(manyProp.descriptor(), intersectionTableJoin, true) + .addForeignKey(manyProp.targetDescriptor(), tableJoin, false); } intersectionTable.checkDuplicateForeignKeys(); } private MTable createTable() { - BeanDescriptor localDesc = manyProp.getBeanDescriptor(); - BeanDescriptor targetDesc = manyProp.getTargetDescriptor(); + BeanDescriptor localDesc = manyProp.descriptor(); + BeanDescriptor targetDesc = manyProp.targetDescriptor(); String tableName = intersectionTableJoin.getTable(); MTable table = new MTable(tableName); @@ -85,7 +85,7 @@ class ModelBuildIntersectionTable { private void addColumn(MTable table, BeanDescriptor desc, String column, String findPropColumn) { - BeanProperty p = desc.getIdBinder().findBeanProperty(findPropColumn); + BeanProperty p = desc.idBinder().findBeanProperty(findPropColumn); if (p == null) { throw new RuntimeException("Could not find id property for " + findPropColumn); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java index e184ea065..bb188442e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -50,7 +50,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { this.ctx = ctx; this.table = table; this.beanDescriptor = beanDescriptor; - addIndexes(beanDescriptor.getIndexDefinitions()); + addIndexes(beanDescriptor.indexDefinitions()); } /** @@ -187,19 +187,19 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { @Override public void visitOneImported(BeanPropertyAssocOne p) { - TableJoinColumn[] columns = p.getTableJoin().columns(); + TableJoinColumn[] columns = p.tableJoin().columns(); if (columns.length == 0) { throw new RuntimeException("No join columns for " + p.fullName()); } - ImportedId importedId = p.getImportedId(); + ImportedId importedId = p.importedId(); List modelColumns = new ArrayList<>(columns.length); MCompoundForeignKey compoundKey = null; if (columns.length > 1) { // compound foreign key - String refTable = p.getTargetDescriptor().baseTable(); + String refTable = p.targetDescriptor().baseTable(); String fkName = foreignKeyConstraintName(p.name()); String fkIndex = foreignKeyIndexName(p.name()); compoundKey = new MCompoundForeignKey(fkName, refTable, fkIndex); @@ -217,22 +217,22 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { String refColumn = importedProperty.dbColumn(); MColumn col = table.addColumn(dbCol, columnDefn, !p.isNullable()); - col.setDbMigrationInfos(p.getDbMigrationInfos()); - col.setDefaultValue(p.getDbColumnDefault()); + col.setDbMigrationInfos(p.dbMigrationInfos()); + col.setDefaultValue(p.dbColumnDefault()); if (columns.length == 1) { - if (p.hasForeignKeyConstraint() && !importedProperty.getBeanDescriptor().suppressForeignKey()) { + if (p.hasForeignKeyConstraint() && !importedProperty.descriptor().suppressForeignKey()) { // single references column (put it on the column) - String refTable = importedProperty.getBeanDescriptor().getBaseTable(); + String refTable = importedProperty.descriptor().getBaseTable(); if (refTable == null) { // odd case where an EmbeddedId only has 1 property - refTable = p.getTargetDescriptor().getBaseTable(); + refTable = p.targetDescriptor().getBaseTable(); } col.setReferences(refTable + "." + refColumn); col.setForeignKeyName(foreignKeyConstraintName(col.getName())); if (p.hasForeignKeyIndex()) { col.setForeignKeyIndex(foreignKeyIndexName(col.getName())); } - PropertyForeignKey foreignKey = p.getForeignKey(); + PropertyForeignKey foreignKey = p.foreignKey(); if (foreignKey != null) { col.setForeignKeyModes(foreignKey.getOnDelete(), foreignKey.getOnUpdate()); } @@ -269,16 +269,16 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { // using non-strict mode to render the DB type such that we have a // "logical" type like jsonb(200) that can map to JSONB or VARCHAR(200) MColumn col = new MColumn(p.dbColumn(), ctx.getColumnDefn(p, false)); - col.setComment(p.getDbComment()); + col.setComment(p.dbComment()); col.setDraftOnly(p.isDraftOnly()); col.setHistoryExclude(p.isExcludedFromHistory()); if (p.isId() || p.isImportedPrimaryKey()) { col.setPrimaryKey(true); - if (p.getBeanDescriptor().isUseIdGenerator()) { + if (p.descriptor().isUseIdGenerator()) { col.setIdentity(true); } - TableJoin primaryKeyJoin = p.getBeanDescriptor().getPrimaryKeyJoin(); + TableJoin primaryKeyJoin = p.descriptor().primaryKeyJoin(); if (primaryKeyJoin != null && !table.isPartitioned()) { final PropertyForeignKey foreignKey = primaryKeyJoin.getForeignKey(); if (foreignKey == null || !foreignKey.isNoConstraint()) { @@ -291,22 +291,22 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { } } } else { - col.setDefaultValue(p.getDbColumnDefault()); + col.setDefaultValue(p.dbColumnDefault()); if (allowNonNull && (!p.isNullable() || p.isDDLNotNull())) { col.setNotnull(true); } } - col.setDbMigrationInfos(p.getDbMigrationInfos()); + col.setDbMigrationInfos(p.dbMigrationInfos()); if (p.isUnique() && !p.isId()) { col.setUnique(uniqueConstraintName(col.getName())); indexSetAdd(col.getName()); } - Set checkConstraintValues = p.getDbCheckConstraintValues(); + Set checkConstraintValues = p.dbCheckConstraintValues(); if (checkConstraintValues != null) { if (beanDescriptor.hasInheritance()) { - InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); + InheritInfo inheritInfo = beanDescriptor.inheritInfo(); inheritInfo.appendCheckConstraintValues(p.name(), checkConstraintValues); } col.setCheckConstraint(buildCheckConstraint(p.dbColumn(), checkConstraintValues)); From 93ff2ef2e40599fd106f6b828adc15f4e3b14ab1 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 15:25:18 +1200 Subject: [PATCH 082/102] #2359 - Rename internal methods - SpiEbeanServer --- .../autotune/service/ProfileManager.java | 2 +- .../org/tests/autofetch/BaseTestCase.java | 2 +- .../io/ebeaninternal/api/SpiEbeanServer.java | 22 +++--- .../server/core/BeanRequest.java | 2 +- .../server/core/DefaultBeanLoader.java | 4 +- .../server/core/DefaultServer.java | 68 +++++++++---------- .../server/core/DtoQueryRequest.java | 2 +- .../server/core/OrmQueryRequest.java | 4 +- .../server/deploy/BeanDescriptor.java | 4 +- .../server/persist/DefaultPersister.java | 4 +- .../server/query/CQueryPlan.java | 4 +- .../server/text/json/DJsonContext.java | 2 +- .../server/text/json/WriteJson.java | 2 +- .../server/transaction/BeanPersistIds.java | 2 +- .../src/test/java/io/ebean/BaseTestCase.java | 6 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 22 +++--- .../server/cache/CacheBeanDataTest.java | 4 +- .../cache/CachedBeanDataFromBeanTest.java | 4 +- .../BinaryTransactionEventReadWriteTest.java | 2 +- .../server/core/TestDiffHelpSimple.java | 2 +- .../server/core/TestDiffHelpWithEmbedded.java | 2 +- .../server/deploy/BeanDescriptorTest.java | 12 ++-- .../deploy/BeanDescriptor_registerTest.java | 2 +- ...eanDescriptor_whenCreatedPropertyTest.java | 4 +- .../deploy/BeanPropertyAssocManyTest.java | 2 +- .../TestBeanDescriptorHasIdProperty.java | 10 +-- .../deploy/TestCollectionLoadedStatus.java | 2 +- .../deploy/TestDiffHelpInsertSimple.java | 2 +- .../TestDiffHelpInsertWithEmbedded.java | 2 +- .../server/text/json/WriteJsonDirtyTest.java | 2 +- .../transaction/TransactionManagerTest.java | 2 +- .../support/DocStoreBeanBaseAdapterTest.java | 2 +- .../org/tests/basic/TestAnnotationBase.java | 10 +-- .../java/org/tests/basic/TestJodaType.java | 2 +- .../org/tests/basic/TestQueryWithCache.java | 2 +- .../basic/delete/TestDeleteByIdList.java | 2 +- .../basic/delete/TestDeleteCascadeById.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 2 +- .../test/java/org/tests/el/TestELBasic.java | 2 +- .../org/tests/family/TestInheritance.java | 2 +- .../java/org/tests/genkey/TestSeqBatch.java | 2 +- .../lifecycle/TestLifecycleAnnotatedBean.java | 3 +- .../TestPersistenceContextServerConfig.java | 2 +- .../joins/TestQueryJoinQueryNonRoot.java | 2 +- .../query/other/TestManyLazyLoadingQuery.java | 2 +- .../org/tests/test/TestInheritWithMany.java | 2 +- .../json/TestJsonBeanDescriptorParse.java | 2 +- .../text/json/TestTextJsonReferenceBean.java | 4 +- .../model/visitor/VisitAllUsing.java | 2 +- .../src/test/java/io/ebean/BaseTestCase.java | 4 +- 50 files changed, 128 insertions(+), 129 deletions(-) diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java index 170a3a406..019955114 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java @@ -111,7 +111,7 @@ public class ProfileManager implements ProfilingListener { public AutoTuneCollection profilingCollection(boolean reset) { AutoTuneCollection req = new AutoTuneCollection(); for (ProfileOrigin origin : profileMap.values()) { - BeanDescriptor desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType()); + BeanDescriptor desc = server.descriptorById(origin.getOrigin().getBeanType()); if (desc != null) { origin.profilingCollection(desc, req, reset); } diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java b/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java index e59dbbb4b..102affc90 100644 --- a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java +++ b/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java @@ -11,6 +11,6 @@ public class BaseTestCase { } protected BeanDescriptor getBeanDescriptor(Class cls) { - return spiEbeanServer().getBeanDescriptor(cls); + return spiEbeanServer().descriptor(cls); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index b964d2296..449a528f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -63,7 +63,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, /** * Return the PersistenceContextScope to use defined at query or server level. */ - PersistenceContextScope getPersistenceContextScope(SpiQuery query); + PersistenceContextScope persistenceContextScope(SpiQuery query); /** * Clear the query execution statistics. @@ -73,32 +73,32 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, /** * Return the transaction manager. */ - SpiTransactionManager getTransactionManager(); + SpiTransactionManager transactionManager(); /** * Return all the descriptors. */ - List> getBeanDescriptors(); + List> descriptors(); /** * Return the BeanDescriptor for a given type of bean. */ - BeanDescriptor getBeanDescriptor(Class type); + BeanDescriptor descriptor(Class type); /** * Return BeanDescriptor using it's unique id. */ - BeanDescriptor getBeanDescriptorById(String className); + BeanDescriptor descriptorById(String className); /** * Return BeanDescriptor using it's unique doc store queueId. */ - BeanDescriptor getBeanDescriptorByQueueId(String queueId); + BeanDescriptor descriptorByQueueId(String queueId); /** * Return BeanDescriptors mapped to this table. */ - List> getBeanDescriptors(String tableName); + List> descriptors(String tableName); /** * Process committed changes from another framework. @@ -170,7 +170,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, /** * Return the default batch size for lazy loading. */ - int getLazyLoadBatchSize(); + int lazyLoadBatchSize(); /** * Return true if the type is known as an Entity or Xml type or a List Set or @@ -181,18 +181,18 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, /** * Return the ReadAuditLogger to use for logging all read audit events. */ - ReadAuditLogger getReadAuditLogger(); + ReadAuditLogger readAuditLogger(); /** * Return the ReadAuditPrepare used to populate the read audit events with * user context information (user id, user ip address etc). */ - ReadAuditPrepare getReadAuditPrepare(); + ReadAuditPrepare readAuditPrepare(); /** * Return the DataTimeZone to use when reading/writing timestamps via JDBC. */ - DataTimeZone getDataTimeZone(); + DataTimeZone dataTimeZone(); /** * Check for slow query event. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java index bce3efb0c..0bec5a5a5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -122,6 +122,6 @@ public abstract class BeanRequest { * Return the DataTimeZone to use. */ public DataTimeZone dataTimeZone() { - return server.getDataTimeZone(); + return server.dataTimeZone(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 834b6ed7c..826f3a15f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -54,7 +54,7 @@ final class DefaultBeanLoader { private void loadManyInternal(EntityBean parentBean, String propertyName, Transaction t, boolean refresh, boolean onlyIds) { EntityBeanIntercept ebi = parentBean._ebean_getIntercept(); PersistenceContext pc = ebi.getPersistenceContext(); - BeanDescriptor parentDesc = server.getBeanDescriptor(parentBean.getClass()); + BeanDescriptor parentDesc = server.descriptor(parentBean.getClass()); BeanPropertyAssocMany many = (BeanPropertyAssocMany) parentDesc.beanProperty(propertyName); BeanCollection beanCollection = null; ExpressionList filterMany = null; @@ -176,7 +176,7 @@ final class DefaultBeanLoader { pc = null; } - BeanDescriptor desc = server.getBeanDescriptor(bean.getClass()); + BeanDescriptor desc = server.descriptor(bean.getClass()); if (EntityType.EMBEDDED == desc.entityType()) { // lazy loading on an embedded bean property EntityBean embeddedOwner = (EntityBean) ebi.getEmbeddedOwner(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 44d5b5814..b5ae8d560 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -295,7 +295,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int getLazyLoadBatchSize() { + public int lazyLoadBatchSize() { return lazyLoadBatchSize; } @@ -320,7 +320,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DataTimeZone getDataTimeZone() { + public DataTimeZone dataTimeZone() { return dataTimeZone; } @@ -365,12 +365,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public ReadAuditPrepare getReadAuditPrepare() { + public ReadAuditPrepare readAuditPrepare() { return readAuditPrepare; } @Override - public ReadAuditLogger getReadAuditLogger() { + public ReadAuditLogger readAuditLogger() { return readAuditLogger; } @@ -595,7 +595,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (a == null) { return null; } - BeanDescriptor desc = getBeanDescriptor(a.getClass()); + BeanDescriptor desc = descriptor(a.getClass()); return DiffHelp.diff(a, b, desc); } @@ -628,7 +628,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { public void truncate(Class... types) { List tableNames = new ArrayList<>(); for (Class type : types) { - tableNames.add(getBeanDescriptor(type).baseTable()); + tableNames.add(descriptor(type).baseTable()); } truncate(tableNames.toArray(new String[0])); } @@ -659,7 +659,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public void clearQueryStatistics() { - for (BeanDescriptor desc : getBeanDescriptors()) { + for (BeanDescriptor desc : descriptors()) { desc.clearQueryStatistics(); } } @@ -674,7 +674,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public T createEntityBean(Class type) { - return getBeanDescriptor(type).createBean(); + return descriptor(type).createBean(); } /** @@ -691,7 +691,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (id == null) { throw new NullPointerException("The id is null"); } - BeanDescriptor desc = getBeanDescriptor(type); + BeanDescriptor desc = descriptor(type); id = desc.convertId(id); PersistenceContext pc = null; SpiTransaction t = transactionManager.getActive(); @@ -852,7 +852,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Object nextId(Class beanType) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); return desc.nextId(null); } @@ -871,7 +871,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } // use first bean in the list as the correct type Class beanType = (Class) list.get(0).getClass(); - BeanDescriptor beanDescriptor = getBeanDescriptor(beanType); + BeanDescriptor beanDescriptor = descriptor(beanType); if (beanDescriptor == null) { throw new PersistenceException("BeanDescriptor not found, is [" + beanType + "] an entity bean?"); } @@ -880,7 +880,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Set validateQuery(Query query) { - BeanDescriptor beanDescriptor = getBeanDescriptor(query.getBeanType()); + BeanDescriptor beanDescriptor = descriptor(query.getBeanType()); if (beanDescriptor == null) { throw new PersistenceException("BeanDescriptor not found, is [" + query.getBeanType() + "] an entity bean?"); } @@ -889,7 +889,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Filter filter(Class beanType) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); if (desc == null) { String m = beanType.getName() + " is NOT an Entity Bean registered with this server?"; throw new PersistenceException(m); @@ -899,7 +899,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public CsvReader createCsvReader(Class beanType) { - BeanDescriptor descriptor = getBeanDescriptor(beanType); + BeanDescriptor descriptor = descriptor(beanType); if (descriptor == null) { throw new NullPointerException("BeanDescriptor for " + beanType.getName() + " not found"); } @@ -923,7 +923,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public void merge(Object bean, MergeOptions options, Transaction transaction) { - BeanDescriptor desc = getBeanDescriptor(bean.getClass()); + BeanDescriptor desc = descriptor(bean.getClass()); if (desc == null) { throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?"); } @@ -937,7 +937,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Query findNative(Class beanType, String nativeSql) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); if (desc == null) { throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?"); } @@ -948,7 +948,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Query createNamedQuery(Class beanType, String namedQuery) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); if (desc == null) { throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?"); } @@ -974,7 +974,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public DefaultOrmQuery createQuery(Class beanType) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); if (desc == null) { throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?"); } @@ -983,7 +983,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Update createUpdate(Class beanType, String ormUpdate) { - BeanDescriptor desc = getBeanDescriptor(beanType); + BeanDescriptor desc = descriptor(beanType); if (desc == null) { String m = beanType.getName() + " is NOT an Entity Bean registered with this server?"; throw new PersistenceException(m); @@ -1134,14 +1134,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return true if transactions PersistenceContext should be used. */ private boolean useTransactionPersistenceContext(SpiQuery query) { - return PersistenceContextScope.TRANSACTION == getPersistenceContextScope(query); + return PersistenceContextScope.TRANSACTION == persistenceContextScope(query); } /** * Return the PersistenceContextScope to use defined at query or server level. */ @Override - public PersistenceContextScope getPersistenceContextScope(SpiQuery query) { + public PersistenceContextScope persistenceContextScope(SpiQuery query) { PersistenceContextScope scope = query.getPersistenceContextScope(); return (scope != null) ? scope : defaultPersistenceContextScope; } @@ -2048,7 +2048,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return all the BeanDescriptors. */ @Override - public List> getBeanDescriptors() { + public List> descriptors() { return beanDescriptorManager.getBeanDescriptorList(); } @@ -2056,7 +2056,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the transaction manager. */ @Override - public SpiTransactionManager getTransactionManager() { + public SpiTransactionManager transactionManager() { return transactionManager; } @@ -2075,13 +2075,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public boolean isSupportedType(java.lang.reflect.Type genericType) { TypeInfo typeInfo = ParamTypeHelper.getTypeInfo(genericType); - return typeInfo != null && getBeanDescriptor(typeInfo.getBeanType()) != null; + return typeInfo != null && descriptor(typeInfo.getBeanType()) != null; } @Override public Object beanId(Object bean, Object id) { EntityBean eb = checkEntityBean(bean); - BeanDescriptor desc = getBeanDescriptor(bean.getClass()); + BeanDescriptor desc = descriptor(bean.getClass()); if (desc == null) { throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?"); } @@ -2091,7 +2091,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Object beanId(Object bean) { EntityBean eb = checkEntityBean(bean); - BeanDescriptor desc = getBeanDescriptor(bean.getClass()); + BeanDescriptor desc = descriptor(bean.getClass()); if (desc == null) { throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?"); } @@ -2102,7 +2102,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the BeanDescriptor for a given type of bean. */ @Override - public BeanDescriptor getBeanDescriptor(Class beanClass) { + public BeanDescriptor descriptor(Class beanClass) { return beanDescriptorManager.getBeanDescriptor(beanClass); } @@ -2110,7 +2110,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Return the BeanDescriptor's for a given table name. */ @Override - public List> getBeanDescriptors(String tableName) { + public List> descriptors(String tableName) { return beanDescriptorManager.getBeanDescriptors(tableName); } @@ -2119,7 +2119,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public List> beanTypes() { - return getBeanDescriptors(); + return descriptors(); } /** @@ -2132,11 +2132,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public BeanType beanTypeForQueueId(String queueId) { - return getBeanDescriptorByQueueId(queueId); + return descriptorByQueueId(queueId); } @Override - public BeanDescriptor getBeanDescriptorByQueueId(String queueId) { + public BeanDescriptor descriptorByQueueId(String queueId) { return beanDescriptorManager.getBeanDescriptorByQueueId(queueId); } @@ -2145,14 +2145,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public BeanType beanType(Class beanType) { - return getBeanDescriptor(beanType); + return descriptor(beanType); } /** * Return the BeanDescriptor using its class name. */ @Override - public BeanDescriptor getBeanDescriptorById(String beanClassName) { + public BeanDescriptor descriptorById(String beanClassName) { return beanDescriptorManager.getBeanDescriptorByClassName(beanClassName); } @@ -2278,7 +2278,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public Set checkUniqueness(Object bean, Transaction transaction) { EntityBean entityBean = checkEntityBean(bean); - BeanDescriptor beanDesc = getBeanDescriptor(entityBean.getClass()); + BeanDescriptor beanDesc = descriptor(entityBean.getClass()); BeanProperty idProperty = beanDesc.idProperty(); // if the ID of the Property is null we are unable to check uniqueness if (idProperty == null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index e03ce40ce..58c5dae77 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -66,7 +66,7 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { @Override protected void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException { this.resultSet = resultSet; - this.dataReader = new RsetDataReader(server.getDataTimeZone(), resultSet); + this.dataReader = new RsetDataReader(server.dataTimeZone(), resultSet); obtainPlan(queryPlanKey); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 11bdc6470..64f63a0fc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -325,7 +325,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery if (ctx != null) return ctx; // determine the scope (from the query and then server) - PersistenceContextScope scope = server.getPersistenceContextScope(query); + PersistenceContextScope scope = server.persistenceContextScope(query); if (scope == PersistenceContextScope.QUERY || t == null) { return new DefaultPersistenceContext(); } @@ -745,7 +745,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ public int lazyLoadBatchSize() { int batchSize = query.getLazyLoadBatchSize(); - return (batchSize > 0) ? batchSize : server.getLazyLoadBatchSize(); + return (batchSize > 0) ? batchSize : server.lazyLoadBatchSize(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 5a809be00..0fbf5b800 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -759,14 +759,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the ReadAuditLogger for logging read audit events. */ public ReadAuditLogger readAuditLogger() { - return ebeanServer.getReadAuditLogger(); + return ebeanServer.readAuditLogger(); } /** * Return the ReadAuditPrepare for preparing read audit events prior to logging. */ private ReadAuditPrepare readAuditPrepare() { - return ebeanServer.getReadAuditPrepare(); + return ebeanServer.readAuditPrepare(); } public boolean isChangeLog() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index f33ebe235..699fbe48f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -175,7 +175,7 @@ public final class DefaultPersister implements Persister { public List draftRestore(Query query, Transaction transaction) { Class beanType = query.getBeanType(); - BeanDescriptor desc = server.getBeanDescriptor(beanType); + BeanDescriptor desc = server.descriptor(beanType); DraftHandler draftHandler = new DraftHandler<>(desc, transaction); @@ -220,7 +220,7 @@ public final class DefaultPersister implements Persister { public List publish(Query query, Transaction transaction) { Class beanType = query.getBeanType(); - BeanDescriptor desc = server.getBeanDescriptor(beanType); + BeanDescriptor desc = server.descriptor(beanType); DraftHandler draftHandler = new DraftHandler<>(desc, transaction); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 10b243f1e..ccaf22f41 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -86,7 +86,7 @@ public class CQueryPlan implements SpiQueryPlan { */ CQueryPlan(OrmQueryRequest request, SqlLimitResponse sqlRes, SqlTree sqlTree, boolean rawSql, String logWhereSql) { this.server = request.server(); - this.dataTimeZone = server.getDataTimeZone(); + this.dataTimeZone = server.dataTimeZone(); this.beanType = request.descriptor().type(); this.planKey = request.queryPlanKey(); SpiQuery query = request.query(); @@ -111,7 +111,7 @@ public class CQueryPlan implements SpiQueryPlan { */ CQueryPlan(OrmQueryRequest request, String sql, SqlTree sqlTree, String logWhereSql) { this.server = request.server(); - this.dataTimeZone = server.getDataTimeZone(); + this.dataTimeZone = server.dataTimeZone(); this.beanType = request.descriptor().type(); SpiQuery query = request.query(); this.profileLocation = query.getProfileLocation(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index 12866b61c..cbfb73559 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -425,7 +425,7 @@ public final class DJsonContext implements SpiJsonContext { * Return the BeanDescriptor for the given bean type. */ private BeanDescriptor getDescriptor(Class beanType) { - BeanDescriptor d = server.getBeanDescriptor(beanType); + BeanDescriptor d = server.descriptor(beanType); if (d == null) { throw new RuntimeException("No BeanDescriptor found for " + beanType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index e458a7ce1..17c9e9372 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -600,7 +600,7 @@ public final class WriteJson implements SpiJsonWriter { } private BeanDescriptor getDescriptor(Class cls) { - BeanDescriptor d = server.getBeanDescriptor(cls); + BeanDescriptor d = server.descriptor(cls); if (d == null) { throw new RuntimeException("No BeanDescriptor found for " + cls); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java index 02b66191b..919f0838d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java @@ -47,7 +47,7 @@ public final class BeanPersistIds implements BinaryWritable { public static BeanPersistIds readBinaryMessage(SpiEbeanServer server, BinaryReadContext input) throws IOException { - BeanDescriptor desc = server.getBeanDescriptorById(input.readUTF()); + BeanDescriptor desc = server.descriptorById(input.readUTF()); BeanPersistIds bp = new BeanPersistIds(desc); bp.read(input); return bp; diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index 3960bdc42..4f023c12e 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -38,7 +38,7 @@ public abstract class BaseTestCase { @AfterEach public void checkForLeak(TestInfo testInfo) { - TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope(); + TransactionScopeManager scope = spiEbeanServer().transactionManager().scope(); SpiTransaction trans = scope.getInScope(); if (trans != null) { String msg = getClass().getSimpleName() + "." + testInfo.getDisplayName() + " did not clear threadScope:" + trans; @@ -99,7 +99,7 @@ public abstract class BaseTestCase { } protected SpiTransaction getInScopeTransaction() { - return spiEbeanServer().getTransactionManager().scope().getInScope(); + return spiEbeanServer().transactionManager().scope().getInScope(); } /** @@ -235,7 +235,7 @@ public abstract class BaseTestCase { } protected BeanDescriptor getBeanDescriptor(Class cls) { - return spiEbeanServer().getBeanDescriptor(cls); + return spiEbeanServer().descriptor(cls); } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index ae80084f4..17bd8f19b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -104,7 +104,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { } @Override - public DataTimeZone getDataTimeZone() { + public DataTimeZone dataTimeZone() { return null; } @@ -139,7 +139,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { } @Override - public PersistenceContextScope getPersistenceContextScope(SpiQuery query) { + public PersistenceContextScope persistenceContextScope(SpiQuery query) { return null; } @@ -149,12 +149,12 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { } @Override - public ReadAuditLogger getReadAuditLogger() { + public ReadAuditLogger readAuditLogger() { return null; } @Override - public ReadAuditPrepare getReadAuditPrepare() { + public ReadAuditPrepare readAuditPrepare() { return null; } @@ -164,32 +164,32 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { } @Override - public BeanDescriptor getBeanDescriptorByQueueId(String queueId) { + public BeanDescriptor descriptorByQueueId(String queueId) { return null; } @Override - public SpiTransactionManager getTransactionManager() { + public SpiTransactionManager transactionManager() { return null; } @Override - public List> getBeanDescriptors() { + public List> descriptors() { return null; } @Override - public BeanDescriptor getBeanDescriptor(Class type) { + public BeanDescriptor descriptor(Class type) { return null; } @Override - public BeanDescriptor getBeanDescriptorById(String descriptorId) { + public BeanDescriptor descriptorById(String descriptorId) { return null; } @Override - public List> getBeanDescriptors(String tableName) { + public List> descriptors(String tableName) { return null; } @@ -277,7 +277,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { } @Override - public int getLazyLoadBatchSize() { + public int lazyLoadBatchSize() { return 0; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 3f6a1c21e..30a3e5afc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -26,7 +26,7 @@ public class CacheBeanDataTest extends BaseTestCase { public void extract_load_on_customer() { SpiEbeanServer server = spiEbeanServer(); - BeanDescriptor desc = server.getBeanDescriptor(Customer.class); + BeanDescriptor desc = server.descriptor(Customer.class); Customer c = new Customer(); c.setId(98989); @@ -78,7 +78,7 @@ public class CacheBeanDataTest extends BaseTestCase { public void extract_load_withEmbeddedBean() { SpiEbeanServer server = spiEbeanServer(); - BeanDescriptor desc = server.getBeanDescriptor(EPerson.class); + BeanDescriptor desc = server.descriptor(EPerson.class); BeanPropertyAssocOne addressBeanProperty = (BeanPropertyAssocOne) desc.beanProperty("address"); EAddress address = new EAddress(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index 8e59de674..cd6114904 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -24,7 +24,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase { @Test public void extract() { - BeanDescriptor desc = server.getBeanDescriptor(Customer.class); + BeanDescriptor desc = server.descriptor(Customer.class); Date largeDate = new Date(9223372036825200000L); @@ -56,7 +56,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase { car.setDriver("Jimmy"); car.setNotes("some notes"); - BeanDescriptor carDesc = server.getBeanDescriptor(Car.class); + BeanDescriptor carDesc = server.descriptor(Car.class); CachedBeanData cacheData = CachedBeanDataFromBean.extract(carDesc, (EntityBean) car); Car newCar = new Car(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 8ca823b84..c77b855e0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -100,7 +100,7 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase { class TDEbeanServer extends TDSpiEbeanServer { @Override - public BeanDescriptor getBeanDescriptorById(String descriptorId) { + public BeanDescriptor descriptorById(String descriptorId) { return customerBeanDescriptor; } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index a380d2bb7..56be7e09c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -29,7 +29,7 @@ public class TestDiffHelpSimple extends BaseTestCase { public TestDiffHelpSimple() { server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; - orderDesc = spiServer.getBeanDescriptor(Order.class); + orderDesc = spiServer.descriptor(Order.class); } private Order createBaseOrder(Database server) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 308e0239c..6b3371bfb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -23,7 +23,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { public TestDiffHelpWithEmbedded() { server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; - emainDesc = spiServer.getBeanDescriptor(EMain.class); + emainDesc = spiServer.descriptor(EMain.class); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index 025b05c51..382397c9b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; public class BeanDescriptorTest extends BaseTestCase { - private BeanDescriptor customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class); + private BeanDescriptor customerDesc = spiEbeanServer().descriptor(Customer.class); @Test public void createReference() { @@ -74,7 +74,7 @@ public class BeanDescriptorTest extends BaseTestCase { DB.save(shelter); - BeanDescriptor animalDesc = spiEbeanServer().getBeanDescriptor(Animal.class); + BeanDescriptor animalDesc = spiEbeanServer().descriptor(Animal.class); Animal bean = animalDesc.createReference(Boolean.FALSE, false, dog.getId(), null); assertThat(bean.getId()).isEqualTo(dog.getId()); @@ -142,7 +142,7 @@ public class BeanDescriptorTest extends BaseTestCase { @Test public void isIdTypeExternal_when_externalId() { - BeanDescriptor countryDesc = spiEbeanServer().getBeanDescriptor(Country.class); + BeanDescriptor countryDesc = spiEbeanServer().descriptor(Country.class); assertThat(countryDesc.isIdGeneratedValue()).isFalse(); } @@ -155,21 +155,21 @@ public class BeanDescriptorTest extends BaseTestCase { @Test public void isIdTypeExternal_when_explicitGeneratedValue() { - BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(Contact.class); + BeanDescriptor desc = spiEbeanServer().descriptor(Contact.class); assertThat(desc.isIdGeneratedValue()).isTrue(); } @Test public void isIdTypeExternal_when_uuidGenerator_and_generatedValue() { - BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(BSite.class); + BeanDescriptor desc = spiEbeanServer().descriptor(BSite.class); assertThat(desc.isIdGeneratedValue()).isTrue(); } @Test public void isIdTypeExternal_when_uuidGenerator_and_noGeneratedValue() { - BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(BUser.class); + BeanDescriptor desc = spiEbeanServer().descriptor(BUser.class); assertThat(desc.isIdGeneratedValue()).isFalse(); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 0ee380ee2..b3883db7e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -27,7 +27,7 @@ public class BeanDescriptor_registerTest { SpiEbeanServer ebeanServer = (SpiEbeanServer)DatabaseFactory.create(config); try { - BeanDescriptor desc = ebeanServer.getBeanDescriptor(EBasic.class); + BeanDescriptor desc = ebeanServer.descriptor(EBasic.class); persistListenerRegistrationTests(desc); persistControllerRegistrationTests(desc); } finally { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 5a09b7286..4cbffc35c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -19,7 +19,7 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor desc = server.getBeanDescriptor(Customer.class); + BeanDescriptor desc = server.descriptor(Customer.class); BeanProperty whenCreatedProperty = desc.whenCreatedProperty(); assertEquals("cretime", whenCreatedProperty.dbColumn()); @@ -28,7 +28,7 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { assertEquals("updtime", whenModifiedProperty.dbColumn()); - BeanDescriptor eBasicDesc = server.getBeanDescriptor(EBasic.class); + BeanDescriptor eBasicDesc = server.descriptor(EBasic.class); assertNull(eBasicDesc.whenCreatedProperty()); assertNull(eBasicDesc.whenModifiedProperty()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index 0a3ab0a0d..048871533 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class BeanPropertyAssocManyTest extends BaseTestCase { - private BeanDescriptor customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class); + private BeanDescriptor customerDesc = spiEbeanServer().descriptor(Customer.class); @SuppressWarnings("unchecked") private BeanPropertyAssocMany contacts() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 9bb323448..db7c3ea55 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -31,7 +31,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { @Test public void testHasId() { - BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Order.class); + BeanDescriptor beanDescriptor = spiServer.descriptor(Order.class); assertNotNull(beanDescriptor.idProperty()); assertEquals("id", beanDescriptor.idProperty().name()); @@ -54,7 +54,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { @Test public void testIsReference() { - BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Customer.class); + BeanDescriptor beanDescriptor = spiServer.descriptor(Customer.class); Customer order = new Customer(); EntityBeanIntercept ebi = getIntercept(order); @@ -69,7 +69,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { @Test public void isReference_withGeneratedOnInsertOnlyProperty_expect_false() { - BeanDescriptor descriptor = spiServer.getBeanDescriptor(UserInterestLive.class); + BeanDescriptor descriptor = spiServer.descriptor(UserInterestLive.class); UserInterestLive bean = new UserInterestLive(new UserInterestLiveKey(1L, 2L)); EntityBeanIntercept ebi = getIntercept(bean); assertFalse(descriptor.referenceIdPropertyOnly(ebi)); @@ -78,7 +78,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { @Test public void test_getIdForJson() { - BeanDescriptor orderDesc = spiServer.getBeanDescriptor(Order.class); + BeanDescriptor orderDesc = spiServer.descriptor(Order.class); Order order = new Order(); order.setId(42); @@ -96,7 +96,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { RCustomer rCustomer = new RCustomer(); rCustomer.setKey(key); - BeanDescriptor rcustDesc = spiServer.getBeanDescriptor(RCustomer.class); + BeanDescriptor rcustDesc = spiServer.descriptor(RCustomer.class); @SuppressWarnings("unchecked") Map idForJson = (Map) rcustDesc.idForJson(rCustomer); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 2f1cb654a..406dbd2ef 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -20,7 +20,7 @@ public class TestCollectionLoadedStatus extends BaseTestCase { public void test() { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); + BeanDescriptor custDesc = server.descriptor(Customer.class); Customer customer = new Customer(); EntityBean eb = (EntityBean) customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index e6675b99e..6ad4e5ba0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -30,7 +30,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase { public TestDiffHelpInsertSimple() { server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; - orderDesc = spiServer.getBeanDescriptor(Order.class); + orderDesc = spiServer.descriptor(Order.class); } private Order createBaseOrder(Database server) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index 30154c184..f835cc427 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -22,7 +22,7 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase { public TestDiffHelpInsertWithEmbedded() { Database server = DB.getDefault(); SpiEbeanServer spiServer = (SpiEbeanServer) server; - emainDesc = spiServer.getBeanDescriptor(EMain.class); + emainDesc = spiServer.descriptor(EMain.class); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index a28ac7ca3..5ebd28abe 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -30,7 +30,7 @@ public class WriteJsonDirtyTest { .findOne(); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); + BeanDescriptor descriptor = server.descriptor(Customer.class); customer.setName("dirtyCustName"); customer.setAnniversary(new Date(System.currentTimeMillis())); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java index 0410b6296..62f89784a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java @@ -28,7 +28,7 @@ public class TransactionManagerTest extends BaseTestCase { SpiEbeanServer server = spiEbeanServer(); - SpiTransactionManager transactionManager = server.getTransactionManager(); + SpiTransactionManager transactionManager = server.transactionManager(); DataSource dataSource = transactionManager.getDataSource(); Connection connection = dataSource.getConnection(); diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index e792aa0cc..89a4a5241 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -25,7 +25,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { public void test_basic_construction() throws Exception { SpiEbeanServer server = spiEbeanServer(); - BeanDescriptor orderDesc = server.getBeanDescriptor(Order.class); + BeanDescriptor orderDesc = server.descriptor(Order.class); DeployBeanDescriptor deployDesc = (DeployBeanDescriptor) mock(DeployBeanDescriptor.class); diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java index a1d2a8c38..23794b476 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -210,28 +210,28 @@ public class TestAnnotationBase extends BaseTestCase { @Test public void testFindMaxSize() throws SecurityException { - BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class); + BeanDescriptor descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("constraintAnnotation"); assertEquals(40, bp.dbLength()); } @Test public void testFindJakartaMaxSize() throws SecurityException { - BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class); + BeanDescriptor descriptor = spiEbeanServer().descriptor(TestJakartaAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("constraintAnnotation"); assertEquals(40, bp.dbLength()); } @Test public void annotationClassIndexes() throws SecurityException { - BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class); + BeanDescriptor descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class); final IndexDefinition[] indexDefinitions = descriptor.indexDefinitions(); assertEquals(3, indexDefinitions.length); } @Test public void testNotNullWithGroup() throws SecurityException { - BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class); + BeanDescriptor descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("null1"); assertFalse(bp.isNullable()); @@ -245,7 +245,7 @@ public class TestAnnotationBase extends BaseTestCase { @Test public void testJakartaNotNullWithGroup() throws SecurityException { - BeanDescriptor descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class); + BeanDescriptor descriptor = spiEbeanServer().descriptor(TestJakartaAnnotationBaseEntity.class); BeanProperty bp = descriptor.findProperty("null1"); assertFalse(bp.isNullable()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index 9a18772cf..d2bbdd893 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -19,7 +19,7 @@ public class TestJodaType extends BaseTestCase { public void test() { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); + BeanDescriptor beanDescriptor = server.descriptor(TJodaEntity.class); BeanProperty beanProperty = beanDescriptor.beanProperty("localTime"); ScalarType scalarType = beanProperty.scalarType(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 204131aa9..08db38a0b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -23,7 +23,7 @@ public class TestQueryWithCache extends BaseTestCase { ResetBasicData.reset(); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor beanDescriptor = server.getBeanDescriptor(Country.class); + BeanDescriptor beanDescriptor = server.descriptor(Country.class); CacheOptions cacheOptions = beanDescriptor.cacheOptions(); assertNotNull(cacheOptions); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 095b192de..f2f2679f4 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -23,7 +23,7 @@ public class TestDeleteByIdList extends BaseTestCase { OrderDetail dummy = DB.reference(OrderDetail.class, 1); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); + server.descriptor(OrderDetail.class).cacheBeanPut(dummy); Customer c0 = ResetBasicData.createCustAndOrder("DelIdList-0"); assertNotNull(c0); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index ead179968..83003b889 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -23,7 +23,7 @@ public class TestDeleteCascadeById extends BaseTestCase { OrderDetail dummy = DB.reference(OrderDetail.class, 1); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); + server.descriptor(OrderDetail.class).cacheBeanPut(dummy); Customer cust = ResetBasicData.createCustAndOrder("DelCas"); assertNotNull(cust); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 390189e0a..c3472f57c 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -79,7 +79,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { SpiEbeanServer spiServer = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = - spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); + spiServer.descriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) beanDescriptor.beanProperty("userRoles"); diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index e0b7431cc..c29d8b70b 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -21,7 +21,7 @@ public class TestELBasic extends BaseTestCase { public void testEl() { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); + BeanDescriptor descriptor = server.descriptor(Customer.class); ElPropertyDeploy elId = descriptor.elPropertyDeploy("id"); assertTrue(elId instanceof BeanProperty); diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java index 910d4cf72..239e4f77b 100644 --- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java @@ -24,7 +24,7 @@ public class TestInheritance extends BaseTestCase { @Test public void testDescriptor() { - BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(GrandParentPerson.class); + BeanDescriptor desc = spiEbeanServer().descriptor(GrandParentPerson.class); BeanProperty prop1 = desc.beanProperty("someBean"); BeanProperty prop2 = desc.beanProperty("effectiveBean"); diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java index a46684808..d3ef275fc 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -16,7 +16,7 @@ public class TestSeqBatch extends BaseTestCase { return; } - BeanDescriptor d = spiEbeanServer().getBeanDescriptor(TOne.class); + BeanDescriptor d = spiEbeanServer().descriptor(TOne.class); Object id = d.nextId(null); assertNotNull(id); for (int i = 0; i < 16; i++) { diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index efc21e866..452998032 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -2,7 +2,6 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.EBasicWithLifecycle; @@ -167,7 +166,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { DB.save(bean); - BeanDescriptor desc = ((SpiEbeanServer) server()).getBeanDescriptor(EBasicWithLifecycle.class); + BeanDescriptor desc = ((SpiEbeanServer) server()).descriptor(EBasicWithLifecycle.class); EBasicWithLifecycle loaded = desc.createReference(false, false, bean.getId(), null); // Here you see the big difference. diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index f17a8ffa7..62faa4694 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -23,7 +23,7 @@ public class TestPersistenceContextServerConfig extends BaseTestCase { SpiEbeanServer ebeanServer = (SpiEbeanServer) create(); try { Query query = ebeanServer.find(EBasicVer.class); - PersistenceContextScope scope = ebeanServer.getPersistenceContextScope((SpiQuery) query); + PersistenceContextScope scope = ebeanServer.persistenceContextScope((SpiQuery) query); assertEquals(PersistenceContextScope.QUERY, scope); } finally { diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index cb3e22a07..2dab70e77 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -21,7 +21,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { public void test() { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor d = server.getBeanDescriptor(Order.class); + BeanDescriptor d = server.descriptor(Order.class); ElPropertyValue elGetValue = d.elGetValue("customer.contacts"); assertTrue(elGetValue.containsMany()); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index be7c97be1..50b101ce0 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -25,7 +25,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor descOrder = server.getBeanDescriptor(Order.class); + BeanDescriptor descOrder = server.descriptor(Order.class); BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) descOrder.beanProperty("details"); List parentIds = new ArrayList<>(); diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java index e14ac0f18..7b510e858 100644 --- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java @@ -27,7 +27,7 @@ public class TestInheritWithMany extends BaseTestCase { assertNotNull(server); SpiEbeanServer spiServer = (SpiEbeanServer) server; - BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class); + BeanDescriptor beanDescriptor = spiServer.descriptor(IMRoot.class); InheritInfo inheritInfo = beanDescriptor.inheritInfo(); assertNotNull(inheritInfo); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index e96af4aec..ddd05f05c 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -24,7 +24,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { public void test() throws IOException { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); + BeanDescriptor descriptor = server.descriptor(Customer.class); StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}"); JsonParser parser = server.json().createParser(reader); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index 610a2c424..0f0f66f02 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -42,7 +42,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { Product refProd = jsonContext.toBean(Product.class, jsonString); - BeanDescriptor prodDesc = server.getBeanDescriptor(Product.class); + BeanDescriptor prodDesc = server.descriptor(Product.class); EntityBean eb = (EntityBean) refProd; prodDesc.isReference(eb._ebean_getIntercept()); @@ -73,7 +73,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { Order o2 = jsonContext.toBean(Order.class, jsonOrder); Customer customer = o2.getCustomer(); - BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); + BeanDescriptor custDesc = server.descriptor(Customer.class); assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java index 0cb6db92d..bfaed1ffe 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java @@ -21,7 +21,7 @@ public final class VisitAllUsing extends VisitProperties { * Visit all the descriptors for a given server. */ public VisitAllUsing(BeanVisitor visitor, SpiEbeanServer server) { - this(visitor, server.getBeanDescriptors()); + this(visitor, server.descriptors()); } /** diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 29a0bb78f..66189f3c0 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -93,7 +93,7 @@ public abstract class BaseTestCase { } protected SpiTransaction getInScopeTransaction() { - return spiEbeanServer().getTransactionManager().scope().getInScope(); + return spiEbeanServer().transactionManager().scope().getInScope(); } /** @@ -229,7 +229,7 @@ public abstract class BaseTestCase { } protected BeanDescriptor getBeanDescriptor(Class cls) { - return spiEbeanServer().getBeanDescriptor(cls); + return spiEbeanServer().descriptor(cls); } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { From cee879d2f3f8ef0163562590a0d2711db3e1c551 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 15:34:23 +1200 Subject: [PATCH 083/102] #2359 - Rename internal methods - BeanDescriptorManager --- .../ebeaninternal/api/SpiBeanTypeManager.java | 2 +- .../server/core/DefaultServer.java | 18 ++--- .../server/core/InternalConfiguration.java | 2 +- .../server/deploy/BeanDescriptor.java | 14 ++-- .../server/deploy/BeanDescriptorManager.java | 78 +++++++++---------- .../server/deploy/BeanDescriptorMap.java | 18 ++--- .../deploy/BeanEmbeddedMetaFactory.java | 2 +- .../server/deploy/BeanTable.java | 2 +- .../deploy/meta/DeployBeanDescriptor.java | 2 +- .../server/deploy/parse/AnnotationAssoc.java | 2 +- .../deploy/parse/AnnotationAssocManys.java | 14 ++-- .../deploy/parse/AnnotationAssocOnes.java | 4 +- .../server/persist/DefaultPersister.java | 12 +-- .../DefaultPersistenceContext.java | 2 +- .../transaction/TransactionManager.java | 42 +--------- 15 files changed, 89 insertions(+), 125 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java index 0a6b79d78..57e19db81 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java @@ -8,6 +8,6 @@ public interface SpiBeanTypeManager { /** * Return the bean type for the given entity class. */ - SpiBeanType getBeanType(Class entityType); + SpiBeanType beanType(Class entityType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index b5ae8d560..576ee5add 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1391,7 +1391,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { // FutureList query always run in it's own persistence content spiQuery.setPersistenceContext(new DefaultPersistenceContext()); if (!spiQuery.isDisableReadAudit()) { - BeanDescriptor desc = beanDescriptorManager.getBeanDescriptor(spiQuery.getBeanType()); + BeanDescriptor desc = beanDescriptorManager.descriptor(spiQuery.getBeanType()); desc.readAuditFutureList(spiQuery); } // Create a new transaction solely to execute the findList() at some future time @@ -2049,7 +2049,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public List> descriptors() { - return beanDescriptorManager.getBeanDescriptorList(); + return beanDescriptorManager.descriptorList(); } /** @@ -2061,13 +2061,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } public void register(BeanPersistController controller) { - for (BeanDescriptor desc : beanDescriptorManager.getBeanDescriptorList()) { + for (BeanDescriptor desc : beanDescriptorManager.descriptorList()) { desc.register(controller); } } public void deregister(BeanPersistController c) { - for (BeanDescriptor desc : beanDescriptorManager.getBeanDescriptorList()) { + for (BeanDescriptor desc : beanDescriptorManager.descriptorList()) { desc.deregister(c); } } @@ -2103,7 +2103,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public BeanDescriptor descriptor(Class beanClass) { - return beanDescriptorManager.getBeanDescriptor(beanClass); + return beanDescriptorManager.descriptor(beanClass); } /** @@ -2111,7 +2111,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public List> descriptors(String tableName) { - return beanDescriptorManager.getBeanDescriptors(tableName); + return beanDescriptorManager.descriptors(tableName); } /** @@ -2127,7 +2127,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public List> beanTypes(String tableName) { - return beanDescriptorManager.getBeanTypes(tableName); + return beanDescriptorManager.beanTypes(tableName); } @Override @@ -2137,7 +2137,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public BeanDescriptor descriptorByQueueId(String queueId) { - return beanDescriptorManager.getBeanDescriptorByQueueId(queueId); + return beanDescriptorManager.descriptorByQueueId(queueId); } /** @@ -2153,7 +2153,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public BeanDescriptor descriptorById(String beanClassName) { - return beanDescriptorManager.getBeanDescriptorByClassName(beanClassName); + return beanDescriptorManager.descriptorByClassName(beanClassName); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 96ab21aa2..50410beb0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -175,7 +175,7 @@ public final class InternalConfiguration { this.dtoBeanManager = new DtoBeanManager(typeManager, xmlMap.readDtoMapping()); this.beanDescriptorManager = new BeanDescriptorManager(this); Map asOfTableMapping = beanDescriptorManager.deploy(xmlMap.xmlDeployment()); - Map draftTableMap = beanDescriptorManager.getDraftTableMap(); + Map draftTableMap = beanDescriptorManager.draftTableMap(); beanDescriptorManager.scheduleBackgroundTrim(); this.dataTimeZone = initDataTimeZone(); this.binder = getBinder(typeManager, databasePlatform, dataTimeZone); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 0fbf5b800..0635d5e06 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -352,7 +352,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { this.idOnlyReference = isIdOnlyReference(propertiesBaseScalar); boolean noRelationships = propertiesOne.length + propertiesMany.length == 0; this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly(); - this.cacheHelp = new BeanDescriptorCacheHelp<>(this, owner.getCacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); + this.cacheHelp = new BeanDescriptorCacheHelp<>(this, owner.cacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); this.jsonHelp = initJsonHelp(); this.draftHelp = new BeanDescriptorDraftHelp<>(this); this.docStoreAdapter = owner.createDocStoreBeanAdapter(this, deploy); @@ -453,7 +453,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the DatabaseConfig. */ public DatabaseConfig config() { - return owner.getConfig(); + return owner.config(); } /** @@ -935,25 +935,25 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the Encrypt key given the BeanProperty. */ public EncryptKey encryptKey(BeanProperty p) { - return owner.getEncryptKey(baseTable, p.dbColumn()); + return owner.encryptKey(baseTable, p.dbColumn()); } /** * Return the Encrypt key given the table and column name. */ public EncryptKey encryptKey(String tableName, String columnName) { - return owner.getEncryptKey(tableName, columnName); + return owner.encryptKey(tableName, columnName); } /** * Return the Scalar type for the given JDBC type. */ public ScalarType scalarType(int jdbcType) { - return owner.getScalarType(jdbcType); + return owner.scalarType(jdbcType); } public ScalarType scalarType(String cast) { - return owner.getScalarType(cast); + return owner.scalarType(cast); } /** @@ -1940,7 +1940,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the BeanDescriptor of another bean type. */ public BeanDescriptor descriptor(Class otherType) { - return owner.getBeanDescriptor(otherType); + return owner.descriptor(otherType); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 88b0d95e8..74bcec97b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -136,8 +136,8 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy this.multiValueBind = config.getMultiValueBind(); this.idBinderFactory = new IdBinderFactory(databasePlatform.isIdInExpandedForm(), multiValueBind); this.queryPlanTTLSeconds = this.config.getQueryPlanTTLSeconds(); - this.asOfViewSuffix = getAsOfViewSuffix(databasePlatform, this.config); - String versionsBetweenSuffix = getVersionsBetweenSuffix(databasePlatform, this.config); + this.asOfViewSuffix = asOfViewSuffix(databasePlatform, this.config); + String versionsBetweenSuffix = versionsBetweenSuffix(databasePlatform, this.config); this.readAnnotations = new ReadAnnotations(config.getGeneratedPropertyFactory(), asOfViewSuffix, versionsBetweenSuffix, this.config); this.bootupClasses = config.getBootupClasses(); this.createProperties = config.getDeployCreateProperties(); @@ -183,19 +183,19 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } @Override - public ScalarType getScalarType(String cast) { + public ScalarType scalarType(String cast) { return typeManager.getScalarType(cast); } @Override - public ScalarType getScalarType(int jdbcType) { + public ScalarType scalarType(int jdbcType) { return typeManager.getScalarType(jdbcType); } /** * Return the AsOfViewSuffix based on the DbHistorySupport. */ - private String getAsOfViewSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) { + private String asOfViewSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) { DbHistorySupport historySupport = databasePlatform.getHistorySupport(); // with historySupport returns a simple view suffix or the sql2011 as of timestamp suffix return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getAsOfViewSuffix(serverConfig.getAsOfViewSuffix()); @@ -204,7 +204,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy /** * Return the versions between timestamp suffix based on the DbHistorySupport. */ - private String getVersionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) { + private String versionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) { DbHistorySupport historySupport = databasePlatform.getHistorySupport(); // with historySupport returns a simple view suffix or the sql2011 versions between timestamp suffix return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix()); @@ -216,7 +216,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } @Override - public DatabaseConfig getConfig() { + public DatabaseConfig config() { return config; } @@ -225,38 +225,38 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy return docStoreFactory.createAdapter(descriptor, deploy); } - public BeanDescriptor getBeanDescriptorByQueueId(String queueId) { + public BeanDescriptor descriptorByQueueId(String queueId) { return descQueueMap.get(queueId); } @Override - public SpiBeanType getBeanType(Class entityType) { - return getBeanDescriptor(entityType); + public SpiBeanType beanType(Class entityType) { + return descriptor(entityType); } @Override @SuppressWarnings("unchecked") - public BeanDescriptor getBeanDescriptor(Class entityType) { + public BeanDescriptor descriptor(Class entityType) { return (BeanDescriptor) descMap.get(entityType.getName()); } @SuppressWarnings("unchecked") - public BeanDescriptor getBeanDescriptorByClassName(String entityClassName) { + public BeanDescriptor descriptorByClassName(String entityClassName) { return (BeanDescriptor) descMap.get(entityClassName); } @Override - public String getServerName() { + public String name() { return serverName; } @Override - public SpiCacheManager getCacheManager() { + public SpiCacheManager cacheManager() { return cacheManager; } @Override - public NamingConvention getNamingConvention() { + public NamingConvention namingConvention() { return namingConvention; } @@ -277,7 +277,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy /** * Return the map of base tables to draft tables. */ - public Map getDraftTableMap() { + public Map draftTableMap() { return draftTableMap; } @@ -369,7 +369,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy * Return the Encrypt key given the table and column name. */ @Override - public EncryptKey getEncryptKey(String tableName, String columnName) { + public EncryptKey encryptKey(String tableName, String columnName) { return encryptKeyManager.getEncryptKey(tableName, columnName); } @@ -397,14 +397,14 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy /** * Return the BeanDescriptors mapped to the table. */ - public List> getBeanDescriptors(String tableName) { + public List> descriptors(String tableName) { return tableToDescMap.get(tableName.toLowerCase()); } /** * Return the BeanDescriptors mapped to the table. */ - public List> getBeanTypes(String tableName) { + public List> beanTypes(String tableName) { return tableToDescMap.get(tableName.toLowerCase()); } @@ -546,11 +546,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy /** * Return an immutable list of all the BeanDescriptors. */ - public List> getBeanDescriptorList() { + public List> descriptorList() { return immutableDescriptorList; } - public BeanTable getBeanTable(Class type) { + public BeanTable beanTable(Class type) { return beanTableMap.get(type); } @@ -562,11 +562,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } @SuppressWarnings("unchecked") - public BeanManager getBeanManager(Class entityType) { - return (BeanManager) getBeanManager(entityType.getName()); + public BeanManager beanManager(Class entityType) { + return (BeanManager) beanManager(entityType.getName()); } - private BeanManager getBeanManager(String beanClassName) { + private BeanManager beanManager(String beanClassName) { return beanManagerMap.get(beanClassName); } @@ -591,11 +591,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy * Return the bean deploy info for the given class. */ @SuppressWarnings("unchecked") - public DeployBeanInfo getDeploy(Class cls) { + public DeployBeanInfo deploy(Class cls) { return (DeployBeanInfo) deployInfoMap.get(cls); } - private void registerBeanDescriptor(DeployBeanInfo info) { + private void registerDescriptor(DeployBeanInfo info) { BeanDescriptor desc = new BeanDescriptor<>(this, info.getDescriptor()); descMap.put(desc.type().getName(), desc); if (desc.isDocStoreMapped()) { @@ -640,7 +640,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private void registerEmbeddedBean(DeployBeanInfo info) { readDeployAssociations(info); - registerBeanDescriptor(info); + registerDescriptor(info); } /** @@ -711,7 +711,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } for (DeployBeanInfo info : deployInfoMap.values()) { if (!info.isEmbedded()) { - registerBeanDescriptor(info); + registerDescriptor(info); } } } @@ -785,7 +785,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } } - private DeployBeanDescriptor getTargetDescriptor(DeployBeanPropertyAssoc prop) { + private DeployBeanDescriptor targetDescriptor(DeployBeanPropertyAssoc prop) { Class targetType = prop.getTargetType(); DeployBeanInfo info = deployInfoMap.get(targetType); if (info == null) { @@ -805,7 +805,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy Set matchSet = new HashSet<>(); // get the bean descriptor that holds the mappedBy property - DeployBeanDescriptor targetDesc = getTargetDescriptor(prop); + DeployBeanDescriptor targetDesc = targetDescriptor(prop); List> ones = targetDesc.propertiesAssocOne(); for (DeployBeanPropertyAssocOne possibleMappedBy : ones) { Class possibleMappedByType = possibleMappedBy.getTargetType(); @@ -866,7 +866,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy } private void makeOrderColumn(DeployBeanPropertyAssocMany oneToMany) { - DeployBeanDescriptor targetDesc = getTargetDescriptor(oneToMany); + DeployBeanDescriptor targetDesc = targetDescriptor(oneToMany); DeployOrderColumn orderColumn = oneToMany.getOrderColumn(); final ScalarType scalarType = typeManager.getScalarType(Integer.class); DeployBeanProperty orderProperty = new DeployBeanProperty(targetDesc, Integer.class, scalarType, null); @@ -898,7 +898,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy * into the order_id column on the order_lines table). */ private void makeUnidirectional(DeployBeanPropertyAssocMany oneToMany) { - DeployBeanDescriptor targetDesc = getTargetDescriptor(oneToMany); + DeployBeanDescriptor targetDesc = targetDescriptor(oneToMany); Class owningType = oneToMany.getOwningType(); if (!oneToMany.getCascadeInfo().isSave()) { // The property MUST have persist cascading so that inserts work. @@ -915,7 +915,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy oneToMany.setUnidirectional(); // specify table and table alias... - BeanTable beanTable = getBeanTable(owningType); + BeanTable beanTable = beanTable(owningType); // define the TableJoin DeployTableJoin oneToManyJoin = oneToMany.getTableJoin(); @@ -951,7 +951,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy // its associated join information if it is available String mappedBy = prop.getMappedBy(); // get the mappedBy property - DeployBeanDescriptor targetDesc = getTargetDescriptor(prop); + DeployBeanDescriptor targetDesc = targetDescriptor(prop); DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy); if (mappedProp == null) { String m = "Error on " + prop.getFullBeanName(); @@ -1008,7 +1008,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy // skip mapping check return; } - DeployBeanDescriptor targetDesc = getTargetDescriptor(prop); + DeployBeanDescriptor targetDesc = targetDescriptor(prop); if (targetDesc.isDraftableElement()) { // automatically turning on orphan removal and CascadeType.ALL @@ -1087,14 +1087,14 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy // get the bean descriptor that holds the mappedBy property String mappedBy = prop.getMappedBy(); if (mappedBy == null) { - if (getTargetDescriptor(prop).isDraftable()) { + if (targetDescriptor(prop).isDraftable()) { prop.setIntersectionDraftTable(); } return; } // get the mappedBy property - DeployBeanDescriptor targetDesc = getTargetDescriptor(prop); + DeployBeanDescriptor targetDesc = targetDescriptor(prop); DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy); if (mappedProp == null) { @@ -1433,14 +1433,14 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy * Return the changeLogPrepare (for setting user context into the ChangeSet * in the foreground thread). */ - public ChangeLogPrepare getChangeLogPrepare() { + public ChangeLogPrepare changeLogPrepare() { return changeLogPrepare; } /** * Return the changeLogListener (that actually does the logging). */ - public ChangeLogListener getChangeLogListener() { + public ChangeLogListener changeLogListener() { return changeLogListener; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java index 94a9fded9..e5ba63521 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java @@ -20,22 +20,22 @@ public interface BeanDescriptorMap { /** * Return the name of the server/database. */ - String getServerName(); + String name(); /** * Return the DatabaseConfig. */ - DatabaseConfig getConfig(); + DatabaseConfig config(); /** * Return the Cache Manager. */ - SpiCacheManager getCacheManager(); + SpiCacheManager cacheManager(); /** * Return the naming convention. */ - NamingConvention getNamingConvention(); + NamingConvention namingConvention(); /** * Return true if multiple values can be bound as Array or Table Value and hence share the same query plan. @@ -45,12 +45,12 @@ public interface BeanDescriptorMap { /** * Return the BeanDescriptor for a given class. */ - BeanDescriptor getBeanDescriptor(Class entityType); + BeanDescriptor descriptor(Class entityType); /** * Return the Encrypt key given the table and column name. */ - EncryptKey getEncryptKey(String tableName, String columnName); + EncryptKey encryptKey(String tableName, String columnName); /** * Create a IdBinder for this bean property. @@ -65,18 +65,18 @@ public interface BeanDescriptorMap { /** * Return the scalarType for the given JDBC type. */ - ScalarType getScalarType(int jdbcType); + ScalarType scalarType(int jdbcType); /** * Return the scalarType for the given logical type. */ - ScalarType getScalarType(String cast); + ScalarType scalarType(String cast); /** * Return true if Jackson core is present on the classpath. */ boolean isJacksonCorePresent(); - + /** * Returns true, if the given table (or view) is managed by ebean * (= an entity exists) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index 70a3f5061..d5c303dcb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -19,7 +19,7 @@ final class BeanEmbeddedMetaFactory { // we can get a BeanDescriptor for an Embedded bean // and know that it is NOT recursive, as Embedded beans are // only allow to hold simple scalar types... - BeanDescriptor targetDesc = owner.getBeanDescriptor(prop.getTargetType()); + BeanDescriptor targetDesc = owner.descriptor(prop.getTargetType()); if (targetDesc == null) { String msg = "Could not find BeanDescriptor for " + prop.getTargetType() + ". Perhaps the EmbeddedId class is not registered? See https://ebean.io/docs/trouble-shooting#not-registered"; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index 8491e7fdc..dc283d53e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -103,7 +103,7 @@ public final class BeanTable { String lc = prop.dbColumn(); String fk = lc; if (foreignKeyPrefix != null) { - fk = owner.getNamingConvention().getForeignKey(foreignKeyPrefix, fk); + fk = owner.namingConvention().getForeignKey(foreignKeyPrefix, fk); } if (complexKey) { // just to copy the column name rather than prefix with the foreignKeyPrefix. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 8d1a735eb..e670dd136 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -192,7 +192,7 @@ public class DeployBeanDescriptor { * Return the DeployBeanInfo for the given bean class. */ DeployBeanInfo getDeploy(Class cls) { - return manager.getDeploy(cls); + return manager.deploy(cls); } public void setStorageEngine(String storageEngine) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java index 525034f41..191a43c40 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java @@ -29,7 +29,7 @@ abstract class AnnotationAssoc extends AnnotationParser { } BeanTable getBeanTable(DeployBeanPropertyAssoc prop) { - return factory.getBeanTable(prop.getTargetType()); + return factory.beanTable(prop.getTargetType()); } private String errorMsgMissingBeanTable(Class type, String from) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 8a4dfc599..736602695 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -154,13 +154,13 @@ final class AnnotationAssocManys extends AnnotationAssoc { if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) { // use naming convention to define join (based on the bean name for this side of relationship) // A unidirectional OneToMany or OneToMany with no mappedBy property - NamingConvention nc = factory.getNamingConvention(); + NamingConvention nc = factory.namingConvention(); String fkeyPrefix = null; if (nc.isUseForeignKeyPrefix()) { fkeyPrefix = nc.getColumnFromProperty(descriptor.getBeanType(), descriptor.getName()); } // Use the owning bean table to define the join - BeanTable owningBeanTable = factory.getBeanTable(descriptor.getBeanType()); + BeanTable owningBeanTable = factory.beanTable(descriptor.getBeanType()); owningBeanTable.createJoinColumn(fkeyPrefix, prop.getTableJoin(), false, prop.getSqlFormulaSelect()); } } @@ -190,7 +190,7 @@ final class AnnotationAssocManys extends AnnotationAssoc { fullTableName = descriptor.getBaseTable()+"_"+ CamelCaseHelper.toUnderscoreFromCamel(prop.getName()); } - BeanTable localTable = factory.getBeanTable(descriptor.getBeanType()); + BeanTable localTable = factory.beanTable(descriptor.getBeanType()); if (collectionTable != null) { prop.getTableJoin().addJoinColumn(util, true, collectionTable.joinColumns(), localTable); } @@ -296,8 +296,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { private void readJoinTable(JoinTable joinTable, DeployBeanPropertyAssocMany prop) { String intTableName = getFullTableName(joinTable); if (intTableName.isEmpty()) { - BeanTable localTable = factory.getBeanTable(descriptor.getBeanType()); - BeanTable otherTable = factory.getBeanTable(prop.getTargetType()); + BeanTable localTable = factory.beanTable(descriptor.getBeanType()); + BeanTable otherTable = factory.beanTable(prop.getTargetType()); intTableName = getM2MJoinTableName(localTable, otherTable); } @@ -362,8 +362,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { intTableName = intJoin.getTable(); } - BeanTable localTable = factory.getBeanTable(descriptor.getBeanType()); - BeanTable otherTable = factory.getBeanTable(prop.getTargetType()); + BeanTable localTable = factory.beanTable(descriptor.getBeanType()); + BeanTable otherTable = factory.beanTable(prop.getTargetType()); final String localTableName = localTable.getUnqualifiedBaseTable(); final String otherTableName = otherTable.getUnqualifiedBaseTable(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 6580d841e..b7fb12230 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -145,7 +145,7 @@ final class AnnotationAssocOnes extends AnnotationAssoc { } else { // use naming convention to define join. - NamingConvention nc = factory.getNamingConvention(); + NamingConvention nc = factory.namingConvention(); String fkeyPrefix = null; if (nc.isUseForeignKeyPrefix()) { @@ -231,7 +231,7 @@ final class AnnotationAssocOnes extends AnnotationAssoc { if (!primaryKeyJoin.referencedColumnName().isEmpty()) { log.info("Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{}] on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName()); } - BeanTable baseBeanTable = factory.getBeanTable(info.getDescriptor().getBeanType()); + BeanTable baseBeanTable = factory.beanTable(info.getDescriptor().getBeanType()); String localPrimaryKey = baseBeanTable.getIdColumn(); String foreignColumn = getBeanTable(prop).getIdColumn(); prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 699fbe48f..5a8346372 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -98,7 +98,7 @@ public final class DefaultPersister implements Persister { SpiUpdate ormUpdate = (SpiUpdate) update; - BeanManager mgr = beanDescriptorManager.getBeanManager(ormUpdate.getBeanType()); + BeanManager mgr = beanDescriptorManager.beanManager(ormUpdate.getBeanType()); if (mgr == null) { String msg = "No BeanManager found for type [" + ormUpdate.getBeanType() + "]. Is it an entity?"; @@ -187,7 +187,7 @@ public final class DefaultPersister implements Persister { draftHandler.fetchDestinationBeans(liveBeans, true); - BeanManager mgr = beanDescriptorManager.getBeanManager(beanType); + BeanManager mgr = beanDescriptorManager.beanManager(beanType); for (T liveBean : liveBeans) { T draftBean = draftHandler.publishToDestinationBean(liveBean); @@ -232,7 +232,7 @@ public final class DefaultPersister implements Persister { draftHandler.fetchDestinationBeans(draftBeans, false); - BeanManager mgr = beanDescriptorManager.getBeanManager(beanType); + BeanManager mgr = beanDescriptorManager.beanManager(beanType); List livePublish = new ArrayList<>(draftBeans.size()); for (T draftBean : draftBeans) { @@ -640,7 +640,7 @@ public final class DefaultPersister implements Persister { return 0; } - BeanDescriptor descriptor = beanDescriptorManager.getBeanDescriptor(beanType); + BeanDescriptor descriptor = beanDescriptorManager.descriptor(beanType); DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT; if (descriptor.isMultiTenant()) { return deleteAsBeans(ids, transaction, deleteMode, descriptor); @@ -679,7 +679,7 @@ public final class DefaultPersister implements Persister { */ @Override public int delete(Class beanType, Object id, Transaction transaction, boolean permanent) { - BeanDescriptor descriptor = beanDescriptorManager.getBeanDescriptor(beanType); + BeanDescriptor descriptor = beanDescriptorManager.descriptor(beanType); if (descriptor.isMultiTenant()) { // convert to a delete by bean EntityBean bean = descriptor.createEntityBean(); @@ -1274,7 +1274,7 @@ public final class DefaultPersister implements Persister { */ @SuppressWarnings("unchecked") private BeanManager getBeanManager(Object bean) { - BeanManager mgr = (BeanManager) beanDescriptorManager.getBeanManager(bean.getClass()); + BeanManager mgr = (BeanManager) beanDescriptorManager.beanManager(bean.getClass()); if (mgr == null) { throw new PersistenceException(errNotRegistered(bean.getClass())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index 20b6d8a2a..fb3e53b9b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -336,7 +336,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { * Add the dirty beans to the list. */ void dirtyBeans(SpiBeanTypeManager manager, List list) { - final SpiBeanType beanType = manager.getBeanType(rootType); + final SpiBeanType beanType = manager.beanType(rootType); for (Object value : map.values()) { EntityBean bean = (EntityBean) value; if (bean._ebean_getIntercept().isDirty() || beanType.isToManyDirty(bean)) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 81a840dbf..aa2af72b0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -48,16 +48,13 @@ import java.util.concurrent.atomic.AtomicLong; public class TransactionManager implements SpiTransactionManager { private static final Logger logger = LoggerFactory.getLogger(TransactionManager.class); - private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster"); private final SpiServer server; - private final BeanDescriptorManager beanDescriptorManager; /** - * Ebean defaults this to true but for EJB compatible behaviour set this to - * false; + * Ebean defaults this to true but for EJB compatible behaviour set this to false; */ private final boolean rollbackOnChecked; @@ -65,9 +62,7 @@ public class TransactionManager implements SpiTransactionManager { * Prefix for transaction id's (logging). */ final String prefix; - private final String externalTransPrefix; - private final AtomicLong counter = new AtomicLong(1000L); /** @@ -80,69 +75,38 @@ public class TransactionManager implements SpiTransactionManager { * to close queryOnly transactions rather than commit or rollback them. */ private final OnQueryOnly onQueryOnly; - private final BackgroundExecutor backgroundExecutor; - private final ClusterManager clusterManager; - private final String serverName; - private final boolean docStoreActive; /** * The elastic search index update processor. */ final DocStoreUpdateProcessor docStoreUpdateProcessor; - private final boolean autoPersistUpdates; - private final boolean persistBatch; - private final boolean persistBatchOnCascade; - private final BulkEventListenerMap bulkEventListenerMap; - - /** - * Used to prepare the change set setting user context information in the - * foreground thread before logging. - */ private final ChangeLogPrepare changeLogPrepare; - - /** - * Performs the actual logging of the change set in background. - */ private final ChangeLogListener changeLogListener; - - /** - * Use Background executor to perform change-logging - */ private final boolean changeLogAsync; - final boolean notifyL2CacheInForeground; - private final boolean viewInvalidation; - private final boolean skipCacheAfterWrite; - private final TransactionFactory transactionFactory; - private final SpiLogManager logManager; private final SpiLogger txnLogger; private final boolean txnDebug; - private final DatabasePlatform databasePlatform; - private final SpiProfileHandler profileHandler; - private final TimedMetric txnMain; private final TimedMetric txnReadOnly; private final TimedMetricMap txnNamed; private final TransactionScopeManager scopeManager; - private final TableModState tableModState; private final ServerCacheNotify cacheNotify; private final boolean supportsSavepointId; - private final ConcurrentHashMap profileLocations = new ConcurrentHashMap<>(); /** @@ -163,8 +127,8 @@ public class TransactionManager implements SpiTransactionManager { this.rollbackOnChecked = options.config.isTransactionRollbackOnChecked(); this.beanDescriptorManager = options.descMgr; this.viewInvalidation = options.descMgr.requiresViewEntityCacheInvalidation(); - this.changeLogPrepare = options.descMgr.getChangeLogPrepare(); - this.changeLogListener = options.descMgr.getChangeLogListener(); + this.changeLogPrepare = options.descMgr.changeLogPrepare(); + this.changeLogListener = options.descMgr.changeLogListener(); this.changeLogAsync = options.config.isChangeLogAsync(); this.clusterManager = options.clusterManager; this.serverName = options.config.getName(); From 1049435f8688f92a7385e379b7cd21e548a2e5e5 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 17:31:14 +1200 Subject: [PATCH 084/102] Tidy up ddl-generator BaseTestCase --- .../src/test/java/io/ebean/BaseTestCase.java | 166 ------------------ 1 file changed, 166 deletions(-) diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 66189f3c0..223598f91 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -28,20 +28,6 @@ public abstract class BaseTestCase { protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class); -// @Rule public TestName name = new TestName(); -// -// @After -// public void checkForLeak() { -// TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope(); -// SpiTransaction trans = scope.getInScope(); -// if (trans != null) { -// String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans; -// scope.clearExternal(); // clear for next test -// fail(msg); -// } -// } - - /** * this is the clock delta that may occur between testing machine and db server. * If the clock delta of DB server is in future, an "asOf" query may not find the @@ -68,99 +54,6 @@ public abstract class BaseTestCase { } } - protected void clearAllL2Cache() { - server().cacheManager().clearAll(); - } - - protected void resetAllMetrics() { - server().metaInfo().resetAllMetrics(); - } - - protected ServerMetrics collectMetrics() { - return server().metaInfo().collectMetrics(); - } - - protected List visitTimedMetrics() { - return collectMetrics().timedMetrics(); - } - - protected List sqlMetrics() { - List timedMetrics = visitTimedMetrics(); - - return timedMetrics.stream() - .filter((it) -> it.name().startsWith("sql.") || it.name().startsWith("orm.")) - .collect(Collectors.toList()); - } - - protected SpiTransaction getInScopeTransaction() { - return spiEbeanServer().transactionManager().scope().getInScope(); - } - - /** - * Return the generated sql trimming column alias if required. - */ - protected String sqlOf(Query query) { - return trimSql(query.getGeneratedSql()); - } - - /** - * Return the generated sql trimming column alias if required. - */ - protected String sqlOf(Query query, int columns) { - return trimSql(query.getGeneratedSql(), columns); - } - - protected void assertSqlBind(String sql) { - assertThat(sql).contains("-- bind"); - } - - protected void assertSqlBind(List sql, int i) { - assertThat(sql.get(i)).contains("-- bind"); - } - - protected void assertSqlBind(List sql, int from, int to) { - for (int i = from; i <= to; i++) { - assertThat(sql.get(i)).contains("-- bind"); - } - } - - protected AbstractCharSequenceAssert assertSql(Query query, int count) { - return org.assertj.core.api.Assertions.assertThat(sqlOf(query, count)); - } - - protected AbstractCharSequenceAssert assertSql(Query query) { - return org.assertj.core.api.Assertions.assertThat(sqlOf(query)); - } - - protected AbstractCharSequenceAssert assertSql(String sql) { - return org.assertj.core.api.Assertions.assertThat(trimSql(sql)); - } - - protected String trimSql(String sql) { - if (sql.contains(" c0,") || sql.contains(" c0 ") || sql.contains(" c1,") || sql.contains(" c1 ")) { - // for oracle we include column alias so lets remove those - return trimSql(sql, 10); - } - return sql;//trimSql(sql, 0); - } - - /** - * Trim out column alias if required from the generated sql. - */ - protected String trimSql(String sql, int columns) { - for (int i = 0; i <= columns; i++) { - sql = StringHelper.replace(sql, " c" + i + ",", ","); - } - for (int i = 0; i <= columns; i++) { - sql = StringHelper.replace(sql, " c" + i + " ", " "); - } - return sql; - } - - public boolean isPlatformCaseSensitive() { - return spiEbeanServer().databasePlatform().isCaseSensitiveCollation(); - } - /** * MS SQL Server does not allow setting explicit values on identity columns * so tests that do this need to be skipped for SQL Server. @@ -173,22 +66,10 @@ public abstract class BaseTestCase { return Platform.H2 == platform(); } - public boolean isHSqlDb() { - return Platform.HSQLDB == platform(); - } - public boolean isOracle() { return Platform.ORACLE == platform(); } - public boolean isNuoDb() { - return Platform.NUODB == platform(); - } - - public boolean isDb2() { - return Platform.DB2 == platform(); - } - public boolean isPostgres() { return Platform.POSTGRES == platform().base(); } @@ -228,22 +109,10 @@ public abstract class BaseTestCase { // do nothing, used to thread sleep } - protected BeanDescriptor getBeanDescriptor(Class cls) { - return spiEbeanServer().descriptor(cls); - } - - protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().cacheManager().beanCache(cls).statistics(reset); - } - protected Platform platform() { return spiEbeanServer().databasePlatform().getPlatform().base(); } - protected IdType idType() { - return spiEbeanServer().databasePlatform().getDbIdentity().getIdType(); - } - protected SpiEbeanServer spiEbeanServer() { return (SpiEbeanServer) DB.getDefault(); } @@ -252,39 +121,4 @@ public abstract class BaseTestCase { return DB.getDefault(); } - /** - * Platform specific IN clause assert. - */ - protected void platformAssertIn(String sql, String containsIn) { - if (isPostgres()) { - assertThat(sql).contains(containsIn+" = any("); - } else { - assertThat(sql).contains(containsIn+" in "); - } - // H2 contains("where t0.name in (select * from table(x varchar = ?)"); - } - - /** - * Platform specific NOT IN clause assert. - */ - protected void platformAssertNotIn(String sql, String containsIn) { - if (isPostgres()) { - assertThat(sql).contains(containsIn+" != all("); - } else { - assertThat(sql).contains(containsIn+" not in "); - } - } - - /** - * Platform specific CONCAT clause. - */ - protected String concat(String property0, String separator, String property1) { - return concat(property0, separator, property1, null); - } - - protected String concat(String property0, String separator, String property1, String suffix) { - DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); - return dbExpressionHandler.concat(property0, separator, property1, suffix); - } - } From c1d57c6b10c571e5829307fe0ff242f0fdf1cfe4 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 21:47:52 +1200 Subject: [PATCH 085/102] Refactor tidy tests --- .../ebean}/config/TestTableName.java | 2 +- .../ebean/util}/TestEncodeB64.java | 2 +- .../server/type}/TestSimpleEncryptor.java | 2 +- .../org/tests/unitinternal/TestBasics.java | 24 ----------- .../unitinternal/TestEqualsOnEnhanced.java | 40 +++++++------------ .../unitinternal/TestNullCollectionSet.java | 5 +-- .../tests/unitinternal/TestOrderByParse.java | 26 ++++++------ .../TestVanillaCollectionSet.java | 5 +-- 8 files changed, 34 insertions(+), 72 deletions(-) rename ebean-core/src/test/java/{org/tests => io/ebean}/config/TestTableName.java (98%) rename ebean-core/src/test/java/{org/tests/unitinternal => io/ebean/util}/TestEncodeB64.java (95%) rename ebean-core/src/test/java/{org/tests/unitinternal => io/ebeaninternal/server/type}/TestSimpleEncryptor.java (96%) delete mode 100644 ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java diff --git a/ebean-core/src/test/java/org/tests/config/TestTableName.java b/ebean-core/src/test/java/io/ebean/config/TestTableName.java similarity index 98% rename from ebean-core/src/test/java/org/tests/config/TestTableName.java rename to ebean-core/src/test/java/io/ebean/config/TestTableName.java index be7f699aa..eaf4632a9 100644 --- a/ebean-core/src/test/java/org/tests/config/TestTableName.java +++ b/ebean-core/src/test/java/io/ebean/config/TestTableName.java @@ -1,4 +1,4 @@ -package org.tests.config; +package io.ebean.config; import io.ebean.BaseTestCase; import io.ebean.config.TableName; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 95% rename from ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java rename to ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java index a9a5af80e..54f024308 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java +++ b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java @@ -1,4 +1,4 @@ -package org.tests.unitinternal; +package io.ebean.util; import org.junit.jupiter.api.Test; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java similarity index 96% rename from ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 1bf1f45e2..47c9acb50 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -1,4 +1,4 @@ -package org.tests.unitinternal; +package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java deleted file mode 100644 index b1a281eaf..000000000 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.tests.unitinternal; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -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() { - assertTrue((parentPath("banana") == null)); - assertTrue((parentPath("banana.apple").equals("banana"))); - assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); - } -} diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index b85d21421..ac21a2642 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -6,40 +6,30 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestEqualsOnEnhanced extends BaseTestCase { @Test public void test() { Customer c = new Customer(); - if (c instanceof EntityBean) { - Order o = new Order(); - if (o instanceof EntityBean) { + Order o = new Order(); - c.setId(1); + c.setId(1); + o.setId(1); + assertNotEquals(c, o); + assertNotEquals(null, c); + assertEquals(c, c); - o.setId(1); + Customer c2 = new Customer(); + c2.setId(1); + assertEquals(c, c2); - assertFalse(c.equals(o)); - assertFalse(c.equals(null)); - assertTrue(c.equals(c)); - - Customer c2 = new Customer(); - c2.setId(1); - assertTrue(c.equals(c2)); - - Customer c3 = new Customer(); - // c2.setId(1); - assertFalse(c.equals(c3)); - - Customer c4 = new Customer(); - c4.setId(2); - assertFalse(c.equals(c4)); - - } - } + Customer c3 = new Customer(); + assertNotEquals(c, c3); + Customer c4 = new Customer(); + c4.setId(2); + assertNotEquals(c, c4); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 1e3f1601a..ccce09fd8 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -9,8 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestNullCollectionSet extends BaseTestCase { @@ -30,7 +29,7 @@ public class TestNullCollectionSet extends BaseTestCase { assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - assertTrue(!bc.isPopulated()); + assertFalse(bc.isPopulated()); assertNotNull(bc.getOwnerBean()); assertNotNull(bc.getPropertyName()); } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java index d1e338894..6f3f084ff 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -46,7 +46,7 @@ public class TestOrderByParse extends BaseTestCase { o1 = new OrderBy<>("id desc"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc", o1.toStringFormat()); o1 = new OrderBy<>(" id asc "); @@ -65,7 +65,7 @@ public class TestOrderByParse extends BaseTestCase { OrderBy o1 = new OrderBy<>("id desc nulls high"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high", o1.toStringFormat()); assertFalse(o1.supportsSelect()); } @@ -77,7 +77,7 @@ public class TestOrderByParse extends BaseTestCase { o1.add("id desc nulls high"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high", o1.toStringFormat()); } @@ -87,7 +87,7 @@ public class TestOrderByParse extends BaseTestCase { OrderBy o1 = new OrderBy<>("id desc nulls high, name"); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high, name", o1.toStringFormat()); assertEquals("name", o1.getProperties().get(1).getProperty()); assertTrue(o1.getProperties().get(1).isAscending()); @@ -116,9 +116,9 @@ public class TestOrderByParse extends BaseTestCase { o1 = new OrderBy<>(" id desc , name desc "); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(1).isAscending()); + assertFalse(o1.getProperties().get(1).isAscending()); assertEquals("id desc, name desc", o1.toStringFormat()); o1 = new OrderBy<>(" id ascending, name asc"); @@ -149,9 +149,9 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("name"); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(1).isAscending()); + assertFalse(o1.getProperties().get(1).isAscending()); assertEquals("id desc, name desc", o1.toStringFormat()); o1.reverse(); @@ -188,7 +188,7 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("id", "latin_1"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id collate latin_1 desc", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -198,7 +198,7 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); assertEquals("date", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, date", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -209,7 +209,7 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -219,7 +219,7 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("id", "COLLATION_KEY(${}, 'latin_1')"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat()); assertTrue(o1.supportsSelect()); } @@ -235,7 +235,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(o1, o2); assertEquals(o1, o3); - OrderBy o4 = new OrderBy<>("id desc"); OrderBy o5 = new OrderBy<>("oid desc nulls high"); OrderBy o6 = new OrderBy<>("id desc nulls low"); @@ -247,7 +246,6 @@ public class TestOrderByParse extends BaseTestCase { @Test public void equals_with_collation() { - OrderBy o1 = new OrderBy<>(); o1.asc("name", "latin_1"); diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 10a3b8ed3..9f7a56f32 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -9,8 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestVanillaCollectionSet extends BaseTestCase { @@ -31,7 +30,7 @@ public class TestVanillaCollectionSet extends BaseTestCase { assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - assertTrue(!bc.isPopulated()); + assertFalse(bc.isPopulated()); assertNotNull(bc.getOwnerBean()); assertNotNull(bc.getPropertyName()); } From 0b00a14fd38c7191a086ed88ac0d825217046205 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 21:48:53 +1200 Subject: [PATCH 086/102] Refactor tidy tests - remove unused test Main and test MainMemoryLeak --- ebean-core/src/test/java/org/Main.java | 28 ------- .../src/test/java/org/MainMemoryLeak.java | 80 ------------------- 2 files changed, 108 deletions(-) delete mode 100644 ebean-core/src/test/java/org/Main.java delete mode 100644 ebean-core/src/test/java/org/MainMemoryLeak.java diff --git a/ebean-core/src/test/java/org/Main.java b/ebean-core/src/test/java/org/Main.java deleted file mode 100644 index e5bf2c2ef..000000000 --- a/ebean-core/src/test/java/org/Main.java +++ /dev/null @@ -1,28 +0,0 @@ -package org; - -import io.ebean.DB; -import io.ebean.Database; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -public class Main { - - public static void main(String[] args) throws SQLException { - - Database ms = DB.byName("ms"); - DataSource dataSource = ms.dataSource(); - - Connection connection = dataSource.getConnection(); - PreparedStatement statement = connection.prepareStatement("select next VALUE for j2_seq"); - ResultSet resultSet = statement.executeQuery(); - if (resultSet.next()) { - Object val = resultSet.getObject(1); - System.out.println(""+val); - } - connection.close(); - } -} diff --git a/ebean-core/src/test/java/org/MainMemoryLeak.java b/ebean-core/src/test/java/org/MainMemoryLeak.java deleted file mode 100644 index b659297b4..000000000 --- a/ebean-core/src/test/java/org/MainMemoryLeak.java +++ /dev/null @@ -1,80 +0,0 @@ -package org; - -import io.ebean.Database; -import io.ebean.DatabaseFactory; -import io.ebean.Transaction; -import io.ebean.annotation.Cache; -import io.ebean.config.DatabaseConfig; -import io.ebean.config.PlatformNoGeneratedKeysTest; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import java.util.Arrays; - -/** - * - * Test preparation: - * - * - Enable file based H2 in ebean.properties (line `datasource.h2.databaseUrl=jdbc:h2:file:~/tests`) - * - disable logging of io.ebean.SUM/TXN/SQL in logback-test.xml - * - remove existing database in ~/tests (do that before each run) - * - run this class with `-Xmx1g` jvm argument - * - an OOM in iteration ~45000 will occur (45k * 10k chars = 45k * 20k bytes = 900MB) - * - * remove the line `@Cache(enableQueryCache=true)` - and it will run forever (until disk is full) - */ -public class MainMemoryLeak { - - @Cache(enableQueryCache=true) - @Entity - public static class ECachedBean { - @Id - private Long id; - - @Lob - private String description; - } - - public static void main(String[] args) { - - PlatformNoGeneratedKeysTest.OtherH2Platform platform = new PlatformNoGeneratedKeysTest.OtherH2Platform(); - - DatabaseConfig config = new DatabaseConfig(); - - config.setDatabasePlatform(platform); - config.addClass(ECachedBean.class); - config.loadFromProperties(); - - Database server1 = DatabaseFactory.create(config); - assert server1 != null; - - // create again for #2193 - Database server = DatabaseFactory.create(config); - assert server != null; - - // create a string with 10k chars - char[] c = new char[10_000]; - Arrays.fill(c, 'x'); - - try (Transaction txn = server.beginTransaction()) { - for (int i = 0; i < 500000; i++) { - - if (i % 1000 == 0) { - long mem = Runtime.getRuntime().freeMemory() / 1024 / 1024; - if (mem > 1024) { - throw new IllegalStateException("-Xmx1g JVM argument expected"); - } - System.out.println("Iteration: " + i + " Free mem: " + mem + " MB"); - } - - ECachedBean a = new ECachedBean(); - a.description = new String(c); - server.save(a); - } - System.out.println("Success, no mem limit detected"); - txn.commit(); - } - server.shutdown(); - } -} From eab56d323b74bd84e2d750f0681da57d4339eb06 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 22:49:23 +1200 Subject: [PATCH 087/102] Refactor move tests from ebean-core to ebean-test --- ebean-core/pom.xml | 14 +-- ebean-core/src/test/resources/ebean.mf | 7 -- .../src/test/resources/logback-test.xml | 101 ------------------ ebean-test/pom.xml | 68 +++++++++++- .../src/test/java/io/ebean/BaseTestCase.java | 0 .../src/test/java/io/ebean/ColumnTest.java | 0 .../src/test/java/io/ebean/DbPrimaryTest.java | 0 .../src/test/java/io/ebean/DtoQuery2Test.java | 0 .../java/io/ebean/DtoQueryFromOrmTest.java | 0 .../src/test/java/io/ebean/DtoQueryTest.java | 0 .../EbeanServerFactory_MultiTenancy_Test.java | 0 ...nServerFactory_ServerConfigStart_Test.java | 0 .../ebean/EbeanServer_deleteAllByIdTest.java | 0 .../io/ebean/EbeanServer_deleteByIdTest.java | 0 .../java/io/ebean/EbeanServer_deleteTest.java | 0 .../java/io/ebean/EbeanServer_eqlTest.java | 0 .../java/io/ebean/EbeanServer_refresh.java | 0 .../io/ebean/EbeanServer_saveAllTest.java | 0 .../java/io/ebean/ExtendedServerTest.java | 0 .../test/java/io/ebean/FetchConfigTest.java | 0 .../test/java/io/ebean/FetchGroupTest.java | 0 .../java/io/ebean/MyCurrentUserProvider.java | 0 .../test/java/io/ebean/PlatformCondition.java | 0 .../src/test/java/io/ebean/PropertyTest.java | 0 .../test/java/io/ebean/SqlRowBooleanTest.java | 0 .../test/java/io/ebean/StringHelperTest.java | 0 .../java/io/ebean/TestDirtyProperties.java | 0 .../java/io/ebean/TestFilterWithEnum.java | 0 .../io/ebean/TestUnsetLoadedProperties.java | 0 .../java/io/ebean/TextExpressionListTest.java | 0 .../java/io/ebean/TransactionalTestCase.java | 0 .../src/test/java/io/ebean/TxScopeTest.java | 0 .../test/java/io/ebean/UpdateQueryTest.java | 0 .../java/io/ebean/annotation/ForPlatform.java | 0 .../io/ebean/annotation/IgnorePlatform.java | 0 .../ebean/bean/EntityBeanInterceptTest.java | 0 .../java/io/ebean/cache/CacheKeyTest.java | 0 .../ebean/cache/ServerCacheManagerTest.java | 0 .../ebean/cache/ServerCacheOptionsTest.java | 0 .../java/io/ebean/common/BeanListTest.java | 0 .../java/io/ebean/common/BeanMapTest.java | 0 .../java/io/ebean/common/BeanSetTest.java | 0 .../io/ebean/config/ContainerConfigTest.java | 0 .../io/ebean/config/DatabaseConfigTest.java | 0 .../ebean/config/DbConstraintNamingTest.java | 0 .../ebean/config/DbMigrationConfigTest.java | 0 .../io/ebean/config/DocStoreConfigTest.java | 0 .../config/MatchingNamingConventionTest.java | 0 .../config/PlatformNoGeneratedKeysTest.java | 0 .../ebean/config/PropertiesWrapperTest.java | 0 .../config/ServerConfigSqlServerTest.java | 0 .../java/io/ebean/config/TestTableName.java | 0 .../UnderscoreNamingConventionTest.java | 0 .../dbplatform/BasicSqlLimitOffsetTest.java | 0 .../BasicSqlStandardLimiterTest.java | 0 .../dbplatform/DatabasePlatformTest.java | 0 .../config/dbplatform/DbIdentityTest.java | 0 .../dbplatform/DbPlatformTypeLookupTest.java | 0 .../dbplatform/DbPlatformTypeMappingTest.java | 0 .../dbplatform/DbPlatformTypeParserTest.java | 0 .../config/dbplatform/DbTypeMapTest.java | 0 .../dbplatform/HanaHistorySupportTest.java | 0 .../config/dbplatform/HanaPlatformTest.java | 0 .../dbplatform/MySqlHistorySupportTest.java | 0 .../config/dbplatform/MySqlPlatformTest.java | 0 .../config/dbplatform/OraclePlatformTest.java | 0 .../PostgresHistorySupportTest.java | 0 .../dbplatform/PostgresPlatformTest.java | 0 .../SequenceBatchIdGeneratorTest.java | 0 .../dbplatform/SqlserverPlatformTest.java | 0 .../sqlserver/SqlServer2016PlatformTest.java | 0 .../sqlserver/SqlServerStepSequenceTest.java | 0 .../ebean/event/BeanFindControllerTest.java | 0 .../event/BeanPersistControllerTest.java | 0 .../java/io/ebean/event/BeanPostLoadTest.java | 0 .../readaudit/ReadAuditQueryPlanTest.java | 0 .../test/java/io/ebean/json/EJsonTests.java | 0 .../java/io/ebean/plugin/BeanTypeTest.java | 0 .../io/ebean/plugin/ExpressionPathTest.java | 0 .../java/io/ebean/plugin/PropertyTest.java | 0 .../java/io/ebean/plugin/SpiServerTest.java | 0 .../io/ebean/server/type/MyDayOfWeek.java | 0 .../java/io/ebean/server/type/MyEnum.java | 0 .../test/java/io/ebean/server/type/MySex.java | 0 .../test/java/io/ebean/test/DbJsonTest.java | 16 +-- .../src/test/java/io/ebean/test/JsonTest.java | 2 +- .../io/ebean/text/PathPropertiesTests.java | 0 .../ebean/text/json/JsonBeanReaderTest.java | 0 .../io/ebean/text/json/JsonContextTest.java | 0 .../text/json/JsonWriteOptionsTests.java | 0 .../io/ebean/util/CamelCaseHelperTest.java | 0 .../java/io/ebean/util/TestEncodeB64.java | 0 .../io/ebeaninternal/api/BindParamsTest.java | 0 .../ebeaninternal/api/HelpScopeTransTest.java | 0 .../ebeaninternal/api/PlatformMatchTest.java | 0 .../ebeaninternal/api/TDSpiEbeanServer.java | 0 .../io/ebeaninternal/api/TDSpiServer.java | 0 .../extraddl/model/ExtraDdlXmlReaderTest.java | 0 .../json/ModifyAwareMapTest.java | 0 .../server/cache/CacheBeanDataTest.java | 0 .../cache/CachedBeanDataFromBeanTest.java | 0 .../cache/CachedBeanDataSerializeTest.java | 0 .../server/cache/DefaultCacheHolderTest.java | 0 ...faultCacheHolder_getCacheOptions_Test.java | 0 .../cache/DefaultServerCacheConfigTest.java | 0 .../cache/DefaultServerCacheManagerTest.java | 0 .../server/cache/DefaultServerCacheTest.java | 0 .../DefaultServerCache_RunEvictionTest.java | 0 .../changelog/ChangeJsonBuilderTest.java | 0 .../DefaultChangeLogListenerTest.java | 0 .../DefaultChangeLogRegisterTest.java | 0 .../server/changelog/Helper.java | 0 .../BinaryTransactionEventReadWriteTest.java | 0 .../server/core/BasicTypeConverterTest.java | 0 .../server/core/BindPaddingTest.java | 0 ...faultServer_createOrmQueryRequestTest.java | 0 .../core/DefaultServer_getReferenceTest.java | 0 .../server/core/DtoQueryRequestTest.java | 0 .../server/core/HelpCreateQueryRequest.java | 0 .../server/core/InitDataSourceTest.java | 0 .../core/OrmQueryRequestTestHelper.java | 0 .../server/core/TestDiffHelpSimple.java | 0 .../server/core/TestDiffHelpWithEmbedded.java | 0 .../core/bootup/DistillPackagesTest.java | 0 .../core/bootup/ManifestReaderTest.java | 0 .../server/deploy/BeanCascadeInfoTest.java | 0 .../server/deploy/BeanDescriptorTest.java | 0 .../BeanDescriptor_documentMappingTest.java | 0 .../deploy/BeanDescriptor_registerTest.java | 0 ...eanDescriptor_whenCreatedPropertyTest.java | 0 .../server/deploy/BeanIudMetricsTest.java | 0 .../deploy/BeanPropertyAssocManyTest.java | 0 .../deploy/DeployPropertyParserMapTests.java | 0 .../deploy/DeployPropertyParserTest.java | 0 .../server/deploy/DetermineAggPathTest.java | 0 .../deploy/FormulaPropertyPathTest.java | 0 .../server/deploy/IndexDefinitionTest.java | 0 .../server/deploy/TableJoinColumnTest.java | 0 .../server/deploy/TableJoinTest.java | 0 .../TestBeanDescriptorHasIdProperty.java | 0 .../deploy/TestCollectionLoadedStatus.java | 0 .../deploy/TestDiffHelpInsertSimple.java | 0 .../TestDiffHelpInsertWithEmbedded.java | 0 .../deploy/TestNotEnhancedMappedSuper.java | 0 ...estReferenceWithConstructorProperties.java | 0 .../GeneratedCounterLongTest.java | 0 .../GeneratedInsertJavaTimeTest.java | 0 .../InsertTimestampFactoryTest.java | 0 .../UpdateTimestampFactoryTest.java | 0 .../deploy/parse/AnnotationClassTest.java | 0 .../server/dto/DtoMetaBuilderTest.java | 0 .../DefaultBackgroundExecutorTest.java | 0 .../TestShutdownWithBackgroundTasks.java | 0 .../expression/AllEqualsExpressionTest.java | 0 .../server/expression/BaseExpressionTest.java | 0 .../expression/BetweenExpressionTest.java | 0 .../BetweenPropertyExpressionTest.java | 0 .../CaseInsensitiveEqualExpressionTest.java | 0 .../DefaultExampleExpressionTest.java | 0 .../DefaultExpressionFactoryTest.java | 0 .../expression/DefaultExpressionListTest.java | 0 .../expression/ExistsQueryExpressionTest.java | 0 .../server/expression/IdExpressionTest.java | 0 .../server/expression/IdInExpressionTest.java | 0 .../server/expression/InExpressionTest.java | 0 .../expression/InPairsExpressionTest.java | 0 .../expression/InQueryExpressionTest.java | 0 .../expression/InRangeExpressionTest.java | 0 .../IsEmptyExpressionQueryTest.java | 0 .../expression/JsonPathExpressionTest.java | 0 .../expression/JunctionExpressionTest.java | 0 .../server/expression/LikeExpressionTest.java | 0 .../expression/LogicExpressionTest.java | 0 .../server/expression/NoopExpressionTest.java | 0 .../server/expression/NotExpressionTest.java | 0 .../server/expression/NullExpressionTest.java | 0 .../expression/PrepareDocNestedTest.java | 0 .../expression/RawExpressionBuilderTest.java | 0 .../server/expression/RawExpressionTest.java | 0 .../server/expression/SameTest.java | 0 .../expression/SimpleExpressionTest.java | 0 .../expression/TDSpiExpressionRequest.java | 0 .../platform/H2DbExpressionTest.java | 0 .../platform/HanaDbExpressionTest.java | 0 .../platform/MySqlDbExpressionTest.java | 0 .../platform/OracleDbExpressionTest.java | 0 .../expression/platform/PostgresCastTest.java | 0 .../platform/PostgresDbExpressionTest.java | 0 .../server/grammer/EqlParserTest.java | 0 .../server/grammer/ParseFetchConfigTest.java | 0 .../server/idgen/TestUuidGenerator.java | 0 .../server/lib/ShutdownManagerTest.java | 0 .../server/loadcontext/DLoadContextTest.java | 0 .../server/persist/BatchDepthOrderTest.java | 0 .../server/persist/FlagsTest.java | 0 .../server/persist/TrimLogSqlTest.java | 0 .../profile/BasicProfileLocationTest.java | 0 .../server/profile/DTimedMetricMapTest.java | 0 .../server/profile/DTimedMetricTest.java | 0 .../server/profile/SortMetricTest.java | 0 .../server/profile/UtilLocationTest.java | 0 .../server/query/DbOrderByTrimTest.java | 0 .../server/query/DefaultSqlRowTest.java | 0 .../query/LimitOffsetPagedListTest.java | 0 .../server/query/OrderVersionDescTest.java | 0 .../server/query/RawSqlQueryPlanKeyTest.java | 0 .../server/query/SplitNameTest.java | 0 .../server/query/SqlTreeAliasTest.java | 0 .../server/query/SqlTreeBuilderTest.java | 0 .../TestFutureRowCountErrorHandling.java | 0 .../server/querydefn/BindValuesKeyTest.java | 0 .../server/querydefn/DefaultOrmQueryTest.java | 0 .../querydefn/OrmQueryDetailParserTest.java | 0 .../server/querydefn/OrmQueryDetailTest.java | 0 .../server/querydefn/OrmQueryPlanKeyTest.java | 0 .../OrmQueryPropertiesParserTest.java | 0 .../querydefn/OrmQueryPropertiesTest.java | 0 .../querydefn/OrmUpdatePropertiesTest.java | 0 .../server/rawsql/ColumnMappingTest.java | 0 .../server/rawsql/DRawSqlServiceTest.java | 0 .../server/rawsql/RawSqlKeyTest.java | 0 .../server/rawsql/TestRawSqlBuilder.java | 0 .../rawsql/TestRawSqlBuilderDistinct.java | 0 .../rawsql/TestRawSqlColumnParsing.java | 0 .../server/rawsql/TestRawSqlParsing.java | 0 .../server/rawsql/TestRawSqlService.java | 0 .../server/text/json/DJsonScalarTest.java | 0 .../text/json/TestJsonWriteVisitor.java | 0 .../json/TestTextJsonBeanReadVisitor.java | 0 .../server/text/json/WriteJsonDirtyTest.java | 0 .../server/text/json/WriteJsonTest.java | 0 .../DefaultPersistenceContextTest.java | 0 .../DefaultProfileHandlerTest.java | 0 .../DefaultTransactionThreadLocalTest.java | 0 .../transaction/JdbcTransactionTest.java | 0 .../RemoteTransactionEventTest.java | 0 .../server/transaction/TableModStateTest.java | 0 .../transaction/TransactionManagerTest.java | 0 .../BasePlatformArrayTypeFactoryTest.java | 0 .../server/type/ConvertInetAddressTest.java | 0 .../server/type/ConvertInetAddressesTest.java | 0 .../server/type/DecimalUtilsTest.java | 0 .../server/type/DefaultTypeFactoryTest.java | 0 .../server/type/DefaultTypeManagerTest.java | 0 .../type/IsoJsonDateTimeParserTest.java | 0 .../ebeaninternal/server/type/JsonTester.java | 0 .../server/type/JsonTrimTest.java | 0 .../server/type/ModifyAwareFlagTest.java | 0 .../server/type/ModifyAwareListTest.java | 0 .../server/type/ModifyAwareMapTest.java | 0 .../server/type/ModifyAwareSetTest.java | 0 .../type/ScalarTypeArrayListH2Test.java | 0 .../server/type/ScalarTypeArrayListTest.java | 0 .../server/type/ScalarTypeArraySetH2Test.java | 0 .../server/type/ScalarTypeArraySetTest.java | 0 .../server/type/ScalarTypeBooleanTest.java | 0 .../server/type/ScalarTypeCalendarTest.java | 0 .../server/type/ScalarTypeDateTest.java | 0 .../server/type/ScalarTypeDurationTest.java | 0 .../type/ScalarTypeDurationWithNanosTest.java | 0 .../server/type/ScalarTypeInstantTest.java | 0 .../server/type/ScalarTypeIntegerTest.java | 0 .../type/ScalarTypeJodaLocalDateTest.java | 0 .../type/ScalarTypeJodaLocalDateTimeTest.java | 0 .../type/ScalarTypeJodaLocalTimeTest.java | 0 .../server/type/ScalarTypeJodaPeriodTest.java | 0 .../server/type/ScalarTypeJsonListTest.java | 0 .../server/type/ScalarTypeLocalDateTest.java | 0 .../type/ScalarTypeLocalDateTimeTest.java | 0 .../server/type/ScalarTypeLocalTimeTest.java | 0 .../ScalarTypeLocalTimeWithNanosTest.java | 0 .../server/type/ScalarTypeLongTest.java | 0 .../server/type/ScalarTypeMonthDayTest.java | 0 .../type/ScalarTypeOffsetDateTimeTest.java | 0 .../server/type/ScalarTypeOffsetTimeTest.java | 0 .../server/type/ScalarTypePathTest.java | 0 .../server/type/ScalarTypePeriodTest.java | 0 .../type/ScalarTypePostgresHstoreTest.java | 0 .../server/type/ScalarTypeTimestampTest.java | 0 .../server/type/ScalarTypeUUIDBaseTest.java | 0 .../server/type/ScalarTypeUtilDateTest.java | 0 .../type/ScalarTypeWrapperAdapterTest.java | 0 .../server/type/ScalarTypeWrapperOidTest.java | 0 .../type/ScalarTypeYearMonthDateTest.java | 0 .../server/type/ScalarTypeYearTest.java | 0 .../server/type/ScalarTypeZoneIdTest.java | 0 .../server/type/ScalarTypeZoneOffsetTest.java | 0 .../type/ScalarTypeZonedDateTimeTest.java | 0 .../server/type/TestBinaryUUID.java | 0 .../server/type/TestEnumToBeanType.java | 0 .../server/type/TestLocaleParse.java | 0 .../TestScalarTypeUUIDBinaryConversion.java | 0 .../server/type/TestSimpleEncryptor.java | 0 .../server/type/TestTypeManager.java | 0 .../server/type/TypeReflectHelperTest.java | 0 .../server/type/UtilDateParserTest.java | 0 .../server/util/ArrayStackTest.java | 0 .../server/util/BindParamsParserTest.java | 0 .../server/util/ChecksumTest.java | 0 .../server/util/DSelectColumnsParserTest.java | 0 .../io/ebeaninternal/server/util/Md5Test.java | 0 .../support/DocStoreBeanBaseAdapterTest.java | 0 .../api/support/DocStoreDeleteEventTest.java | 0 .../api/support/DocStoreIndexEventTest.java | 0 .../test/java/io/ebeantest/CaptureLogger.java | 0 .../io/ebeantest/CapturingLoggerFactory.java | 0 .../src/test/java/io/ebeantest/LoggedSql.java | 0 .../src/test/java/main/StartCockroach.java | 0 .../src/test/java/main/StartMariaDb.java | 0 .../src/test/java/main/StartMySql.java | 0 .../src/test/java/main/StartNuoDB.java | 0 .../src/test/java/main/StartOracle.java | 0 .../src/test/java/main/StartPostgres.java | 0 .../src/test/java/main/StartSqlServer.java | 0 .../migration/history/v1_0/EHistory7.java | 0 .../migration/history/v1_1/EHistory7.java | 0 .../java/misc/migration/v1_0/CKeyAssoc.java | 0 .../java/misc/migration/v1_0/CKeyDetail.java | 0 .../java/misc/migration/v1_0/CKeyParent.java | 0 .../misc/migration/v1_0/CKeyParentId.java | 0 .../java/misc/migration/v1_0/DfkCascade.java | 0 .../misc/migration/v1_0/DfkCascadeOne.java | 0 .../java/misc/migration/v1_0/DfkNone.java | 0 .../misc/migration/v1_0/DfkNoneViaJoin.java | 0 .../test/java/misc/migration/v1_0/DfkOne.java | 0 .../java/misc/migration/v1_0/DfkSetNull.java | 0 .../test/java/misc/migration/v1_0/EBasic.java | 0 .../test/java/misc/migration/v1_0/EEnum.java | 0 .../java/misc/migration/v1_0/EHistory.java | 0 .../java/misc/migration/v1_0/EHistory2.java | 0 .../java/misc/migration/v1_0/EHistory3.java | 0 .../java/misc/migration/v1_0/EHistory4.java | 0 .../java/misc/migration/v1_0/EHistory5.java | 0 .../java/misc/migration/v1_0/EHistory6.java | 0 .../test/java/misc/migration/v1_0/ERef.java | 0 .../java/misc/migration/v1_0/ESoftdelete.java | 0 .../java/misc/migration/v1_0/MtmChild.java | 0 .../java/misc/migration/v1_0/MtmMaster.java | 0 .../java/misc/migration/v1_0/OtoChild.java | 0 .../java/misc/migration/v1_0/OtoMaster.java | 0 .../java/misc/migration/v1_1/CKeyAssoc.java | 0 .../java/misc/migration/v1_1/CKeyDetail.java | 0 .../java/misc/migration/v1_1/CKeyParent.java | 0 .../misc/migration/v1_1/CKeyParentId.java | 0 .../java/misc/migration/v1_1/DfkCascade.java | 0 .../misc/migration/v1_1/DfkCascadeOne.java | 0 .../java/misc/migration/v1_1/DfkNone.java | 0 .../misc/migration/v1_1/DfkNoneViaJoin.java | 0 .../test/java/misc/migration/v1_1/DfkOne.java | 0 .../java/misc/migration/v1_1/DfkSetNull.java | 0 .../test/java/misc/migration/v1_1/EBasic.java | 0 .../test/java/misc/migration/v1_1/EEnum.java | 0 .../java/misc/migration/v1_1/EHistory.java | 0 .../java/misc/migration/v1_1/EHistory2.java | 0 .../java/misc/migration/v1_1/EHistory3.java | 0 .../java/misc/migration/v1_1/EHistory4.java | 0 .../java/misc/migration/v1_1/EHistory5.java | 0 .../java/misc/migration/v1_1/EHistory6.java | 0 .../java/misc/migration/v1_1/ESoftdelete.java | 0 .../test/java/misc/migration/v1_1/EUser.java | 0 .../java/misc/migration/v1_1/MtmChild.java | 0 .../java/misc/migration/v1_1/MtmMaster.java | 0 .../java/misc/migration/v1_1/OtoChild.java | 0 .../java/misc/migration/v1_1/OtoMaster.java | 0 .../java/misc/migration/v1_2/CKeyAssoc.java | 0 .../java/misc/migration/v1_2/CKeyDetail.java | 0 .../java/misc/migration/v1_2/CKeyParent.java | 0 .../misc/migration/v1_2/CKeyParentId.java | 0 .../java/misc/migration/v1_2/DfkCascade.java | 0 .../misc/migration/v1_2/DfkCascadeOne.java | 0 .../java/misc/migration/v1_2/DfkNone.java | 0 .../misc/migration/v1_2/DfkNoneViaJoin.java | 0 .../test/java/misc/migration/v1_2/DfkOne.java | 0 .../java/misc/migration/v1_2/DfkSetNull.java | 0 .../test/java/misc/migration/v1_2/EBasic.java | 0 .../test/java/misc/migration/v1_2/EEnum.java | 0 .../java/misc/migration/v1_2/EHistory.java | 0 .../java/misc/migration/v1_2/EHistory2.java | 0 .../java/misc/migration/v1_2/EHistory3.java | 0 .../java/misc/migration/v1_2/EHistory4.java | 0 .../java/misc/migration/v1_2/EHistory5.java | 0 .../java/misc/migration/v1_2/EHistory6.java | 0 .../test/java/misc/migration/v1_2/ERef.java | 0 .../java/misc/migration/v1_2/ESoftdelete.java | 0 .../java/misc/migration/v1_2/MtmChild.java | 0 .../java/misc/migration/v1_2/MtmMaster.java | 0 .../java/misc/migration/v1_2/OtoChild.java | 0 .../java/misc/migration/v1_2/OtoMaster.java | 0 .../org/ebeantest/LoggedSqlCollector.java | 0 .../BSimpleFor.java} | 8 +- .../ForTestsBeforeAfterTest.java | 6 +- .../org/{test => etest}/ForTestsTest.java | 8 +- .../java/org/{test => etest}/PlainBean.java | 2 +- .../multitenant/partition/CurrentTenant.java | 0 .../multitenant/partition/MtBaseDomain.java | 0 .../org/multitenant/partition/MtContent.java | 0 .../org/multitenant/partition/MtTenant.java | 0 .../multitenant/partition/MtTenantAware.java | 0 .../partition/MultiTenantPartitionTest.java | 0 .../multitenant/partition/UserContext.java | 0 .../aggregateformula/IAFBaseSegment.java | 0 .../aggregateformula/IAFPartialSegment.java | 0 .../aggregateformula/IAFSegmentStatus.java | 0 .../TestAggregateFormula.java | 0 .../TestAggregateInheritFormula.java | 0 .../java/org/tests/basic/MainDbBoolean.java | 0 .../basic/MyTestDataSourcePoolListener.java | 0 .../org/tests/basic/TestAnnotationBase.java | 0 .../tests/basic/TestAssocOneEqExpression.java | 0 .../java/org/tests/basic/TestBatchLazy.java | 0 .../org/tests/basic/TestBatchLazyMany.java | 0 .../tests/basic/TestBeanReferenceRefresh.java | 0 .../org/tests/basic/TestCreateEntityBean.java | 0 .../tests/basic/TestDeleteByIdCollection.java | 0 .../basic/TestDeleteCascadingOneToMany.java | 0 .../basic/TestDeleteImportedPartial.java | 0 .../org/tests/basic/TestDeleteOneToOne.java | 0 .../basic/TestDeleteOneToOneMultiple.java | 0 .../basic/TestDeletePartialNoVersion.java | 0 .../org/tests/basic/TestDynamicUpdate.java | 0 ...stEnhancementCollectionInitialisation.java | 0 .../org/tests/basic/TestErrorBindLog.java | 0 .../org/tests/basic/TestExplicitInsert.java | 0 .../java/org/tests/basic/TestFetchId.java | 0 .../java/org/tests/basic/TestIUDVanilla.java | 0 .../java/org/tests/basic/TestInEmpty.java | 0 .../java/org/tests/basic/TestInheritRef.java | 0 .../java/org/tests/basic/TestJodaType.java | 0 .../org/tests/basic/TestJoinInheritance.java | 0 .../basic/TestLazyLoadEmptyOneToMany.java | 0 .../org/tests/basic/TestLazyLoadInCache.java | 0 .../java/org/tests/basic/TestLimitQuery.java | 0 .../org/tests/basic/TestLoadBeanCache.java | 0 .../tests/basic/TestLogTransLogOnError.java | 0 .../org/tests/basic/TestM2MCascadeOne.java | 0 .../java/org/tests/basic/TestM2MVanilla.java | 0 .../org/tests/basic/TestManyLazyLoad.java | 0 .../org/tests/basic/TestManyOneInterface.java | 0 .../java/org/tests/basic/TestMappedSuper.java | 0 .../org/tests/basic/TestMetaAnnotation.java | 0 .../tests/basic/TestMultipleOneToOneIUD.java | 0 .../tests/basic/TestNonUpdateProperty.java | 0 .../tests/basic/TestOrderByAnnotation.java | 0 .../basic/TestOrderTotalAmountFormula.java | 0 .../basic/TestOrderTotalAmountReportBean.java | 0 .../tests/basic/TestOrderTotalAmountSql.java | 0 .../tests/basic/TestPersistenceContext.java | 0 .../org/tests/basic/TestQueryForUpdate.java | 0 .../basic/TestQueryForUpdatePostgresLock.java | 0 .../tests/basic/TestQueryUsingConnection.java | 0 .../tests/basic/TestQueryUsingDatabase.java | 0 .../tests/basic/TestQueryWhereBetween.java | 0 .../tests/basic/TestQueryWhereInRange.java | 0 .../org/tests/basic/TestQueryWithCache.java | 0 .../tests/basic/TestReadOnlyPropagation.java | 0 .../tests/basic/TestSaveDeleteOneToOne.java | 0 .../basic/TestSaveDeleteOneToOneMultiple.java | 0 .../basic/TestSharedInstancePropagation.java | 0 .../java/org/tests/basic/TestTransient.java | 0 .../org/tests/basic/TestUpdateManyToOne.java | 0 .../java/org/tests/basic/TestUuidInsert.java | 0 .../basic/TestUuidInsertMasterDetail.java | 0 .../org/tests/basic/TestWhereAnnotation.java | 0 .../basic/delete/TestDeleteByIdList.java | 0 .../basic/delete/TestDeleteCascadeById.java | 0 .../delete/TestDeleteCascadeByQuery.java | 0 .../tests/basic/encrypt/BasicEncryptKey.java | 0 .../basic/encrypt/BasicEncyptKeyManager.java | 0 .../org/tests/basic/encrypt/TestEncrypt.java | 0 .../basic/encrypt/TestEncryptBinary.java | 0 .../basic/encrypt/TestEncryptClientSide.java | 0 .../basic/event/TestPreInsertValidation.java | 0 .../tests/basic/event/TestQueryAdapter.java | 0 .../tests/basic/join/TestSecondaryJoin.java | 0 .../basic/lob/TestBasicClobFetchEager.java | 0 .../tests/basic/lob/TestBasicClobNoVer.java | 0 .../org/tests/basic/lob/TestByteOnly.java | 0 .../java/org/tests/basic/one2one/Booking.java | 0 .../java/org/tests/basic/one2one/Invoice.java | 0 .../one2one/TestOne2OneBookingInvoice.java | 0 .../basic/one2one/TestOneToOneWheelTire.java | 0 .../java/org/tests/basic/one2one/Tire.java | 0 .../java/org/tests/basic/one2one/Wheel.java | 0 .../org/tests/basic/type/BSimpleWithGen.java | 0 .../basic/type/TestEnumValueAnnotation.java | 0 .../basic/type/TestExtraScalarTypes.java | 0 .../tests/basic/type/TestInetAddressType.java | 0 .../basic/type/TestQueryBooleanProperty.java | 0 .../org/tests/basic/type/TestSqlRowUUID.java | 0 .../tests/basic/type/TestTransientMap.java | 0 .../batchinsert/TestBatchInsertFlush.java | 0 .../batchinsert/TestBatchInsertOneToOne.java | 0 .../batchinsert/TestBatchInsertSimple.java | 0 ...tBatchInsertWithInitialisedCollection.java | 0 .../TestBatchOnCascadeExceptionHandling.java | 0 .../TestBatchSaveWithGetBeanId.java | 0 .../batchinsert/o2o/MeterAddressData.java | 0 .../batchinsert/o2o/MeterContractData.java | 0 .../o2o/MeterSpecialNeedsClient.java | 0 .../o2o/MeterSpecialNeedsContact.java | 0 .../tests/batchinsert/o2o/MeterVersion.java | 0 .../org/tests/batchload/TestBasicLazy.java | 0 .../tests/batchload/TestBasicNavOnEmpty.java | 0 .../batchload/TestBatchLazyWithCacheHits.java | 0 .../batchload/TestBatchLazyWithDeleted.java | 0 .../org/tests/batchload/TestBeanState.java | 0 .../batchload/TestEmptyManyLazyLoad.java | 0 .../org/tests/batchload/TestLazyJoin.java | 0 .../org/tests/batchload/TestLazyJoin2.java | 0 .../TestLazyLoadEmptyCollection.java | 0 .../TestLazyLoadNonExistantBean.java | 0 .../TestLazyLoadNonExistentBean.java | 0 .../batchload/TestQueryDisableLazyLoad.java | 0 .../org/tests/batchload/TestQueryJoin.java | 0 .../batchload/TestQueryJoinToAssocOne.java | 0 .../batchload/TestSecondQueryNoRows.java | 0 .../tests/batchload/TestSecondaryQueries.java | 0 .../java/org/tests/cache/TestBeanCache.java | 0 .../cache/TestBeanCacheContactLazyLoad.java | 0 .../cache/TestBeanCacheWithDeleteQuery.java | 0 .../tests/cache/TestBeanFetchJoinCache.java | 0 .../java/org/tests/cache/TestCacheBasic.java | 0 .../tests/cache/TestCacheCollectionIds.java | 0 .../org/tests/cache/TestCacheCustomer.java | 0 .../java/org/tests/cache/TestCacheDelete.java | 0 .../org/tests/cache/TestCacheEmbeddedId.java | 0 .../TestCacheInterceptSaveWhenLazyLoaded.java | 0 .../org/tests/cache/TestCacheManyToOne.java | 0 .../org/tests/cache/TestCacheNaturalId.java | 0 .../tests/cache/TestExternalNotification.java | 0 .../cache/TestL2CacheWithSharedBean.java | 0 .../cache/TestL2DirtyFlagOnLazyLoad.java | 0 .../java/org/tests/cache/TestM2MCache.java | 0 .../java/org/tests/cache/TestQueryCache.java | 0 .../tests/cache/TestQueryCacheCountry.java | 0 .../org/tests/cache/TestQueryCacheInsert.java | 0 .../tests/cache/TestQueryCacheReadOnly.java | 0 .../cache/TestQueryCacheTableDependency.java | 0 .../tests/cache/embeddedid/CEPCategory.java | 0 .../tests/cache/embeddedid/CEPProduct.java | 0 .../cache/embeddedid/CEPProductCategory.java | 0 .../embeddedid/CEPProductCategoryId.java | 0 .../TestBeanCacheEmbeddedIdPrimitives.java | 0 .../cache/personinfo/PersonCacheEmail.java | 0 .../cache/personinfo/PersonCacheInfo.java | 0 .../cache/personinfo/PersonCacheTests.java | 0 .../tests/cache/personinfo/PersonOther.java | 0 .../cache/personinfo/TestStringIdOnly.java | 0 .../org/tests/callable/TestMysqlCallable.java | 0 .../test/java/org/tests/cascade/COOne.java | 0 .../java/org/tests/cascade/COOneMany.java | 0 .../test/java/org/tests/cascade/CORoot.java | 0 .../tests/cascade/OmCacheOrderedDetail.java | 0 .../tests/cascade/OmCacheOrderedMaster.java | 0 .../org/tests/cascade/OmOrderedDetail.java | 0 .../org/tests/cascade/OmOrderedMaster.java | 0 .../java/org/tests/cascade/RelDetail.java | 0 .../java/org/tests/cascade/RelMaster.java | 0 .../TestCascadeOrphanStatelessUpdate.java | 0 .../tests/cascade/TestDeleteO2MOrphans.java | 0 .../tests/cascade/TestJsonMarshallingOTM.java | 0 .../tests/cascade/TestMasterDetailDelete.java | 0 .../tests/cascade/TestMultiCascadeBatch.java | 0 .../tests/cascade/TestOnlyKillOrphans.java | 0 .../org/tests/cascade/TestOrderedList.java | 0 .../org/tests/cascade/TestPrivateOwned.java | 0 .../TestPrivateOwnedAddRemoveOrphan.java | 0 .../cascade/TestPrivateOwnedCascadeOrder.java | 0 ...TestPrivateOwnedIgnoreTransientOrphan.java | 0 .../org/tests/changelog/TestChangeLog.java | 0 .../org/tests/changelog/TestChangeLogInt.java | 0 .../tests/compositekeys/TestCKeyDelete.java | 0 .../compositekeys/TestCKeyIdInExpression.java | 0 .../tests/compositekeys/TestCKeyLazyLoad.java | 0 ...aoCompositeKeyWithAnnotationOverrides.java | 0 .../org/tests/compositekeys/TestCore.java | 0 ...ascadeDeleteChildrenWithCompositeKeys.java | 0 .../org/tests/compositekeys/db/AuditInfo.java | 0 .../org/tests/compositekeys/db/CaoBean.java | 0 .../org/tests/compositekeys/db/CaoKey.java | 0 .../java/org/tests/compositekeys/db/Item.java | 0 .../org/tests/compositekeys/db/ItemKey.java | 0 .../org/tests/compositekeys/db/Parcel.java | 0 .../compositekeys/db/ParcelLocation.java | 0 .../org/tests/compositekeys/db/Region.java | 0 .../org/tests/compositekeys/db/RegionKey.java | 0 .../org/tests/compositekeys/db/SubType.java | 0 .../tests/compositekeys/db/SubTypeKey.java | 0 .../java/org/tests/compositekeys/db/Type.java | 0 .../org/tests/compositekeys/db/TypeKey.java | 0 .../contructor/TestProtectedConstructor.java | 0 .../org/tests/ddd/iud/TestDExhEntityEl.java | 0 .../java/org/tests/ddd/iud/TestDPersonEl.java | 0 .../org/tests/ddd/iud/TestDPersonIUD.java | 0 .../test/java/org/tests/ddl/DfkCascade.java | 0 .../java/org/tests/ddl/DfkCascadeOne.java | 0 .../src/test/java/org/tests/ddl/DfkNone.java | 0 .../java/org/tests/ddl/DfkNoneViaJoin.java | 0 .../java/org/tests/ddl/DfkNoneViaMtoM.java | 0 .../src/test/java/org/tests/ddl/DfkOne.java | 0 .../test/java/org/tests/ddl/DfkSetNull.java | 0 .../org/tests/ddl/TestForeignKeyModes.java | 0 .../tests/defaultvalues/DefaultsModel.java | 0 .../ReferencedDefaultsModel.java | 0 .../org/tests/defaultvalues/TestDefaults.java | 0 .../test/java/org/tests/delete/DcDetail.java | 0 .../java/org/tests/delete/DcListener.java | 0 .../test/java/org/tests/delete/DcMaster.java | 0 .../delete/TestDeleteByIdUsingModel.java | 0 .../TestDeleteByIdWithPersistenceContext.java | 0 .../org/tests/delete/TestDeleteByQuery.java | 0 .../delete/TestDeleteCascadeWithListener.java | 0 .../TestDeleteWithoutOptimisticLocking.java | 0 .../tests/docstore/CustomerReportTest.java | 0 .../java/org/tests/draftable/DocLinkTest.java | 0 .../tests/draftable/LinkQueryPublishTest.java | 0 .../org/tests/draftable/OrganisationTest.java | 0 .../test/java/org/tests/el/TestELBasic.java | 0 .../java/org/tests/el/TestPathExpression.java | 0 .../org/tests/el/TestUnderscoreParam.java | 0 .../org/tests/embedded/TestEmbeddedEmpty.java | 0 .../TestConstructorManyAddAll.java | 0 .../TestConstructorPutfieldReplacement.java | 0 .../enhancement/TestEnhancementEquals.java | 0 .../org/tests/example/ModUuidGenerator.java | 0 .../org/tests/expression/bitwise/BwBean.java | 0 .../org/tests/expression/bitwise/BwFlags.java | 0 .../bitwise/TestBitwiseExpressions.java | 0 .../org/tests/family/TestInheritance.java | 0 .../generated/TestGeneratedProperties.java | 0 .../org/tests/generated/TestGeneratedWho.java | 0 .../org/tests/genkey/TestGeneratedKeys.java | 0 .../java/org/tests/genkey/TestSeqBatch.java | 0 .../org/tests/history/TestHistoryInsert.java | 0 .../java/org/tests/idkeys/TestCustomId.java | 0 .../org/tests/idkeys/TestGeneratedKeys.java | 0 .../java/org/tests/idkeys/TestLazyLoad.java | 0 .../org/tests/idkeys/TestSimpleIdInsert.java | 0 .../java/org/tests/idkeys/db/AuditLog.java | 0 .../org/tests/idkeys/db/GenKeyIdentity.java | 0 .../org/tests/idkeys/db/GenKeySequence.java | 0 .../test/java/org/tests/inherit/ChildA.java | 0 .../test/java/org/tests/inherit/ChildB.java | 0 .../java/org/tests/inherit/DIntChild1.java | 0 .../java/org/tests/inherit/DIntChild2.java | 0 .../java/org/tests/inherit/DIntChildBase.java | 0 .../java/org/tests/inherit/DIntParent.java | 0 .../src/test/java/org/tests/inherit/Data.java | 0 .../test/java/org/tests/inherit/EUncle.java | 0 .../org/tests/inherit/InheritDiscIntTest.java | 0 .../test/java/org/tests/inherit/Parent.java | 0 .../org/tests/inherit/ParentAggregate.java | 0 .../org/tests/inheritance/InnerReport.java | 0 .../tests/inheritance/OrganizationNode.java | 0 .../inheritance/OrganizationTreeNode.java | 0 .../tests/inheritance/OrganizationUnit.java | 0 .../org/tests/inheritance/Stockforecast.java | 0 .../TestDuplicateKeyException.java | 0 .../tests/inheritance/TestInheritInsert.java | 0 .../TestInheritanceBatchLazyLoad.java | 0 ...estInheritanceDiscriminatorQueryCache.java | 0 .../inheritance/TestInheritanceJoins.java | 0 .../inheritance/TestInheritanceOnMany.java | 0 .../TestInheritanceOrderColumn.java | 0 .../inheritance/TestInheritanceQuery.java | 0 .../inheritance/TestInheritanceRawSql.java | 0 .../inheritance/TestInheritanceRefBean.java | 0 .../org/tests/inheritance/TestIntInherit.java | 0 .../inheritance/TestNpeOnDiscriminator.java | 0 .../org/tests/inheritance/TestSkippable.java | 0 .../inheritance/TestTreeOrganisations.java | 0 .../abstrakt/AbstractBaseBlock.java | 0 .../org/tests/inheritance/abstrakt/Block.java | 0 .../abstrakt/TestInheritanceNum.java | 0 .../tests/inheritance/bothsides/SourceA.java | 0 .../tests/inheritance/bothsides/SourceB.java | 0 .../inheritance/bothsides/SourceBase.java | 0 .../tests/inheritance/bothsides/Target1.java | 0 .../tests/inheritance/bothsides/Target2.java | 0 .../inheritance/bothsides/TargetBase.java | 0 .../bothsides/TestInheritanceBothSides.java | 0 .../bothsides/WithAutoGeneratedUUID.java | 0 .../tests/inheritance/cache/CIAddress.java | 0 .../tests/inheritance/cache/CIBaseModel.java | 0 .../tests/inheritance/cache/CICustomer.java | 0 .../inheritance/cache/CICustomerParent.java | 0 .../org/tests/inheritance/cache/CIStreet.java | 0 .../inheritance/cache/CIStreetParent.java | 0 .../cache/TestInheritCacheRefLoad.java | 0 .../cache/TestInheritanceCache.java | 0 .../cache/TestInheritanceRefCache.java | 0 .../cascadedelete/ComplexBean.java | 0 .../cascadedelete/ElementBean.java | 0 .../cascadedelete/ReferencingBean.java | 0 .../inheritance/cascadedelete/RootBean.java | 0 .../inheritance/cascadedelete/SimpleBean.java | 0 .../TestInheritanceDeleteCascade.java | 0 .../company/domain/AbstractBar.java | 0 .../company/domain/ConcreteBar.java | 0 .../tests/inheritance/company/domain/Foo.java | 0 .../company/domain/TestInheritAbstract.java | 0 .../inheritance/model/AbstractBaseClass.java | 0 .../inheritance/model/CalculationResult.java | 0 .../inheritance/model/Configuration.java | 0 .../inheritance/model/Configurations.java | 0 .../inheritance/model/GroupConfiguration.java | 0 .../model/ProductConfiguration.java | 0 .../order/OrderMasterInheritance.java | 0 .../org/tests/inheritance/order/OrderedA.java | 0 .../org/tests/inheritance/order/OrderedB.java | 0 .../inheritance/order/OrderedParent.java | 0 .../java/org/tests/insert/EIdUidBean.java | 0 .../java/org/tests/insert/MainDbCopy.java | 0 .../java/org/tests/insert/OnlyIdEntity.java | 0 .../tests/insert/TestInsertCheckUnique.java | 0 .../tests/insert/TestInsertCollection.java | 0 .../TestInsertDataIntegrityException.java | 0 .../tests/insert/TestInsertDuplicateKey.java | 0 .../tests/insert/TestInsertOnStringKey.java | 0 .../tests/insert/TestInsertWithIdAndUuid.java | 0 .../org/tests/insert/TestOnlyIdEntity.java | 0 .../insert/TestSaveWithDaylightSavings.java | 0 .../test/java/org/tests/iud/PcfCalendar.java | 0 .../src/test/java/org/tests/iud/PcfCity.java | 0 .../test/java/org/tests/iud/PcfCountry.java | 0 .../src/test/java/org/tests/iud/PcfEvent.java | 0 .../src/test/java/org/tests/iud/PcfModel.java | 0 .../test/java/org/tests/iud/PcfPerson.java | 0 .../java/org/tests/iud/TestCarWheelIud.java | 0 .../java/org/tests/iud/TestInfoOneToOne.java | 0 .../org/tests/iud/TestInsertQueryUpdate.java | 0 .../org/tests/iud/TestInsertUpdateTrans.java | 0 .../org/tests/iud/TestPersistCascade.java | 0 .../org/tests/json/TestDbJson_Jackson.java | 0 .../org/tests/json/TestDbJson_Jackson2.java | 0 .../org/tests/json/TestDbJson_Jackson3.java | 0 .../java/org/tests/json/TestDbJson_List.java | 0 .../java/org/tests/json/TestJsonMapBasic.java | 0 .../java/org/tests/json/TestJsonMapBlob.java | 0 .../java/org/tests/json/TestJsonMapClob.java | 0 .../java/org/tests/json/TestJsonMapJsonB.java | 0 .../org/tests/json/TestJsonMapVarchar.java | 0 .../org/tests/json/TestJsonNodeBasic.java | 0 .../java/org/tests/json/TestJsonNodeBlob.java | 0 .../org/tests/json/TestJsonNodeJsonb.java | 0 .../org/tests/json/TestJsonNodeVarchar.java | 0 .../org/tests/json/TestJsonNullValues.java | 0 .../java/org/tests/json/TestOldValue.java | 0 .../tests/json/TestUnmappedProperties.java | 0 .../include/TestJsonExcludeEmptyList.java | 0 .../json/include/TestJsonExcludeEmptyMap.java | 0 .../json/include/TestJsonExcludeEmptySet.java | 0 .../json/include/TestJsonExcludeNull.java | 0 .../TestJsonExcludeTransientEmptyList.java | 0 .../EJsonJacksonIgnore.java | 0 .../EJsonTransientEntityList.java | 0 .../EJsonTransientList.java | 0 .../EJsonTransientObject.java | 0 .../json/transientproperties/ModelA.java | 0 .../json/transientproperties/ModelB.java | 0 .../TestJacksonIgnore.java | 0 .../transientproperties/TestModelAJson.java | 0 .../TestTransientListProperty.java | 0 .../TestTransientObjectProperty.java | 0 .../org/tests/lazyforeignkeys/MainEntity.java | 0 .../lazyforeignkeys/MainEntityRelation.java | 0 .../lazyforeignkeys/TestLazyForeignKeys.java | 0 .../org/tests/lazyloadconf/AppConfig.java | 0 .../tests/lazyloadconf/AppConfigControl.java | 0 .../BeanCollectionLazyLoadingTest.java | 0 .../org/tests/lazyloadconf/Relationship.java | 0 .../src/test/java/org/tests/level/Level1.java | 0 .../src/test/java/org/tests/level/Level2.java | 0 .../src/test/java/org/tests/level/Level3.java | 0 .../src/test/java/org/tests/level/Level4.java | 0 .../org/tests/level/test/ManyToManyTest.java | 0 .../lifecycle/TestLifecycleAnnotatedBean.java | 0 .../lifecycle/TestLifecycleExceptions.java | 0 .../tests/lifecycle/TestLifecycleWithLog.java | 0 .../m2m/TestM2MDeleteCascadeFromParent.java | 0 .../org/tests/m2m/TestM2MDeleteNoCascade.java | 0 .../TestM2MDeleteObjectWithCascadeToM2m.java | 0 .../tests/m2m/TestM2MDeleteWithCascade.java | 0 .../tests/m2m/TestM2MDistinct_sqlServer.java | 0 .../java/org/tests/m2m/TestM2MModifyTest.java | 0 .../org/tests/m2m/TestM2MMultipleLists.java | 0 .../tests/m2m/TestM2MSelfRelationship.java | 0 .../org/tests/m2m/TestM2mDeleteObject.java | 0 .../org/tests/m2m/softdelete/MsManyA.java | 0 .../org/tests/m2m/softdelete/MsManyB.java | 0 .../softdelete/TestM2MSoftDeleteExists.java | 0 .../test/java/org/tests/merge/MAddress.java | 0 .../src/test/java/org/tests/merge/MBase.java | 0 .../test/java/org/tests/merge/MContact.java | 0 .../java/org/tests/merge/MContactMessage.java | 0 .../test/java/org/tests/merge/MCustomer.java | 0 .../src/test/java/org/tests/merge/MGroup.java | 0 .../test/java/org/tests/merge/MMachine.java | 0 .../java/org/tests/merge/TestMergeBasic.java | 0 .../org/tests/merge/TestMergeCustomer.java | 0 .../java/org/tests/merge/TestMergeM2M.java | 0 .../org/tests/mockito/TestMockitoMock.java | 0 .../test/java/org/tests/model/BaseModel.java | 0 .../test/java/org/tests/model/EGenProps.java | 0 .../test/java/org/tests/model/EWhoProps.java | 0 .../java/org/tests/model/EWhoPropsSuper.java | 0 .../org/tests/model/aggregation/DMachine.java | 0 .../model/aggregation/DMachineAuxUse.java | 0 .../model/aggregation/DMachineAuxUseAgg.java | 0 .../model/aggregation/DMachineStats.java | 0 .../model/aggregation/DMachineStatsAgg.java | 0 .../tests/model/aggregation/DMachineUse.java | 0 .../org/tests/model/aggregation/DOrg.java | 0 .../tests/model/aggregation/Decimal93.java | 0 .../model/aggregation/MachineUseData.java | 0 .../aggregation/TestAggregationMany.java | 0 .../aggregation/TestAggregationTopLevel.java | 0 .../org/tests/model/array/EArrayBean.java | 0 .../org/tests/model/array/EArraySetBean.java | 0 .../java/org/tests/model/array/IntEnum.java | 0 .../tests/model/array/TestDbArray_asSet.java | 0 .../tests/model/array/TestDbArray_basic.java | 0 .../org/tests/model/array/VarcharEnum.java | 0 .../java/org/tests/model/basic/Address.java | 0 .../java/org/tests/model/basic/Animal.java | 0 .../org/tests/model/basic/AnimalShelter.java | 0 .../java/org/tests/model/basic/Article.java | 0 .../java/org/tests/model/basic/Attribute.java | 0 .../tests/model/basic/AttributeHolder.java | 0 .../java/org/tests/model/basic/BBookmark.java | 0 .../org/tests/model/basic/BBookmarkOrg.java | 0 .../org/tests/model/basic/BBookmarkUser.java | 0 .../org/tests/model/basic/BWithQIdent.java | 0 .../org/tests/model/basic/BasicDomain.java | 0 .../tests/model/basic/BeanWithTimeZone.java | 0 .../java/org/tests/model/basic/BigDog.java | 0 .../java/org/tests/model/basic/CKeyAssoc.java | 0 .../org/tests/model/basic/CKeyDetail.java | 0 .../org/tests/model/basic/CKeyParent.java | 0 .../org/tests/model/basic/CKeyParentId.java | 0 .../test/java/org/tests/model/basic/Car.java | 0 .../org/tests/model/basic/CarAccessory.java | 0 .../java/org/tests/model/basic/CarFuse.java | 0 .../test/java/org/tests/model/basic/Cat.java | 0 .../java/org/tests/model/basic/Contact.java | 0 .../org/tests/model/basic/ContactGroup.java | 0 .../org/tests/model/basic/ContactNote.java | 0 .../java/org/tests/model/basic/Country.java | 0 .../java/org/tests/model/basic/Customer.java | 0 .../tests/model/basic/CustomerAggregate.java | 0 .../test/java/org/tests/model/basic/Dog.java | 0 .../java/org/tests/model/basic/EBasic.java | 0 .../tests/model/basic/EBasicChangeLog.java | 0 .../org/tests/model/basic/EBasicClob.java | 0 .../model/basic/EBasicClobFetchEager.java | 0 .../tests/model/basic/EBasicClobNoVer.java | 0 .../org/tests/model/basic/EBasicEncrypt.java | 0 .../model/basic/EBasicEncryptBinary.java | 0 .../model/basic/EBasicEncryptClient.java | 0 .../model/basic/EBasicEncryptRelate.java | 0 .../org/tests/model/basic/EBasicEnumId.java | 0 .../org/tests/model/basic/EBasicEnumInt.java | 0 .../java/org/tests/model/basic/EBasicLog.java | 0 .../basic/EBasicNoDefaultConstructor.java | 0 .../java/org/tests/model/basic/EBasicVer.java | 0 .../model/basic/EBasicWithLifecycle.java | 0 .../basic/EBasicWithLifecycleExceptions.java | 0 .../org/tests/model/basic/EBasicWithLog.java | 0 .../model/basic/EBasicWithUniqueCon.java | 0 .../java/org/tests/model/basic/ECustomId.java | 0 .../org/tests/model/basic/EDefaultProp.java | 0 .../tests/model/basic/ENullCollection.java | 0 .../model/basic/ENullCollectionDetail.java | 0 .../java/org/tests/model/basic/EOptOneA.java | 0 .../java/org/tests/model/basic/EOptOneB.java | 0 .../java/org/tests/model/basic/EOptOneC.java | 0 .../java/org/tests/model/basic/ESimple.java | 0 .../java/org/tests/model/basic/ESomeType.java | 0 .../org/tests/model/basic/ETransMany.java | 0 .../tests/model/basic/EVanillaCollection.java | 0 .../model/basic/EVanillaCollectionDetail.java | 0 .../org/tests/model/basic/EWithInetAddr.java | 0 .../tests/model/basic/FeatureDescription.java | 0 .../basic/L2CachedLazyDirtFlagResetBean.java | 0 .../L2CachedLazyDirtFlagResetBeanChild.java | 0 .../org/tests/model/basic/ListAttribute.java | 0 .../tests/model/basic/ListAttributeValue.java | 0 .../java/org/tests/model/basic/MNonEnum.java | 0 .../tests/model/basic/MNonUpdPropEntity.java | 0 .../model/basic/MProtectedConstructBean.java | 0 .../java/org/tests/model/basic/MRole.java | 0 .../java/org/tests/model/basic/MUser.java | 0 .../java/org/tests/model/basic/MUserType.java | 0 .../java/org/tests/model/basic/MnocRole.java | 0 .../java/org/tests/model/basic/MnocUser.java | 0 .../java/org/tests/model/basic/MyAdHoc.java | 0 .../model/basic/MyEBasicConfigStartup.java | 0 .../java/org/tests/model/basic/MyLobSize.java | 0 .../tests/model/basic/MyLobSizeJoinMany.java | 0 .../org/tests/model/basic/OBeanChild.java | 0 .../org/tests/model/basic/OCachedBean.java | 0 .../tests/model/basic/OCachedBeanChild.java | 0 .../tests/model/basic/OCachedInhChildA.java | 0 .../tests/model/basic/OCachedInhChildB.java | 0 .../org/tests/model/basic/OCachedInhRoot.java | 0 .../test/java/org/tests/model/basic/OCar.java | 0 .../java/org/tests/model/basic/OEngine.java | 0 .../java/org/tests/model/basic/OGearBox.java | 0 .../java/org/tests/model/basic/Order.java | 0 .../org/tests/model/basic/OrderAggregate.java | 0 .../org/tests/model/basic/OrderDetail.java | 0 .../org/tests/model/basic/OrderShipment.java | 0 .../java/org/tests/model/basic/PFile.java | 0 .../org/tests/model/basic/PFileContent.java | 0 .../org/tests/model/basic/PersistentFile.java | 0 .../model/basic/PersistentFileContent.java | 0 .../java/org/tests/model/basic/Person.java | 0 .../java/org/tests/model/basic/Phone.java | 0 .../java/org/tests/model/basic/Product.java | 0 .../org/tests/model/basic/ResetBasicData.java | 0 .../java/org/tests/model/basic/Section.java | 0 .../java/org/tests/model/basic/SomeEnum.java | 0 .../org/tests/model/basic/SomeEnumBean.java | 0 .../org/tests/model/basic/SomeObject.java | 0 .../org/tests/model/basic/SubSection.java | 0 .../org/tests/model/basic/TBytesOnly.java | 0 .../java/org/tests/model/basic/TIntChild.java | 0 .../java/org/tests/model/basic/TIntRoot.java | 0 .../org/tests/model/basic/TJodaEntity.java | 0 .../tests/model/basic/TMapSuperEntity.java | 0 .../org/tests/model/basic/TMappedSuper2.java | 0 .../test/java/org/tests/model/basic/TOne.java | 0 .../java/org/tests/model/basic/TSDetail.java | 0 .../java/org/tests/model/basic/TSMaster.java | 0 .../org/tests/model/basic/TUuidEntity.java | 0 .../org/tests/model/basic/TWithPreInsert.java | 0 .../test/java/org/tests/model/basic/Trip.java | 0 .../java/org/tests/model/basic/Truck.java | 0 .../java/org/tests/model/basic/TruckRef.java | 0 .../java/org/tests/model/basic/UTDetail.java | 0 .../java/org/tests/model/basic/UTMaster.java | 0 .../java/org/tests/model/basic/UUOne.java | 0 .../java/org/tests/model/basic/UUTwo.java | 0 .../model/basic/ValidationGroupSomething.java | 0 .../java/org/tests/model/basic/Vehicle.java | 0 .../org/tests/model/basic/VehicleDriver.java | 0 .../org/tests/model/basic/VehicleLease.java | 0 .../tests/model/basic/VehicleLeaseLong.java | 0 .../tests/model/basic/VehicleLeaseShort.java | 0 .../org/tests/model/basic/VwCustomer.java | 0 .../org/tests/model/basic/cache/CInhOne.java | 0 .../org/tests/model/basic/cache/CInhRef.java | 0 .../org/tests/model/basic/cache/CInhRoot.java | 0 .../org/tests/model/basic/cache/CInhTwo.java | 0 .../tests/model/basic/cache/ECacheChild.java | 0 .../tests/model/basic/cache/ECacheRoot.java | 0 .../model/basic/cache/ESoftWithCache.java | 0 .../tests/model/basic/cache/OCacheBase.java | 0 .../tests/model/basic/cache/OCachedApp.java | 0 .../model/basic/cache/OCachedAppDetail.java | 0 .../model/basic/cache/OCachedNatKeyBean.java | 0 .../model/basic/cache/OCachedNatKeyBean3.java | 0 .../model/basic/cache/OCachedNkeyUid.java | 0 .../cache/TestCacheViaComplexNaturalKey.java | 0 .../cache/TestCacheViaComplexNaturalKey3.java | 0 .../basic/cache/TestCacheWithSoftDelete.java | 0 .../basic/cache/TestNatKeyCacheWhenNull.java | 0 .../cache/TestNatKeyCacheWithForeignKey.java | 0 .../model/basic/cache/TestNatKeyUid.java | 0 .../basic/event/CustomerPersistAdapter.java | 0 .../basic/event/SimpleTOneQueryAdapter.java | 0 .../event/TWithPreInsertPersistAdapter.java | 0 .../model/basic/finder/CustomerFinder.java | 0 .../org/tests/model/basic/first/First.java | 0 .../org/tests/model/basic/first/Second.java | 0 .../tests/model/basic/first/SuperSecond.java | 0 .../model/basic/first/TestFirstSecond.java | 0 .../model/basic/mapsuper/MapSuperActual.java | 0 .../model/basic/mapsuper/MapSuperNoId.java | 0 .../basic/mapsuper/TestMapSuperEquals.java | 0 .../basic/metaannotation/SizeMedium.java | 0 .../org/tests/model/basic/xtra/DummyDao.java | 0 .../org/tests/model/basic/xtra/EdChild.java | 0 .../model/basic/xtra/EdExtendedParent.java | 0 .../org/tests/model/basic/xtra/EdParent.java | 0 .../OptimisticLockExceptionThrowingDao.java | 0 .../xtra/TestDeleteUnloadedChildren.java | 0 .../TestInsertBatchThenFlushThenUpdate.java | 0 .../basic/xtra/TestInsertBatchThenUpdate.java | 0 ...TestInsertBatchWithDifferentRootTypes.java | 0 .../org/tests/model/bridge/BAccessLevel.java | 0 .../java/org/tests/model/bridge/BDManyId.java | 0 .../java/org/tests/model/bridge/BEmbId.java | 0 .../java/org/tests/model/bridge/BSite.java | 0 .../org/tests/model/bridge/BSiteUserA.java | 0 .../org/tests/model/bridge/BSiteUserB.java | 0 .../org/tests/model/bridge/BSiteUserC.java | 0 .../org/tests/model/bridge/BSiteUserD.java | 0 .../tests/model/bridge/BSiteUserDMany.java | 0 .../org/tests/model/bridge/BSiteUserE.java | 0 .../java/org/tests/model/bridge/BUser.java | 0 .../bridge/TestExplicitM2MBridgeTable.java | 0 .../tests/model/bridge/TestIdClassScalar.java | 0 .../java/org/tests/model/cache/EColAB.java | 0 .../org/tests/model/cache/M2MCacheChild.java | 0 .../org/tests/model/cache/M2MCacheMaster.java | 0 .../java/org/tests/model/carwheel/Car.java | 0 .../java/org/tests/model/carwheel/Tire.java | 0 .../java/org/tests/model/carwheel/Wheel.java | 0 .../org/tests/model/carwheeltruck/TCar.java | 0 .../org/tests/model/carwheeltruck/TTruck.java | 0 .../model/carwheeltruck/TTruckHolder.java | 0 .../model/carwheeltruck/TTruckHolderItem.java | 0 .../org/tests/model/carwheeltruck/TWheel.java | 0 .../TestInheritSoftDeleteJoin.java | 0 .../TestMTOInheritNoDiscriminator.java | 0 .../TestTruckCarWheelInhertiance.java | 0 .../org/tests/model/composite/CkeClient.java | 0 .../tests/model/composite/CkeClientKey.java | 0 .../org/tests/model/composite/CkeUser.java | 0 .../org/tests/model/composite/CkeUserKey.java | 0 .../org/tests/model/composite/RCustomer.java | 0 .../tests/model/composite/RCustomerKey.java | 0 .../org/tests/model/composite/ROrder.java | 0 .../org/tests/model/composite/ROrderPK.java | 0 .../composite/TestCompositeKeyUserClient.java | 0 .../model/converstation/Conversation.java | 0 .../org/tests/model/converstation/Group.java | 0 .../tests/model/converstation/Message.java | 0 .../model/converstation/Participation.java | 0 .../org/tests/model/converstation/User.java | 0 .../java/org/tests/model/ddd/DExhEntity.java | 0 .../java/org/tests/model/ddd/DPerson.java | 0 .../model/ddd/TestScalarTypeConverter.java | 0 .../tests/model/docstore/CustomerReport.java | 0 .../tests/model/docstore/ProductReport.java | 0 .../java/org/tests/model/docstore/Report.java | 0 .../org/tests/model/draftable/BaseDomain.java | 0 .../model/draftable/BasicDraftableBean.java | 0 .../java/org/tests/model/draftable/Doc.java | 0 .../org/tests/model/draftable/Document.java | 0 .../tests/model/draftable/DocumentMedia.java | 0 .../java/org/tests/model/draftable/Link.java | 0 .../tests/model/draftable/Organisation.java | 0 .../model/elementcollection/EcEnumPerson.java | 0 .../model/elementcollection/EcPerson.java | 0 .../EcPersonPersistAdapter.java | 0 .../model/elementcollection/EcPhone.java | 0 .../tests/model/elementcollection/EcTop.java | 0 .../model/elementcollection/EcblPerson.java | 0 .../model/elementcollection/EcbmPerson.java | 0 .../model/elementcollection/EcmPerson.java | 0 .../elementcollection/EcmPersonTest.java | 0 .../model/elementcollection/EcmcPerson.java | 0 .../model/elementcollection/EcsPerson.java | 0 .../elementcollection/EcsPersonTest.java | 0 .../model/elementcollection/EcsmChild.java | 0 .../model/elementcollection/EcsmOne.java | 0 .../model/elementcollection/EcsmParent.java | 0 .../model/elementcollection/EcsmTwo.java | 0 .../TestElementCollectionBasic.java | 0 .../TestElementCollectionBasicCache.java | 0 .../TestElementCollectionBasicMap.java | 0 .../TestElementCollectionBasicMapAsLob.java | 0 .../TestElementCollectionBasicMapCache.java | 0 .../TestElementCollectionBasicSet.java | 0 .../TestElementCollectionCascade.java | 0 .../TestElementCollectionCascadeMultiple.java | 0 .../TestElementCollectionEmbeddedList.java | 0 ...estElementCollectionEmbeddedListCache.java | 0 .../TestElementCollectionEmbeddedMap.java | 0 ...TestElementCollectionEmbeddedMapCache.java | 0 .../TestElementCollectionEnumSet.java | 0 .../TestElementCollectionResused.java | 0 .../java/org/tests/model/embedded/EAddr.java | 0 .../org/tests/model/embedded/EAddress.java | 0 .../tests/model/embedded/EAddressStatus.java | 0 .../tests/model/embedded/EEmbDatePeriod.java | 0 .../org/tests/model/embedded/EEmbInner.java | 0 .../org/tests/model/embedded/EEmbOuter.java | 0 .../org/tests/model/embedded/EInvoice.java | 0 .../java/org/tests/model/embedded/EMain.java | 0 .../org/tests/model/embedded/EPerAddr.java | 0 .../org/tests/model/embedded/EPerson.java | 0 .../org/tests/model/embedded/EPerson2.java | 0 .../org/tests/model/embedded/EPerson3.java | 0 .../org/tests/model/embedded/Eembeddable.java | 0 .../tests/model/embedded/PrimaryRevision.java | 0 .../org/tests/model/embedded/RevisionId.java | 0 .../embedded/TestEmbeddedAttrOverride.java | 0 .../TestEmbeddedEqualsWhenCreated.java | 0 .../model/embedded/TestEmbeddedManyToOne.java | 0 .../TestEmbeddedNullableOverride.java | 0 .../model/embedded/UserInterestLive.java | 0 .../model/embedded/UserInterestLiveKey.java | 0 .../org/tests/model/family/ChildPerson.java | 0 .../tests/model/family/GrandParentPerson.java | 0 .../tests/model/family/InheritablePerson.java | 0 .../org/tests/model/family/ParentPerson.java | 0 .../java/org/tests/model/generated/User.java | 0 .../model/generated/WhoPropsOneToMany.java | 0 .../org/tests/model/history/HEmbiBean.java | 0 .../java/org/tests/model/history/HEmbiId.java | 0 .../java/org/tests/model/history/HeDoc.java | 0 .../java/org/tests/model/history/HeLink.java | 0 .../java/org/tests/model/history/HiDoc.java | 0 .../java/org/tests/model/history/HiLink.java | 0 .../java/org/tests/model/history/HiTOne.java | 0 .../org/tests/model/history/HiTThree.java | 0 .../java/org/tests/model/history/HiTTwo.java | 0 .../org/tests/model/history/HsdSetting.java | 0 .../java/org/tests/model/history/HsdUser.java | 0 .../model/history/TestHistoryEmbeddedId.java | 0 .../model/history/TestHistoryExclude.java | 0 .../model/history/TestHistoryInclude.java | 0 .../model/history/TestHistoryOneToMany.java | 0 .../TestHistorySoftDeleteOneToOne.java | 0 .../org/tests/model/info/InfoCompany.java | 0 .../org/tests/model/info/InfoContact.java | 0 .../org/tests/model/info/InfoCustomer.java | 0 .../model/inheritexposedtype/IXPhoto.java | 0 .../model/inheritexposedtype/IXResource.java | 0 .../test/TestInheritExposeDtype.java | 0 .../tests/model/inheritmany/IMRelated.java | 0 .../org/tests/model/inheritmany/IMRoot.java | 0 .../tests/model/inheritmany/IMRootOne.java | 0 .../tests/model/inheritmany/IMRootTwo.java | 0 .../org/tests/model/inheritmany/MBase.java | 0 .../org/tests/model/inheritmany/MMedia.java | 0 .../org/tests/model/inheritmany/MPicture.java | 0 .../org/tests/model/inheritmany/MProfile.java | 0 .../TestMediaInheritanceJoinToMany.java | 0 .../org/tests/model/interfaces/Address.java | 0 .../org/tests/model/interfaces/IAddress.java | 0 .../org/tests/model/interfaces/IPerson.java | 0 .../org/tests/model/interfaces/IPersona.java | 0 .../org/tests/model/interfaces/Person.java | 0 .../org/tests/model/interfaces/Persona.java | 0 .../tests/model/interfaces/SelfManyMany.java | 0 .../tests/model/interfaces/TestSelfMany.java | 0 .../model/interfaces/TestTargetEntity.java | 0 .../org/tests/model/ivo/ESomeConvertType.java | 0 .../test/java/org/tests/model/ivo/Money.java | 0 .../test/java/org/tests/model/ivo/Oid.java | 0 .../java/org/tests/model/ivo/Segment.java | 0 .../java/org/tests/model/ivo/SysTime.java | 0 .../tests/model/ivo/converter/AnEnumType.java | 0 .../ivo/converter/AnEnumTypeConvert.java | 0 .../ivo/converter/MoneyTypeConverter.java | 0 .../model/ivo/converter/OidTypeConverter.java | 0 .../model/ivo/converter/SysTimeConverter.java | 0 .../ivo/test/TestAttributeConverter.java | 0 .../org/tests/model/joda/BasicJodaEntity.java | 0 .../model/joda/TestJodaInsertUpdate.java | 0 .../tests/model/json/BasicJacksonType.java | 0 .../org/tests/model/json/EBasicHstore.java | 0 .../tests/model/json/EBasicJsonJackson.java | 0 .../tests/model/json/EBasicJsonJackson2.java | 0 .../tests/model/json/EBasicJsonJackson3.java | 0 .../org/tests/model/json/EBasicJsonList.java | 0 .../org/tests/model/json/EBasicJsonMap.java | 0 .../tests/model/json/EBasicJsonMapBlob.java | 0 .../tests/model/json/EBasicJsonMapClob.java | 0 .../tests/model/json/EBasicJsonMapDetail.java | 0 .../tests/model/json/EBasicJsonMapJsonB.java | 0 .../model/json/EBasicJsonMapVarchar.java | 0 .../org/tests/model/json/EBasicJsonMulti.java | 0 .../org/tests/model/json/EBasicJsonNode.java | 0 .../tests/model/json/EBasicJsonNodeBlob.java | 0 .../tests/model/json/EBasicJsonNodeJsonB.java | 0 .../model/json/EBasicJsonNodeVarchar.java | 0 .../tests/model/json/EBasicJsonUnmapped.java | 0 .../org/tests/model/json/EBasicOldValue.java | 0 .../org/tests/model/json/EBasicPlain.java | 0 .../org/tests/model/json/LongJacksonType.java | 0 .../java/org/tests/model/json/PlainBean.java | 0 .../tests/model/json/PlainBeanDirtyAware.java | 0 .../tests/model/json/StringJacksonType.java | 0 .../model/json/TestJacksonPlainBean.java | 0 .../model/lazywithcache/ChildWithCache.java | 0 .../tests/model/lazywithcache/ParentA.java | 0 .../tests/model/lazywithcache/ParentB.java | 0 .../TestWithCacheAndLazyLoad.java | 0 .../org/tests/model/lazywithid/Looney.java | 0 .../model/lazywithid/TestColumnIdName.java | 0 .../java/org/tests/model/lazywithid/Tune.java | 0 .../java/org/tests/model/m2m/DCredit.java | 0 .../test/java/org/tests/model/m2m/DRol.java | 0 .../test/java/org/tests/model/m2m/DRot.java | 0 .../java/org/tests/model/m2m/MailBox.java | 0 .../java/org/tests/model/m2m/MailUser.java | 0 .../test/java/org/tests/model/m2m/MnyA.java | 0 .../test/java/org/tests/model/m2m/MnyB.java | 0 .../test/java/org/tests/model/m2m/MnyC.java | 0 .../java/org/tests/model/m2m/MnyEdge.java | 0 .../java/org/tests/model/m2m/MnyNode.java | 0 .../java/org/tests/model/m2m/MnyTopic.java | 0 .../java/org/tests/model/m2m/Permission.java | 0 .../test/java/org/tests/model/m2m/Role.java | 0 .../test/java/org/tests/model/m2m/Tenant.java | 0 .../tests/model/m2m/TestM2MDoubleInsert.java | 0 .../org/tests/model/m2m/TestM2MWithWhere.java | 0 .../test/java/org/tests/model/m2o/Addr.java | 0 .../test/java/org/tests/model/m2o/Empl.java | 0 .../tests/model/m2o/TestManyToOneAsOne.java | 0 .../model/map/BeanMapOrphanRemovalTest.java | 0 .../test/java/org/tests/model/map/MpRole.java | 0 .../test/java/org/tests/model/map/MpUser.java | 0 .../tests/model/mappedsuper/ASimpleBean.java | 0 .../mappedsuper/NotEnhancedMappedSuper.java | 0 .../java/org/tests/model/nofk/EFile2NoFk.java | 0 .../java/org/tests/model/nofk/EFileNoFk.java | 0 .../java/org/tests/model/nofk/EUserNoFk.java | 0 .../tests/model/nofk/EUserNoFkSoftDel.java | 0 .../java/org/tests/model/nofk/Test2NoFk.java | 0 .../java/org/tests/model/nofk/TestNoFk.java | 0 .../org/tests/model/nofk/TestTruncate.java | 0 .../java/org/tests/model/noid/NoIdBean.java | 0 .../tests/model/noid/TestInsertNoIdBean.java | 0 .../org/tests/model/onetoone/Account.java | 0 .../org/tests/model/onetoone/OCompany.java | 0 .../tests/model/onetoone/ORoadShowMsg.java | 0 .../org/tests/model/onetoone/OtoAone.java | 0 .../org/tests/model/onetoone/OtoAtwo.java | 0 .../org/tests/model/onetoone/OtoBChild.java | 0 .../org/tests/model/onetoone/OtoBMaster.java | 0 .../org/tests/model/onetoone/OtoChild.java | 0 .../org/tests/model/onetoone/OtoCust.java | 0 .../tests/model/onetoone/OtoCustAddress.java | 0 .../org/tests/model/onetoone/OtoMaster.java | 0 .../org/tests/model/onetoone/OtoPrime.java | 0 .../tests/model/onetoone/OtoPrimeExtra.java | 0 .../org/tests/model/onetoone/OtoSdChild.java | 0 .../org/tests/model/onetoone/OtoSdMaster.java | 0 .../org/tests/model/onetoone/OtoThMany.java | 0 .../org/tests/model/onetoone/OtoThOne.java | 0 .../org/tests/model/onetoone/OtoThTop.java | 0 .../org/tests/model/onetoone/OtoUBPrime.java | 0 .../tests/model/onetoone/OtoUBPrimeExtra.java | 0 .../org/tests/model/onetoone/OtoUPrime.java | 0 .../tests/model/onetoone/OtoUPrimeExtra.java | 0 .../org/tests/model/onetoone/OtoUser.java | 0 .../tests/model/onetoone/OtoUserOptional.java | 0 .../onetoone/TestOneToOneCascadeSave.java | 0 .../TestOneToOneImportedPkNative.java | 0 .../onetoone/TestOneToOneJoinColumn.java | 0 .../onetoone/TestOneToOneManyDelete.java | 0 .../TestOneToOneOptionalRelationship.java | 0 .../onetoone/TestOneToOneOrphanRemove.java | 0 .../onetoone/TestOneToOneOrphanStringId.java | 0 .../onetoone/TestOneToOnePrimaryKeyJoin.java | 0 .../TestOneToOnePrimaryKeyJoinBidi.java | 0 .../TestOneToOnePrimaryKeyJoinOptional.java | 0 .../onetoone/TestOneToOneSoftDeleteChild.java | 0 .../java/org/tests/model/onetoone/User.java | 0 .../org/tests/model/onetoone/album/Album.java | 0 .../tests/model/onetoone/album/BaseModel.java | 0 .../org/tests/model/onetoone/album/Cover.java | 0 .../album/DeleteById_SoftDelete_Tests.java | 0 .../album/TestOneToOneHardDelete.java | 0 .../tests/model/onetoone/calcd/CalcDData.java | 0 .../model/onetoone/calcd/CalcDInput.java | 0 .../TestOneToOnePrimaryKeyJoinMapping.java | 0 .../tests/model/orderentity/OrderEntity.java | 0 .../model/orderentity/OrderItemEntity.java | 0 .../model/orphanremoval/OmBeanListChild.java | 0 .../model/orphanremoval/OmBeanListParent.java | 0 .../tests/model/orphanremoval/OrpDetail.java | 0 .../tests/model/orphanremoval/OrpDetail2.java | 0 .../tests/model/orphanremoval/OrpMaster.java | 0 .../tests/model/orphanremoval/OrpMaster2.java | 0 .../TestOrphanRemovalOverwrite.java | 0 .../orphanremoval/TestOrphanRemoveO2M.java | 0 .../TestOrphanRemoveO2MFlat.java | 0 .../java/org/tests/model/prnt/MPrinter.java | 0 .../tests/model/prnt/MPrinterListener.java | 0 .../org/tests/model/prnt/MPrinterState.java | 0 .../java/org/tests/model/prnt/MSomeOther.java | 0 .../model/prnt/TestPrinterStateIssue.java | 0 .../java/org/tests/model/pview/Paggview.java | 0 .../java/org/tests/model/pview/Pview.java | 0 .../java/org/tests/model/pview/TestPview.java | 0 .../java/org/tests/model/pview/Wview.java | 0 .../tests/model/rawsql/ERawSqlAggBean.java | 0 .../tests/model/selfref/BaseResourceFile.java | 0 .../org/tests/model/selfref/ResourceFile.java | 0 .../org/tests/model/selfref/SelfParent.java | 0 .../tests/model/selfref/SelfRefCustomer.java | 0 .../tests/model/selfref/SelfRefExample.java | 0 .../selfref/TestResourceFileSelfRef.java | 0 .../model/selfref/TestSelfRefExample.java | 0 .../model/selfref/TestTextJsonSelfRef.java | 0 .../org/tests/model/site/DataContainer.java | 0 .../test/java/org/tests/model/site/Site.java | 0 .../org/tests/model/site/SiteAddress.java | 0 .../org/tests/model/site/TestTreeModel.java | 0 .../java/org/tests/model/site/TreeEntity.java | 0 .../model/softdelete/BaseSoftDelete.java | 0 .../model/softdelete/EBasicNoSDChild.java | 0 .../tests/model/softdelete/EBasicSDChild.java | 0 .../model/softdelete/EBasicSoftDelete.java | 0 .../tests/model/softdelete/ESoftDelBook.java | 0 .../tests/model/softdelete/ESoftDelDown.java | 0 .../tests/model/softdelete/ESoftDelMid.java | 0 .../tests/model/softdelete/ESoftDelOneA.java | 0 .../tests/model/softdelete/ESoftDelOneB.java | 0 .../tests/model/softdelete/ESoftDelRole.java | 0 .../tests/model/softdelete/ESoftDelTop.java | 0 .../tests/model/softdelete/ESoftDelUp.java | 0 .../tests/model/softdelete/ESoftDelUser.java | 0 .../org/tests/model/softdelete/ESoftDelX.java | 0 .../org/tests/model/softdelete/ESoftDelY.java | 0 .../org/tests/model/softdelete/ESoftDelZ.java | 0 .../org/tests/model/softdelete/EsdDetail.java | 0 .../org/tests/model/softdelete/EsdMaster.java | 0 .../java/org/tests/model/survey/Category.java | 0 .../java/org/tests/model/survey/Group.java | 0 .../java/org/tests/model/survey/Question.java | 0 .../java/org/tests/model/survey/Survey.java | 0 .../tests/model/survey/TestOrderByFetch.java | 0 .../java/org/tests/model/tevent/TEvent.java | 0 .../org/tests/model/tevent/TEventMany.java | 0 .../org/tests/model/tevent/TEventOne.java | 0 .../tevent/TestAssocOneNullTraverse.java | 0 .../org/tests/model/types/SomeFileBean.java | 0 .../tests/model/types/SomeNewTypesBean.java | 0 .../org/tests/model/types/SomePeriodBean.java | 0 .../uuidsibling/SoftDeleteCascadeTest.java | 0 .../tests/model/uuidsibling/USibChild.java | 0 .../model/uuidsibling/USibChildSibling.java | 0 .../tests/model/uuidsibling/USibParent.java | 0 .../TestVersionHierarchyModification.java | 0 .../org/tests/model/version/VersionChild.java | 0 .../tests/model/version/VersionParent.java | 0 .../org/tests/model/version/VersionToy.java | 0 .../java/org/tests/model/view/EOrderAgg.java | 0 .../tests/model/view/TestViewBaseEntity.java | 0 .../org/tests/model/zero/TestWithZero.java | 0 .../java/org/tests/model/zero/WithZero.java | 0 .../org/tests/model/zero/WithZeroParent.java | 0 .../src/test/java/org/tests/o2m/OMVertex.java | 0 .../java/org/tests/o2m/OMVertexOther.java | 0 .../java/org/tests/o2m/OmAccountChildDBO.java | 0 .../test/java/org/tests/o2m/OmAccountDBO.java | 0 .../test/java/org/tests/o2m/OmBasicChild.java | 0 .../java/org/tests/o2m/OmBasicParent.java | 0 .../tests/o2m/TestOneToManyNoMappedBy.java | 0 .../org/tests/o2m/TestOneToManyOnlyBean.java | 0 .../org/tests/o2m/TestOneToManyWhere.java | 0 .../org/tests/o2m/TestOneToManyWildcard.java | 0 .../org/tests/o2m/jointable/JtMonkey.java | 0 .../tests/o2m/jointable/JtMonkeyGroup.java | 0 .../org/tests/o2m/jointable/JtTrainer.java | 0 .../java/org/tests/o2m/jointable/JtTroop.java | 0 .../o2m/jointable/TestOneToManyJoinTable.java | 0 .../TestOneToManyJoinTableInheritance.java | 0 .../TestOneToManyJoinTableNoTableName.java | 0 .../o2m/jointable/inheritance/ClassA.java | 0 .../o2m/jointable/inheritance/ClassB.java | 0 .../o2m/jointable/inheritance/ClassSuper.java | 0 .../test/java/org/tests/o2m/lazy/OmlBar.java | 0 .../test/java/org/tests/o2m/lazy/OmlBaz.java | 0 .../test/java/org/tests/o2m/lazy/OmlFoo.java | 0 .../tests/o2m/lazy/TestLazyManyViaPath.java | 0 .../test/java/org/tests/o2o/OtoLevelA.java | 0 .../test/java/org/tests/o2o/OtoLevelB.java | 0 .../test/java/org/tests/o2o/OtoLevelC.java | 0 .../o2o/TestOneToOneSaveWithoutChanges.java | 0 .../java/org/tests/o2o/TestReferenceSave.java | 0 .../java/org/tests/order/OrderMaster.java | 0 .../org/tests/order/OrderReferencedChild.java | 0 .../tests/order/OrderReferencedParent.java | 0 .../test/java/org/tests/order/OrderToy.java | 0 .../java/org/tests/order/TestOrderColumn.java | 0 ...stPersistenceContextOnUpdateDuringTxn.java | 0 .../TestPersistenceContextQueryScope.java | 0 ...estPersistenceContextScopeUsingOrders.java | 0 .../TestPersistenceContextServerConfig.java | 0 .../tests/profile/ProfileLocationTest.java | 0 .../org/tests/profile/ProfileSimpleQuery.java | 0 .../TestAddOrderByWithFirstRowsMaxRows.java | 0 .../query/TestAutofetchTuneWithJoin.java | 0 .../query/TestConnectionCloseOnSqlerr.java | 0 .../org/tests/query/TestDefaultFetchLazy.java | 0 .../query/TestExprNestedDisjunction.java | 0 .../org/tests/query/TestFindOneOrEmpty.java | 0 .../java/org/tests/query/TestIContains.java | 0 .../TestImplicitJoinOnParentRelationship.java | 0 .../org/tests/query/TestInvalidFetchPath.java | 0 .../tests/query/TestJoinOptOneCascade.java | 0 .../tests/query/TestLimitAlterFetchMany.java | 0 .../java/org/tests/query/TestLimitQuery.java | 0 .../org/tests/query/TestManyWhereJoin.java | 0 .../org/tests/query/TestManyWhereJoinM2M.java | 0 .../org/tests/query/TestMyAdHocSqlSelect.java | 0 .../query/TestOneToManyCorrectGrouping.java | 0 .../java/org/tests/query/TestOuterJoin.java | 0 .../java/org/tests/query/TestQueryAlias.java | 0 .../org/tests/query/TestQueryBaseTable.java | 0 .../java/org/tests/query/TestQueryExists.java | 0 .../query/TestQueryFetchJoinWithOrder.java | 0 .../query/TestQueryFetchManyTwoDeep.java | 0 .../tests/query/TestQueryFetchSkipPath.java | 0 .../query/TestQueryFilterCaseInsensitive.java | 0 .../org/tests/query/TestQueryFilterMany.java | 0 .../tests/query/TestQueryFilterManyOnM2M.java | 0 .../query/TestQueryFilterManyOnSecondary.java | 0 .../query/TestQueryFilterManySimple.java | 0 .../org/tests/query/TestQueryFindEach.java | 0 .../tests/query/TestQueryFindEachWhile.java | 0 .../tests/query/TestQueryFindFutureList.java | 0 .../org/tests/query/TestQueryFindIterate.java | 0 .../tests/query/TestQueryFindMapTypedKey.java | 0 .../org/tests/query/TestQueryFindNative.java | 0 .../tests/query/TestQueryFindPagedList.java | 0 .../tests/query/TestQueryFindReadOnly.java | 0 .../org/tests/query/TestQueryFindStream.java | 0 .../org/tests/query/TestQueryInAssocOne.java | 0 .../query/TestQueryInIdTypeConversion.java | 0 .../java/org/tests/query/TestQueryIsNull.java | 0 .../tests/query/TestQueryJoinBatchSize.java | 0 .../tests/query/TestQueryJoinMulipleMany.java | 0 .../tests/query/TestQueryMultiManyOrder.java | 0 .../tests/query/TestQueryNullAssocOne.java | 0 .../org/tests/query/TestQueryOrderById.java | 0 .../query/TestQueryPathJoinAndOrder.java | 0 .../query/TestQueryPlanCacheRowCount.java | 0 .../tests/query/TestRefToLazyLoadMany.java | 0 .../java/org/tests/query/TestRowCount.java | 0 .../java/org/tests/query/TestSubQuery.java | 0 .../tests/query/TestThreeLevelQueryJoin.java | 0 .../java/org/tests/query/TestWhereIn.java | 0 .../org/tests/query/TestWhereRawClause.java | 0 .../aggregation/TestAggregationCount.java | 0 .../query/autotune/TestAutoTuneProfiling.java | 0 .../test/java/org/tests/query/cache/Acl.java | 0 .../query/cache/AclContainerRelation.java | 0 .../java/org/tests/query/cache/Contract.java | 0 .../org/tests/query/cache/ContractCosts.java | 0 .../java/org/tests/query/cache/Main1.java | 0 .../java/org/tests/query/cache/Main2.java | 0 .../java/org/tests/query/cache/Position.java | 0 .../org/tests/query/cache/TestDistinct.java | 0 .../org/tests/query/cancel/EBasicDto.java | 0 .../tests/query/cancel/SlowDownEBasic.java | 0 .../query/cancel/SqlQueryCancelTest.java | 0 .../TestFilteringByEmbeddedInJoinedTable.java | 0 .../embedded/TestMultipleEmbeddedLoading.java | 0 .../query/finder/TestCustomerFinder.java | 0 .../joins/TestDisjunctWhereOuterJoin.java | 0 .../joins/TestDisjunctWhereOuterOnMany.java | 0 .../query/joins/TestQueryJoinManyNonRoot.java | 0 .../query/joins/TestQueryJoinOnFormula.java | 0 .../joins/TestQueryJoinQueryNonRoot.java | 0 .../TestQueryManyToOneWhereClauseJoin.java | 0 .../query/lazy/TestQueryDefaultBatchSize.java | 0 .../tests/query/orderby/TestOrderByClear.java | 0 .../query/orderby/TestOrderByOnComplex.java | 0 .../orderby/TestOrderByWithDistinct.java | 0 .../orderby/TestOrderByWithDistinctTake2.java | 0 .../orderby/TestOrderByWithFunction.java | 0 .../query/orderby/TestOrderByWithMany.java | 0 .../query/other/TestFetchPreference.java | 0 .../other/TestFindIdsWithInheritance.java | 0 .../query/other/TestFindIterateHeapDump.java | 0 ...stFindPartialWithConstructorSetFields.java | 0 .../other/TestFindWhereUsingEnumerated.java | 0 .../query/other/TestFormulaWithFindCount.java | 0 .../tests/query/other/TestLikeEscaping.java | 0 .../query/other/TestManyLazyLoadingQuery.java | 0 .../other/TestManyToManyLazyLoading.java | 0 .../tests/query/other/TestOneToManyAsMap.java | 0 .../other/TestQueryConversationRowCount.java | 0 .../tests/query/other/TestQueryDistinct.java | 0 .../other/TestQueryRawExpressionMany.java | 0 .../other/TestQueryRowCountWithMany.java | 0 .../query/other/TestQuerySingleAttribute.java | 0 .../org/tests/query/other/TestSelfParent.java | 0 .../query/other/TestSubQueryBinding.java | 0 .../query/other/TestWhereAnnotation.java | 0 .../query/other/TestWhereLikeWithSlash.java | 0 .../softdelete/TestSoftDeletePagingList.java | 0 .../tests/query/sqlquery/SqlQueryTests.java | 0 .../sqlquery/TestNativeILikeExpression.java | 0 .../TestQuotedIdentifierQuery.java | 0 .../java/org/tests/rawsql/A2Customer.java | 0 .../test/java/org/tests/rawsql/ACustomer.java | 0 .../tests/rawsql/TestInsertSqlLogging.java | 0 .../tests/rawsql/TestOrderReportTotal.java | 0 .../org/tests/rawsql/TestRawSqlAsKeyword.java | 0 .../rawsql/TestRawSqlCustomerAggregate.java | 0 .../tests/rawsql/TestRawSqlMasterDetail.java | 0 .../tests/rawsql/TestRawSqlNamedParams.java | 0 .../org/tests/rawsql/TestRawSqlOrmQuery.java | 0 .../rawsql/TestRawSqlOrmQueryDistinct.java | 0 .../tests/rawsql/TestRawSqlOrmWrapper.java | 0 .../tests/rawsql/TestRawSqlOrmWrapper2.java | 0 .../tests/rawsql/TestRawSqlOrmWrapper3.java | 0 .../rawsql/TestRawSqlPositionedParams.java | 0 .../tests/rawsql/TestRawSqlUnparsedQuery.java | 0 .../tests/rawsql/TestRawSqlWithResultSet.java | 0 .../tests/rawsql/inherit/ParentQueryTest.java | 0 .../rawsql/inherit/ParentRawSqlTest.java | 0 .../rawsql/nativesql/TestNativeSqlBasic.java | 0 .../nativesql/TestNativeWithEmbedded.java | 0 .../org/tests/readaudit/TestReadAudit.java | 0 .../tests/refresh/TestRefreshWithMany.java | 0 .../tests/repository/CustomerRepository.java | 0 .../tests/repository/TestBeanRepository.java | 0 .../saveassociation/TestSaveAssociation.java | 0 .../tests/saveassociation/TestSaveSamePK.java | 0 .../TestInheritQuery.java | 0 .../model/PalletLocation.java | 0 .../model/PalletLocationExternal.java | 0 .../model/Warehouse.java | 0 .../singleTableInheritance/model/Zone.java | 0 .../model/ZoneExternal.java | 0 .../model/ZoneInternal.java | 0 .../tests/softdelete/TestSoftDeleteBasic.java | 0 .../tests/softdelete/TestSoftDeleteBook.java | 0 .../softdelete/TestSoftDeleteManyToMany.java | 0 .../TestSoftDeleteOptionalRelationship.java | 0 .../softdelete/TestSoftDeleteOtoCascade.java | 0 .../TestSoftDeleteStatelessUpdate.java | 0 .../tests/softdelete/TestSoftDeleteTop.java | 0 .../org/tests/sp/TestManyToManySaveTwice.java | 0 .../java/org/tests/sp/model/IdEntity.java | 0 .../test/java/org/tests/sp/model/car/Car.java | 0 .../java/org/tests/sp/model/car/Door.java | 0 .../java/org/tests/sp/model/car/Wheel.java | 0 .../org/tests/test/TestInheritWithMany.java | 0 .../org/tests/text/csv/TestCsvReader.java | 0 .../text/csv/TestCsvReaderWithCallback.java | 0 .../tests/text/csv/TestTimeStringParser.java | 0 .../json/TestJsonBeanDescriptorParse.java | 0 .../text/json/TestJsonBeanWithTimeZone.java | 0 .../TestJsonInheritanceDiscriminator.java | 0 .../java/org/tests/text/json/TestJsonMap.java | 0 .../org/tests/text/json/TestJsonSimple.java | 0 .../json/TestJsonSomeEnumWithToString.java | 0 .../json/TestTextJsonBeanReadVisitor.java | 0 .../text/json/TestTextJsonCompoundType.java | 0 .../text/json/TestTextJsonInheritance.java | 0 .../text/json/TestTextJsonInsertUpdate.java | 0 .../text/json/TestTextJsonInvokeLazy.java | 0 .../json/TestTextJsonReadManyLazyLoad.java | 0 .../text/json/TestTextJsonReferenceBean.java | 0 .../tests/text/json/TestTextJsonSimple.java | 0 .../text/json/TestTextJsonSuperSimple.java | 0 .../text/json/TestTextJsonUpdateCascade.java | 0 .../org/tests/timezone/TimezoneTests.java | 0 .../test/java/org/tests/timezone/TzBean.java | 0 .../java/org/tests/timezone/TzBeanTests.java | 0 .../transaction/TestBatchModelFlush.java | 0 .../transaction/TestBatchPersistCascade.java | 0 .../tests/transaction/TestBeanStateReset.java | 0 .../TestBeginTransactionWithExisting.java | 0 .../transaction/TestCommitAndContinue.java | 0 .../TestCreateTransactionWithIsolation.java | 0 .../TestDeleteFromPersistenceContext.java | 0 .../transaction/TestExecuteComplete.java | 0 .../transaction/TestInsertManyAndRef.java | 0 .../org/tests/transaction/TestNested.java | 0 .../transaction/TestNestedBeginRequired.java | 0 .../TestNestedBeginRequiredWithFailure.java | 0 .../TestNestedBeginRequiresNew.java | 0 ...TestNestedBeginRequiresNewWithFailure.java | 0 .../transaction/TestNestedMandatory.java | 0 .../transaction/TestNestedSubTransaction.java | 0 .../transaction/TestNestedTransaction.java | 0 .../transaction/TestPersistContextClear.java | 0 .../org/tests/transaction/TestSavepoint.java | 0 .../tests/transaction/TestSqlServerBatch.java | 0 .../TestStatelessUpdateClearPC.java | 0 .../transaction/TestTransactionCallback.java | 0 .../TestTransactionRollbackOnly.java | 0 .../transaction/TestTransactionSkipCache.java | 0 .../TestTransactionTryResources.java | 0 .../transaction/TestTransactionalNever.java | 0 .../TestTransactionalNotSupports.java | 0 .../TestTransactionalReadOnly.java | 0 .../TestTransactionalRequired.java | 0 .../TestTransactionalRequiresNew.java | 0 .../TestTransactionalSupports.java | 0 .../TestTransactionalWhenThrow.java | 0 ...TransactionNotTerminatedAfterRollback.java | 0 .../TestTransparentPersist.java | 0 .../java/org/tests/types/EncryptedBinary.java | 0 .../java/org/tests/types/EncryptedString.java | 0 .../org/tests/types/PasswordStoreModel.java | 0 .../ScalarTypeEncryptedBinaryConverter.java | 0 .../ScalarTypeEncryptedStringConverter.java | 0 .../org/tests/types/TestEncryptedString.java | 0 .../java/org/tests/types/TestFileType.java | 0 .../org/tests/types/TestFileTypeFetching.java | 0 .../test/java/org/tests/types/TestHstore.java | 0 .../java/org/tests/types/TestNewTypes.java | 0 .../java/org/tests/types/TestPeriodType.java | 0 .../unidirectional/TestUniDirectional.java | 0 .../org/tests/unitinternal/HelloMain.java | 0 .../unitinternal/TestEqualsOnEnhanced.java | 0 .../unitinternal/TestNamingConvention.java | 0 .../unitinternal/TestNullCollectionSet.java | 0 .../tests/unitinternal/TestOrderByParse.java | 0 .../TestTxTypeOnTransactional.java | 0 .../TestVanillaCollectionSet.java | 0 .../java/org/tests/update/EPersonOnline.java | 0 .../update/TestEmbeddedRefreshUpdate.java | 0 .../tests/update/TestJsonStatelessUpdate.java | 0 .../org/tests/update/TestMarkAsDirty.java | 0 .../tests/update/TestPostgresTruncate.java | 0 .../org/tests/update/TestSqlUpdateBatch.java | 0 .../TestSqlUpdateBindMultipleLists.java | 0 .../tests/update/TestSqlUpdateExceptions.java | 0 .../org/tests/update/TestSqlUpdateInTxn.java | 0 .../org/tests/update/TestSqlUpdateUpsert.java | 0 .../org/tests/update/TestStatelessUpdate.java | 0 .../update/TestUpdateAllLoadedProperties.java | 0 .../tests/update/TestUpdateCircularSave.java | 0 .../org/tests/update/TestUpdatePartial.java | 0 .../tests/update/TestUpdatePartialNoVer.java | 0 .../java/org/tests/update/objects/Child.java | 0 .../java/org/tests/update/objects/Parent.java | 0 .../org/tests/update/objects/SiblingA.java | 0 .../org/tests/update/objects/SiblingB.java | 0 .../src/test/resources/EQL.g4 | 0 .../io.ebeaninternal.api.SpiLoggerFactory | 0 .../META-INF/test/test-agent-only-use.mf | 0 .../resources/META-INF/test/test-combined.mf | 0 .../META-INF/test/test-entity-packages.mf | 0 .../test/resources/META-INF/test/test-one.mf | 0 .../test/resources/META-INF/test/test-some.mf | 0 .../src/test/resources/docker-run.properties | 0 ebean-test/src/test/resources/ebean.mf | 9 +- .../src/test/resources/ebean.properties | 2 +- .../src/test/resources/example1.json | 0 .../src/test/resources/extra-ddl.xml | 0 .../src/test/resources/java-64.png | Bin .../src/test/resources/junk.json | 0 .../src/test/resources/logback-test.xml | 89 +++++++++++++-- ...est.yaml => notused-application-test.yaml} | 0 .../src/test/resources/profile-image.jpg | Bin .../test/resources/scripts/test-script-2.sql | 0 .../test/resources/scripts/test-script.sql | 0 .../src/test/resources/test-ebean.properties | 0 .../test-properties/application.properties | 0 .../test-properties/application.yaml | 0 .../test/resources/test-properties/foo.yml | 0 .../resources/test-properties/one.properties | 0 .../src/test/resources/test1.csv | 0 1650 files changed, 185 insertions(+), 147 deletions(-) delete mode 100644 ebean-core/src/test/resources/ebean.mf delete mode 100644 ebean-core/src/test/resources/logback-test.xml rename {ebean-core => ebean-test}/src/test/java/io/ebean/BaseTestCase.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/ColumnTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/DbPrimaryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/DtoQuery2Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/DtoQueryFromOrmTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/DtoQueryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_deleteTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_eqlTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_refresh.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/EbeanServer_saveAllTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/ExtendedServerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/FetchConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/FetchGroupTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/MyCurrentUserProvider.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/PlatformCondition.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/PropertyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/SqlRowBooleanTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/StringHelperTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TestDirtyProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TestFilterWithEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TestUnsetLoadedProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TextExpressionListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TransactionalTestCase.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/TxScopeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/UpdateQueryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/annotation/ForPlatform.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/annotation/IgnorePlatform.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/cache/CacheKeyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/cache/ServerCacheManagerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/common/BeanListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/common/BeanMapTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/common/BeanSetTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/ContainerConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/DatabaseConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/DbConstraintNamingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/DbMigrationConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/DocStoreConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/MatchingNamingConventionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/PropertiesWrapperTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/TestTableName.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/event/BeanFindControllerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/event/BeanPersistControllerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/event/BeanPostLoadTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/json/EJsonTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/plugin/BeanTypeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/plugin/ExpressionPathTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/plugin/PropertyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/plugin/SpiServerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/server/type/MyDayOfWeek.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/server/type/MyEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/server/type/MySex.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/text/PathPropertiesTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/text/json/JsonContextTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/util/CamelCaseHelperTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebean/util/TestEncodeB64.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/api/BindParamsTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/api/TDSpiServer.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/changelog/Helper.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/SameTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/JsonTester.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeaninternal/server/util/Md5Test.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeantest/CaptureLogger.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeantest/CapturingLoggerFactory.java (100%) rename {ebean-core => ebean-test}/src/test/java/io/ebeantest/LoggedSql.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartCockroach.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartMariaDb.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartMySql.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartNuoDB.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartOracle.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartPostgres.java (100%) rename {ebean-core => ebean-test}/src/test/java/main/StartSqlServer.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/history/v1_0/EHistory7.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/history/v1_1/EHistory7.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/CKeyAssoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/CKeyDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/CKeyParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/CKeyParentId.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkCascadeOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkNone.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/DfkSetNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory2.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory3.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory4.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory5.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/EHistory6.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/ERef.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/ESoftdelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/MtmChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/MtmMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/OtoChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_0/OtoMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/CKeyAssoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/CKeyDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/CKeyParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/CKeyParentId.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkCascadeOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkNone.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/DfkSetNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory2.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory3.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory4.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory5.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EHistory6.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/ESoftdelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/EUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/MtmChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/MtmMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/OtoChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_1/OtoMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/CKeyAssoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/CKeyDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/CKeyParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/CKeyParentId.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkCascadeOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkNone.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/DfkSetNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory2.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory3.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory4.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory5.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/EHistory6.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/ERef.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/ESoftdelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/MtmChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/MtmMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/OtoChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/misc/migration/v1_2/OtoMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/ebeantest/LoggedSqlCollector.java (100%) rename ebean-test/src/test/java/org/{test/BSimpleWithGen.java => etest/BSimpleFor.java} (88%) rename ebean-test/src/test/java/org/{test => etest}/ForTestsBeforeAfterTest.java (86%) rename ebean-test/src/test/java/org/{test => etest}/ForTestsTest.java (83%) rename ebean-test/src/test/java/org/{test => etest}/PlainBean.java (95%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/CurrentTenant.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/MtBaseDomain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/MtContent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/MtTenant.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/MtTenantAware.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/multitenant/partition/UserContext.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/MainDbBoolean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestAnnotationBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestAssocOneEqExpression.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestBatchLazy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestBatchLazyMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestCreateEntityBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeleteByIdCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeleteImportedPartial.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeleteOneToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestDynamicUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestErrorBindLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestExplicitInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestFetchId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestIUDVanilla.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestInEmpty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestInheritRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestJodaType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestJoinInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestLazyLoadInCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestLimitQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestLoadBeanCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestLogTransLogOnError.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestM2MCascadeOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestM2MVanilla.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestManyLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestManyOneInterface.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestMappedSuper.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestMetaAnnotation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestNonUpdateProperty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestOrderByAnnotation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestPersistenceContext.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryForUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryUsingConnection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryUsingDatabase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryWhereBetween.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryWhereInRange.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestQueryWithCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestReadOnlyPropagation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestSharedInstancePropagation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestTransient.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestUpdateManyToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestUuidInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/TestWhereAnnotation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/encrypt/TestEncrypt.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/event/TestPreInsertValidation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/event/TestQueryAdapter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/join/TestSecondaryJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/lob/TestByteOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/Booking.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/Invoice.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/Tire.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/one2one/Wheel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/BSimpleWithGen.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestInetAddressType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestSqlRowUUID.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/basic/type/TestTransientMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestBasicLazy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestBeanState.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestLazyJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestLazyJoin2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestQueryJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/batchload/TestSecondaryQueries.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestBeanCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheCollectionIds.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheEmbeddedId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheManyToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestCacheNaturalId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestExternalNotification.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestM2MCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestQueryCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestQueryCacheCountry.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestQueryCacheInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/embeddedid/CEPCategory.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/embeddedid/CEPProduct.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/personinfo/PersonOther.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/callable/TestMysqlCallable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/COOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/COOneMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/CORoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/OmOrderedDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/OmOrderedMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/RelDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/RelMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestMasterDetailDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestOrderedList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestPrivateOwned.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/changelog/TestChangeLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/changelog/TestChangeLogInt.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestCKeyDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestCore.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/AuditInfo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/CaoBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/CaoKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/Item.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/ItemKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/Parcel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/ParcelLocation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/Region.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/RegionKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/SubType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/SubTypeKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/Type.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/compositekeys/db/TypeKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/contructor/TestProtectedConstructor.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddd/iud/TestDPersonEl.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkCascadeOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkNone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkNoneViaJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/DfkSetNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/ddl/TestForeignKeyModes.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/defaultvalues/DefaultsModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/defaultvalues/TestDefaults.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/DcDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/DcListener.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/DcMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/TestDeleteByQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/docstore/CustomerReportTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/draftable/DocLinkTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/draftable/LinkQueryPublishTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/draftable/OrganisationTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/el/TestELBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/el/TestPathExpression.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/el/TestUnderscoreParam.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/enhancement/TestEnhancementEquals.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/example/ModUuidGenerator.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/expression/bitwise/BwBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/expression/bitwise/BwFlags.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/family/TestInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/generated/TestGeneratedProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/generated/TestGeneratedWho.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/genkey/TestGeneratedKeys.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/genkey/TestSeqBatch.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/history/TestHistoryInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/TestCustomId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/TestGeneratedKeys.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/TestLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/db/AuditLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/idkeys/db/GenKeySequence.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/ChildA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/ChildB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/DIntChild1.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/DIntChild2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/DIntChildBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/DIntParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/Data.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/EUncle.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/InheritDiscIntTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/Parent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inherit/ParentAggregate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/InnerReport.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/OrganizationNode.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/OrganizationTreeNode.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/OrganizationUnit.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/Stockforecast.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceJoins.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestIntInherit.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestSkippable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/TestTreeOrganisations.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/abstrakt/Block.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/SourceA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/SourceB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/SourceBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/Target1.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/Target2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/TargetBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CIAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CIBaseModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CICustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CICustomerParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CIStreet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/CIStreetParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/company/domain/Foo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/CalculationResult.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/Configuration.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/Configurations.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/GroupConfiguration.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/model/ProductConfiguration.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/order/OrderedA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/order/OrderedB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/inheritance/order/OrderedParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/EIdUidBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/MainDbCopy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/OnlyIdEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertCheckUnique.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertDuplicateKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertOnStringKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestOnlyIdEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfCalendar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfCity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfCountry.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfEvent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/PcfPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/TestCarWheelIud.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/TestInfoOneToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/TestInsertQueryUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/TestInsertUpdateTrans.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/iud/TestPersistCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestDbJson_Jackson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestDbJson_Jackson2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestDbJson_Jackson3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestDbJson_List.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonMapBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonMapBlob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonMapClob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonMapJsonB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonMapVarchar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonNodeBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonNodeBlob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonNodeJsonb.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonNodeVarchar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestJsonNullValues.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestOldValue.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/TestUnmappedProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/include/TestJsonExcludeNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/ModelA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/ModelB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/TestModelAJson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyforeignkeys/MainEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyloadconf/AppConfig.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyloadconf/AppConfigControl.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lazyloadconf/Relationship.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/level/Level1.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/level/Level2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/level/Level3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/level/Level4.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/level/test/ManyToManyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MModifyTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MMultipleLists.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/TestM2mDeleteObject.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/softdelete/MsManyA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/softdelete/MsManyB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MContact.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MContactMessage.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MGroup.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/MMachine.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/TestMergeBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/TestMergeCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/merge/TestMergeM2M.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/mockito/TestMockitoMock.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/BaseModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/EGenProps.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/EWhoProps.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/EWhoPropsSuper.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachine.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachineStats.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DMachineUse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/DOrg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/Decimal93.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/MachineUseData.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/TestAggregationMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/EArrayBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/EArraySetBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/IntEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/TestDbArray_asSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/TestDbArray_basic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/array/VarcharEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Address.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Animal.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/AnimalShelter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Article.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Attribute.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/AttributeHolder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BBookmark.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BBookmarkOrg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BBookmarkUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BWithQIdent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BasicDomain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BeanWithTimeZone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/BigDog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CKeyAssoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CKeyDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CKeyParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CKeyParentId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Car.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CarAccessory.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CarFuse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Cat.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Contact.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ContactGroup.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ContactNote.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Country.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Customer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/CustomerAggregate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Dog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicChangeLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicClob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicClobNoVer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEncrypt.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEncryptClient.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEnumId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicEnumInt.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicVer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicWithLog.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ECustomId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EDefaultProp.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ENullCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ENullCollectionDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EOptOneA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EOptOneB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EOptOneC.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ESimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ESomeType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ETransMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EVanillaCollection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/EWithInetAddr.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/FeatureDescription.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ListAttribute.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ListAttributeValue.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MNonEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MProtectedConstructBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MRole.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MUserType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MnocRole.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MnocUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MyAdHoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MyLobSize.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OBeanChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCachedBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCachedBeanChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCachedInhChildA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCachedInhChildB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCachedInhRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OCar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OEngine.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OGearBox.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Order.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OrderAggregate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OrderDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/OrderShipment.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/PFile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/PFileContent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/PersistentFile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/PersistentFileContent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Person.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Phone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Product.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ResetBasicData.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Section.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/SomeEnum.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/SomeEnumBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/SomeObject.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/SubSection.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TBytesOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TIntChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TIntRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TJodaEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TMapSuperEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TMappedSuper2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TSDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TSMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TUuidEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TWithPreInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Trip.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Truck.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/TruckRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/UTDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/UTMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/UUOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/UUTwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/ValidationGroupSomething.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/Vehicle.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/VehicleDriver.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/VehicleLease.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/VehicleLeaseLong.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/VehicleLeaseShort.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/VwCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/CInhOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/CInhRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/CInhRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/CInhTwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/ECacheChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/ECacheRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCacheBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCachedApp.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/finder/CustomerFinder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/first/First.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/first/Second.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/first/SuperSecond.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/first/TestFirstSecond.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/DummyDao.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/EdChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/EdParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BAccessLevel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BDManyId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BEmbId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSite.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserC.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserD.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserDMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BSiteUserE.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/BUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/bridge/TestIdClassScalar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/cache/EColAB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/cache/M2MCacheChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/cache/M2MCacheMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheel/Car.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheel/Tire.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheel/Wheel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TCar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TTruck.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TWheel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/CkeClient.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/CkeClientKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/CkeUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/CkeUserKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/RCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/RCustomerKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/ROrder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/ROrderPK.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/converstation/Conversation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/converstation/Group.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/converstation/Message.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/converstation/Participation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/converstation/User.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ddd/DExhEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ddd/DPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/docstore/CustomerReport.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/docstore/ProductReport.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/docstore/Report.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/BaseDomain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/BasicDraftableBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/Doc.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/Document.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/DocumentMedia.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/Link.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/draftable/Organisation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcPhone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcTop.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcblPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcbmPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcmPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcmcPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsmChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsmOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsmParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/EcsmTwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EAddr.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EAddressStatus.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EEmbInner.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EEmbOuter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EInvoice.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EMain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EPerAddr.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EPerson2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/EPerson3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/Eembeddable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/PrimaryRevision.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/RevisionId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/UserInterestLive.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/family/ChildPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/family/GrandParentPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/family/InheritablePerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/family/ParentPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/generated/User.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HEmbiBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HEmbiId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HeDoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HeLink.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HiDoc.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HiLink.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HiTOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HiTThree.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HiTTwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HsdSetting.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/HsdUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/TestHistoryExclude.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/TestHistoryInclude.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/TestHistoryOneToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/info/InfoCompany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/info/InfoContact.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/info/InfoCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritexposedtype/IXResource.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/IMRelated.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/IMRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/IMRootOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/IMRootTwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/MBase.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/MMedia.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/MPicture.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/MProfile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/Address.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/IAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/IPerson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/IPersona.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/Person.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/Persona.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/SelfManyMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/TestSelfMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/interfaces/TestTargetEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/ESomeConvertType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/Money.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/Oid.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/Segment.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/SysTime.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/converter/AnEnumType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/joda/BasicJodaEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/BasicJacksonType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicHstore.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonJackson.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonJackson2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonJackson3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMapClob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonMulti.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonNode.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicOldValue.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/EBasicPlain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/LongJacksonType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/PlainBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/StringJacksonType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/json/TestJacksonPlainBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithcache/ParentA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithcache/ParentB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithid/Looney.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/lazywithid/Tune.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/DCredit.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/DRol.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/DRot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MailBox.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MailUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyC.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyEdge.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyNode.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/MnyTopic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/Permission.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/Role.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/Tenant.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2o/Addr.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2o/Empl.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/map/MpRole.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/map/MpUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/EFile2NoFk.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/EFileNoFk.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/EUserNoFk.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/Test2NoFk.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/TestNoFk.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/nofk/TestTruncate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/noid/NoIdBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/Account.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OCompany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoAone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoAtwo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoBChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoBMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoCust.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoCustAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoPrime.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoSdChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoSdMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoThMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoThOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoThTop.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUBPrime.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUPrime.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/OtoUserOptional.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/User.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/album/Album.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/album/BaseModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/album/Cover.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orderentity/OrderEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orderentity/OrderItemEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OrpDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OrpMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/prnt/MPrinter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/prnt/MPrinterListener.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/prnt/MPrinterState.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/prnt/MSomeOther.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/pview/Paggview.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/pview/Pview.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/pview/TestPview.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/pview/Wview.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/BaseResourceFile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/ResourceFile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/SelfParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/SelfRefCustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/SelfRefExample.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/TestSelfRefExample.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/site/DataContainer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/site/Site.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/site/SiteAddress.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/site/TestTreeModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/site/TreeEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/EBasicSDChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelBook.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelDown.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelMid.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelRole.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelTop.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelUp.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelUser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelX.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelY.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/ESoftDelZ.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/EsdDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/softdelete/EsdMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/survey/Category.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/survey/Group.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/survey/Question.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/survey/Survey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/survey/TestOrderByFetch.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/tevent/TEvent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/tevent/TEventMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/tevent/TEventOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/types/SomeFileBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/types/SomeNewTypesBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/types/SomePeriodBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/uuidsibling/USibChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/uuidsibling/USibParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/version/VersionChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/version/VersionParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/version/VersionToy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/view/EOrderAgg.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/view/TestViewBaseEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/zero/TestWithZero.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/zero/WithZero.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/model/zero/WithZeroParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OMVertex.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OMVertexOther.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OmAccountChildDBO.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OmAccountDBO.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OmBasicChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/OmBasicParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/TestOneToManyWhere.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/TestOneToManyWildcard.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/JtMonkey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/JtTrainer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/JtTroop.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/lazy/OmlBar.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/lazy/OmlBaz.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/lazy/OmlFoo.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2o/OtoLevelA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2o/OtoLevelB.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2o/OtoLevelC.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/o2o/TestReferenceSave.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/order/OrderMaster.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/order/OrderReferencedChild.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/order/OrderReferencedParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/order/OrderToy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/order/TestOrderColumn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/profile/ProfileLocationTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/profile/ProfileSimpleQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestDefaultFetchLazy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestExprNestedDisjunction.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestFindOneOrEmpty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestIContains.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestInvalidFetchPath.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestJoinOptOneCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestLimitAlterFetchMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestLimitQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestManyWhereJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestManyWhereJoinM2M.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestOuterJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryAlias.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryBaseTable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryExists.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFetchSkipPath.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFilterMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFilterManySimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindEach.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindEachWhile.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindFutureList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindIterate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindNative.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindPagedList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindReadOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryFindStream.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryInAssocOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryIsNull.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryJoinBatchSize.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryMultiManyOrder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryNullAssocOne.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryOrderById.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestRefToLazyLoadMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestRowCount.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestSubQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestWhereIn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/TestWhereRawClause.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/aggregation/TestAggregationCount.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/Acl.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/AclContainerRelation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/Contract.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/ContractCosts.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/Main1.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/Main2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/Position.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cache/TestDistinct.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cancel/EBasicDto.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cancel/SlowDownEBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/finder/TestCustomerFinder.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByClear.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFetchPreference.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestLikeEscaping.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestOneToManyAsMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestQueryDistinct.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestSelfParent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestSubQueryBinding.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestWhereAnnotation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/A2Customer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/ACustomer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestOrderReportTotal.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/readaudit/TestReadAudit.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/refresh/TestRefreshWithMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/repository/CustomerRepository.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/repository/TestBeanRepository.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/saveassociation/TestSaveAssociation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/saveassociation/TestSaveSamePK.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/Zone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/sp/TestManyToManySaveTwice.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/sp/model/IdEntity.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/sp/model/car/Car.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/sp/model/car/Door.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/sp/model/car/Wheel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/test/TestInheritWithMany.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/csv/TestCsvReader.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/csv/TestTimeStringParser.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonMap.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonInheritance.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/timezone/TimezoneTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/timezone/TzBean.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/timezone/TzBeanTests.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestBatchModelFlush.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestBatchPersistCascade.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestBeanStateReset.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestCommitAndContinue.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestExecuteComplete.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestInsertManyAndRef.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNested.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedBeginRequired.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedMandatory.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedSubTransaction.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestNestedTransaction.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestPersistContextClear.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestSavepoint.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestSqlServerBatch.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionCallback.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionSkipCache.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionTryResources.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalNever.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalRequired.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalSupports.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/EncryptedBinary.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/EncryptedString.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/PasswordStoreModel.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestEncryptedString.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestFileType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestFileTypeFetching.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestHstore.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestNewTypes.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/types/TestPeriodType.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unidirectional/TestUniDirectional.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/HelloMain.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestNamingConvention.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestOrderByParse.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/EPersonOnline.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestJsonStatelessUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestMarkAsDirty.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestPostgresTruncate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestSqlUpdateBatch.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestSqlUpdateExceptions.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestSqlUpdateInTxn.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestSqlUpdateUpsert.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestStatelessUpdate.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestUpdateCircularSave.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestUpdatePartial.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/TestUpdatePartialNoVer.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/objects/Child.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/objects/Parent.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/objects/SiblingA.java (100%) rename {ebean-core => ebean-test}/src/test/java/org/tests/update/objects/SiblingB.java (100%) rename {ebean-core => ebean-test}/src/test/resources/EQL.g4 (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/test/test-agent-only-use.mf (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/test/test-combined.mf (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/test/test-entity-packages.mf (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/test/test-one.mf (100%) rename {ebean-core => ebean-test}/src/test/resources/META-INF/test/test-some.mf (100%) rename {ebean-core => ebean-test}/src/test/resources/docker-run.properties (100%) rename {ebean-core => ebean-test}/src/test/resources/ebean.properties (99%) rename {ebean-core => ebean-test}/src/test/resources/example1.json (100%) rename {ebean-core => ebean-test}/src/test/resources/extra-ddl.xml (100%) rename {ebean-core => ebean-test}/src/test/resources/java-64.png (100%) rename {ebean-core => ebean-test}/src/test/resources/junk.json (100%) rename ebean-test/src/test/resources/{application-test.yaml => notused-application-test.yaml} (100%) rename {ebean-core => ebean-test}/src/test/resources/profile-image.jpg (100%) rename {ebean-core => ebean-test}/src/test/resources/scripts/test-script-2.sql (100%) rename {ebean-core => ebean-test}/src/test/resources/scripts/test-script.sql (100%) rename {ebean-core => ebean-test}/src/test/resources/test-ebean.properties (100%) rename {ebean-core => ebean-test}/src/test/resources/test-properties/application.properties (100%) rename {ebean-core => ebean-test}/src/test/resources/test-properties/application.yaml (100%) rename {ebean-core => ebean-test}/src/test/resources/test-properties/foo.yml (100%) rename {ebean-core => ebean-test}/src/test/resources/test-properties/one.properties (100%) rename {ebean-core => ebean-test}/src/test/resources/test1.csv (100%) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 50ed802c9..d4c068bf8 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -60,13 +60,13 @@ test - - io.ebean - ebean-ddl-generator - - 12.11.4A - test - + + + + + + + diff --git a/ebean-core/src/test/resources/ebean.mf b/ebean-core/src/test/resources/ebean.mf deleted file mode 100644 index fc2fd6902..000000000 --- a/ebean-core/src/test/resources/ebean.mf +++ /dev/null @@ -1,7 +0,0 @@ -agent-use-only: true -profile-location: true -entity-packages: org,misc -transactional-packages: org -querybean-packages: none -synthetic: true - diff --git a/ebean-core/src/test/resources/logback-test.xml b/ebean-core/src/test/resources/logback-test.xml deleted file mode 100644 index 1b8a60a9b..000000000 --- a/ebean-core/src/test/resources/logback-test.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - TRACE - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - target/log/application.log - - TRACE - - - log/application.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - target/log/readAuditQuery.log - - log/readAuditQuery.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - target/log/readAudit.log - - log/readAudit.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - target/log/change-log.log - - log/changeLog.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 03bee753d..7fe6d6f9a 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,11 +76,75 @@ com.h2database h2 - 1.4.200 + 1.4.199 + + io.avaje + avaje-jsr305 + 1.0 + test + + + + io.ebean + ebean-migration + 12.4.0 + test + + + + io.avaje + mod-uuid + 1.1 + test + + + + javax.transaction + jta + 1.1 + test + + + + + javax.validation + validation-api + 1.1.0.Final + test + + + + jakarta.validation + jakarta.validation-api + 3.0.0 + test + + + + joda-time + joda-time + 2.9.7 + test + + + + javax.annotation + javax.annotation-api + 1.3.2 + test + + + commons-io + commons-io + 2.7 + test + + + org.postgresql postgresql @@ -143,7 +207,7 @@ true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/BaseTestCase.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/BaseTestCase.java rename to ebean-test/src/test/java/io/ebean/BaseTestCase.java diff --git a/ebean-core/src/test/java/io/ebean/ColumnTest.java b/ebean-test/src/test/java/io/ebean/ColumnTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/ColumnTest.java rename to ebean-test/src/test/java/io/ebean/ColumnTest.java diff --git a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DbPrimaryTest.java rename to ebean-test/src/test/java/io/ebean/DbPrimaryTest.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQuery2Test.java rename to ebean-test/src/test/java/io/ebean/DtoQuery2Test.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java rename to ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQueryTest.java rename to ebean-test/src/test/java/io/ebean/DtoQueryTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java rename to ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java rename to ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java diff --git a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/ExtendedServerTest.java rename to ebean-test/src/test/java/io/ebean/ExtendedServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-test/src/test/java/io/ebean/FetchConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/FetchConfigTest.java rename to ebean-test/src/test/java/io/ebean/FetchConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/FetchGroupTest.java rename to ebean-test/src/test/java/io/ebean/FetchGroupTest.java diff --git a/ebean-core/src/test/java/io/ebean/MyCurrentUserProvider.java b/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/MyCurrentUserProvider.java rename to ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java diff --git a/ebean-core/src/test/java/io/ebean/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/PlatformCondition.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/PlatformCondition.java rename to ebean-test/src/test/java/io/ebean/PlatformCondition.java diff --git a/ebean-core/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/PropertyTest.java diff --git a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java rename to ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java diff --git a/ebean-core/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/StringHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/StringHelperTest.java rename to ebean-test/src/test/java/io/ebean/StringHelperTest.java diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestDirtyProperties.java rename to ebean-test/src/test/java/io/ebean/TestDirtyProperties.java diff --git a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java rename to ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java rename to ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java diff --git a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TextExpressionListTest.java rename to ebean-test/src/test/java/io/ebean/TextExpressionListTest.java diff --git a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TransactionalTestCase.java rename to ebean-test/src/test/java/io/ebean/TransactionalTestCase.java diff --git a/ebean-core/src/test/java/io/ebean/TxScopeTest.java b/ebean-test/src/test/java/io/ebean/TxScopeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TxScopeTest.java rename to ebean-test/src/test/java/io/ebean/TxScopeTest.java diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/UpdateQueryTest.java rename to ebean-test/src/test/java/io/ebean/UpdateQueryTest.java diff --git a/ebean-core/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/annotation/ForPlatform.java rename to ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java diff --git a/ebean-core/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/annotation/IgnorePlatform.java rename to ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java diff --git a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java rename to ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java rename to ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java rename to ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java b/ebean-test/src/test/java/io/ebean/common/BeanListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanListTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanListTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanMapTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanMapTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanSetTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanSetTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java rename to ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java rename to ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java rename to ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java rename to ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/config/TestTableName.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/TestTableName.java rename to ebean-test/src/test/java/io/ebean/config/TestTableName.java diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java rename to ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java diff --git a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/json/EJsonTests.java rename to ebean-test/src/test/java/io/ebean/json/EJsonTests.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java rename to ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java rename to ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java rename to ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MyDayOfWeek.java b/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MyDayOfWeek.java rename to ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MyEnum.java b/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MyEnum.java rename to ebean-test/src/test/java/io/ebean/server/type/MyEnum.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MySex.java b/ebean-test/src/test/java/io/ebean/server/type/MySex.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MySex.java rename to ebean-test/src/test/java/io/ebean/server/type/MySex.java diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index 6950cdd59..b1f91e4dd 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -3,7 +3,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.test.BSimpleWithGen; +import org.etest.BSimpleFor; import java.util.List; @@ -16,9 +16,9 @@ public class DbJsonTest { @Test public void of() { - DB.find(BSimpleWithGen.class).delete(); + DB.find(BSimpleFor.class).delete(); - BSimpleWithGen bean = new BSimpleWithGen("something"); + BSimpleFor bean = new BSimpleFor("something"); DB.save(bean); assertThat(bean.getVersion()).isEqualTo(1); @@ -29,10 +29,10 @@ public class DbJsonTest { .assertContentMatches("/bean/example-bean.json"); - BSimpleWithGen bean2 = new BSimpleWithGen("other"); + BSimpleFor bean2 = new BSimpleFor("other"); DB.save(bean2); - final List beans = DB.find(BSimpleWithGen.class).findList(); + final List beans = DB.find(BSimpleFor.class).findList(); DbJson.of(beans) //.withPlaceholder("_") @@ -43,10 +43,10 @@ public class DbJsonTest { @Test public void assertContains_pass() { - BSimpleWithGen bean = new BSimpleWithGen("something-contains-me", "YeahNah"); + BSimpleFor bean = new BSimpleFor("something-contains-me", "YeahNah"); DB.save(bean); - BSimpleWithGen found = DB.find(BSimpleWithGen.class, bean.getId()); + BSimpleFor found = DB.find(BSimpleFor.class, bean.getId()); DbJson.of(found).assertContainsResource("/bean/contains-minimal.json"); DbJson.of(found).assertContains(readResource("/bean/contains-with-version.json")); @@ -57,7 +57,7 @@ public class DbJsonTest { @Test public void asJson() { - BSimpleWithGen bean = new BSimpleWithGen("other"); + BSimpleFor bean = new BSimpleFor("other"); DB.save(bean); String asJson = DbJson.of(bean) diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java index ec98c86be..3cb6857ad 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java @@ -2,7 +2,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.Test; -import org.test.PlainBean; +import org.etest.PlainBean; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java rename to ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java diff --git a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java rename to ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java diff --git a/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java b/ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java rename to ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java rename to ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java rename to ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/Helper.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/Helper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/Helper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/Helper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java rename to ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java rename to ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java diff --git a/ebean-core/src/test/java/io/ebeantest/CaptureLogger.java b/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/CaptureLogger.java rename to ebean-test/src/test/java/io/ebeantest/CaptureLogger.java diff --git a/ebean-core/src/test/java/io/ebeantest/CapturingLoggerFactory.java b/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/CapturingLoggerFactory.java rename to ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java diff --git a/ebean-core/src/test/java/io/ebeantest/LoggedSql.java b/ebean-test/src/test/java/io/ebeantest/LoggedSql.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/LoggedSql.java rename to ebean-test/src/test/java/io/ebeantest/LoggedSql.java diff --git a/ebean-core/src/test/java/main/StartCockroach.java b/ebean-test/src/test/java/main/StartCockroach.java similarity index 100% rename from ebean-core/src/test/java/main/StartCockroach.java rename to ebean-test/src/test/java/main/StartCockroach.java diff --git a/ebean-core/src/test/java/main/StartMariaDb.java b/ebean-test/src/test/java/main/StartMariaDb.java similarity index 100% rename from ebean-core/src/test/java/main/StartMariaDb.java rename to ebean-test/src/test/java/main/StartMariaDb.java diff --git a/ebean-core/src/test/java/main/StartMySql.java b/ebean-test/src/test/java/main/StartMySql.java similarity index 100% rename from ebean-core/src/test/java/main/StartMySql.java rename to ebean-test/src/test/java/main/StartMySql.java diff --git a/ebean-core/src/test/java/main/StartNuoDB.java b/ebean-test/src/test/java/main/StartNuoDB.java similarity index 100% rename from ebean-core/src/test/java/main/StartNuoDB.java rename to ebean-test/src/test/java/main/StartNuoDB.java diff --git a/ebean-core/src/test/java/main/StartOracle.java b/ebean-test/src/test/java/main/StartOracle.java similarity index 100% rename from ebean-core/src/test/java/main/StartOracle.java rename to ebean-test/src/test/java/main/StartOracle.java diff --git a/ebean-core/src/test/java/main/StartPostgres.java b/ebean-test/src/test/java/main/StartPostgres.java similarity index 100% rename from ebean-core/src/test/java/main/StartPostgres.java rename to ebean-test/src/test/java/main/StartPostgres.java diff --git a/ebean-core/src/test/java/main/StartSqlServer.java b/ebean-test/src/test/java/main/StartSqlServer.java similarity index 100% rename from ebean-core/src/test/java/main/StartSqlServer.java rename to ebean-test/src/test/java/main/StartSqlServer.java diff --git a/ebean-core/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/history/v1_0/EHistory7.java rename to ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java diff --git a/ebean-core/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/history/v1_1/EHistory7.java rename to ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_0/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_0/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/ERef.java rename to ebean-test/src/test/java/misc/migration/v1_0/ERef.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_1/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_1/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EUser.java b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EUser.java rename to ebean-test/src/test/java/misc/migration/v1_1/EUser.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_2/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_2/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/ERef.java rename to ebean-test/src/test/java/misc/migration/v1_2/ERef.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java diff --git a/ebean-core/src/test/java/org/ebeantest/LoggedSqlCollector.java b/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java similarity index 100% rename from ebean-core/src/test/java/org/ebeantest/LoggedSqlCollector.java rename to ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java diff --git a/ebean-test/src/test/java/org/test/BSimpleWithGen.java b/ebean-test/src/test/java/org/etest/BSimpleFor.java similarity index 88% rename from ebean-test/src/test/java/org/test/BSimpleWithGen.java rename to ebean-test/src/test/java/org/etest/BSimpleFor.java index 5ee189229..2da204412 100644 --- a/ebean-test/src/test/java/org/test/BSimpleWithGen.java +++ b/ebean-test/src/test/java/org/etest/BSimpleFor.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.annotation.WhenModified; @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; @Entity -public class BSimpleWithGen { +public class BSimpleFor { @Id private Integer id; @@ -29,11 +29,11 @@ public class BSimpleWithGen { @Version private long version; - public BSimpleWithGen(String name) { + public BSimpleFor(String name) { this.name = name; } - public BSimpleWithGen(String name, String other) { + public BSimpleFor(String name, String other) { this.name = name; this.other = other; } diff --git a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java similarity index 86% rename from ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java rename to ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java index c59e77211..70ad19ead 100644 --- a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.DB; import io.ebean.annotation.Transactional; @@ -34,7 +34,7 @@ public class ForTestsBeforeAfterTest { } private int getCount() { - return DB.find(BSimpleWithGen.class) + return DB.find(BSimpleFor.class) .where().eq("name", "ForTestsBeforeAfterTest") .findCount(); } @@ -42,7 +42,7 @@ public class ForTestsBeforeAfterTest { @Transactional private void doInsert() { - BSimpleWithGen bean = new BSimpleWithGen("ForTestsBeforeAfterTest"); + BSimpleFor bean = new BSimpleFor("ForTestsBeforeAfterTest"); DB.save(bean); } diff --git a/ebean-test/src/test/java/org/test/ForTestsTest.java b/ebean-test/src/test/java/org/etest/ForTestsTest.java similarity index 83% rename from ebean-test/src/test/java/org/test/ForTestsTest.java rename to ebean-test/src/test/java/org/etest/ForTestsTest.java index 6d2ec5a9a..b2b0804cb 100644 --- a/ebean-test/src/test/java/org/test/ForTestsTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsTest.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.DB; import io.ebean.Transaction; @@ -36,18 +36,18 @@ public class ForTestsTest { @Test public void rollbackTransactions() { - DB.find(BSimpleWithGen.class).delete(); + DB.find(BSimpleFor.class).delete(); ForTests.rollbackAll(this::doInsert); - final int count = DB.find(BSimpleWithGen.class).findCount(); + final int count = DB.find(BSimpleFor.class).findCount(); assertThat(count).isEqualTo(0); } @Transactional private void doInsert() { - BSimpleWithGen bean = new BSimpleWithGen("doInsert"); + BSimpleFor bean = new BSimpleFor("doInsert"); DB.save(bean); } diff --git a/ebean-test/src/test/java/org/test/PlainBean.java b/ebean-test/src/test/java/org/etest/PlainBean.java similarity index 95% rename from ebean-test/src/test/java/org/test/PlainBean.java rename to ebean-test/src/test/java/org/etest/PlainBean.java index 103e67425..a86ba2c9f 100644 --- a/ebean-test/src/test/java/org/test/PlainBean.java +++ b/ebean-test/src/test/java/org/etest/PlainBean.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import java.util.Objects; diff --git a/ebean-core/src/test/java/org/multitenant/partition/CurrentTenant.java b/ebean-test/src/test/java/org/multitenant/partition/CurrentTenant.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/CurrentTenant.java rename to ebean-test/src/test/java/org/multitenant/partition/CurrentTenant.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtBaseDomain.java b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtBaseDomain.java rename to ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtContent.java b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtContent.java rename to ebean-test/src/test/java/org/multitenant/partition/MtContent.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtTenant.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtTenant.java rename to ebean-test/src/test/java/org/multitenant/partition/MtTenant.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtTenantAware.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtTenantAware.java rename to ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java rename to ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/UserContext.java b/ebean-test/src/test/java/org/multitenant/partition/UserContext.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/UserContext.java rename to ebean-test/src/test/java/org/multitenant/partition/UserContext.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java rename to ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java rename to ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java diff --git a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java rename to ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java diff --git a/ebean-core/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java b/ebean-test/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java rename to ebean-test/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java rename to ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java rename to ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java rename to ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java rename to ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java rename to ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java rename to ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java rename to ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java rename to ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java rename to ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java rename to ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java rename to ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestFetchId.java rename to ebean-test/src/test/java/org/tests/basic/TestFetchId.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java rename to ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestInEmpty.java rename to ebean-test/src/test/java/org/tests/basic/TestInEmpty.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestInheritRef.java rename to ebean-test/src/test/java/org/tests/basic/TestInheritRef.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestJodaType.java rename to ebean-test/src/test/java/org/tests/basic/TestJodaType.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java rename to ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java rename to ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java rename to ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java rename to ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java rename to ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java rename to ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java rename to ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java rename to ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java rename to ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java rename to ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java rename to ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java rename to ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java rename to ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingDatabase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryUsingDatabase.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java rename to ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java rename to ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java rename to ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestTransient.java rename to ebean-test/src/test/java/org/tests/basic/TestTransient.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java rename to ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java rename to ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java b/ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java b/ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java rename to ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java rename to ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java diff --git a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java rename to ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Booking.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Booking.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Invoice.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java rename to ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java rename to ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Tire.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Tire.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Wheel.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/BSimpleWithGen.java rename to ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java rename to ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java rename to ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java rename to ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java rename to ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java rename to ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java rename to ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java rename to ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java rename to ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java rename to ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBeanState.java rename to ebean-test/src/test/java/org/tests/batchload/TestBeanState.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java rename to ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java rename to ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCache.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java rename to ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java rename to ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java rename to ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestM2MCache.java rename to ebean-test/src/test/java/org/tests/cache/TestM2MCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCache.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPCategory.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProduct.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java diff --git a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java rename to ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java diff --git a/ebean-core/src/test/java/org/tests/cascade/COOne.java b/ebean-test/src/test/java/org/tests/cascade/COOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/COOne.java rename to ebean-test/src/test/java/org/tests/cascade/COOne.java diff --git a/ebean-core/src/test/java/org/tests/cascade/COOneMany.java b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/COOneMany.java rename to ebean-test/src/test/java/org/tests/cascade/COOneMany.java diff --git a/ebean-core/src/test/java/org/tests/cascade/CORoot.java b/ebean-test/src/test/java/org/tests/cascade/CORoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/CORoot.java rename to ebean-test/src/test/java/org/tests/cascade/CORoot.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java rename to ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java rename to ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmOrderedDetail.java rename to ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmOrderedMaster.java rename to ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/RelDetail.java rename to ebean-test/src/test/java/org/tests/cascade/RelDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/RelMaster.java rename to ebean-test/src/test/java/org/tests/cascade/RelMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java rename to ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java b/ebean-test/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java rename to ebean-test/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java rename to ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java rename to ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java rename to ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java rename to ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java rename to ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java rename to ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCore.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCore.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/AuditInfo.java b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/AuditInfo.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/CaoBean.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/CaoKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/CaoKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Item.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Item.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/ItemKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/ItemKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Parcel.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Parcel.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/ParcelLocation.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Region.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Region.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/RegionKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/RegionKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/SubType.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/SubTypeKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Type.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Type.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/TypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/TypeKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java rename to ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkCascade.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkCascade.java rename to ebean-test/src/test/java/org/tests/ddl/DfkCascade.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkCascadeOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkCascadeOne.java rename to ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNone.java b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNone.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNone.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNoneViaJoin.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkOne.java rename to ebean-test/src/test/java/org/tests/ddl/DfkOne.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkSetNull.java b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkSetNull.java rename to ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java rename to ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/DefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/DefaultsModel.java rename to ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java rename to ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java rename to ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcDetail.java b/ebean-test/src/test/java/org/tests/delete/DcDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcDetail.java rename to ebean-test/src/test/java/org/tests/delete/DcDetail.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcListener.java b/ebean-test/src/test/java/org/tests/delete/DcListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcListener.java rename to ebean-test/src/test/java/org/tests/delete/DcListener.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcMaster.java rename to ebean-test/src/test/java/org/tests/delete/DcMaster.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java diff --git a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java rename to ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java rename to ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java rename to ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java b/ebean-test/src/test/java/org/tests/draftable/OrganisationTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java rename to ebean-test/src/test/java/org/tests/draftable/OrganisationTest.java diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestELBasic.java rename to ebean-test/src/test/java/org/tests/el/TestELBasic.java diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestPathExpression.java rename to ebean-test/src/test/java/org/tests/el/TestPathExpression.java diff --git a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java rename to ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java diff --git a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java b/ebean-test/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java rename to ebean-test/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java rename to ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java rename to ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java rename to ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java diff --git a/ebean-core/src/test/java/org/tests/example/ModUuidGenerator.java b/ebean-test/src/test/java/org/tests/example/ModUuidGenerator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/example/ModUuidGenerator.java rename to ebean-test/src/test/java/org/tests/example/ModUuidGenerator.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/BwBean.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/BwFlags.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwFlags.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/BwFlags.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/BwFlags.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/family/TestInheritance.java rename to ebean-test/src/test/java/org/tests/family/TestInheritance.java diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java rename to ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java similarity index 100% rename from ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java rename to ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java diff --git a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java rename to ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java rename to ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java diff --git a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java rename to ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java rename to ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java rename to ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java rename to ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java rename to ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/AuditLog.java b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/AuditLog.java rename to ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java rename to ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/GenKeySequence.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySequence.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/GenKeySequence.java rename to ebean-test/src/test/java/org/tests/idkeys/db/GenKeySequence.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ChildA.java b/ebean-test/src/test/java/org/tests/inherit/ChildA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ChildA.java rename to ebean-test/src/test/java/org/tests/inherit/ChildA.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ChildB.java b/ebean-test/src/test/java/org/tests/inherit/ChildB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ChildB.java rename to ebean-test/src/test/java/org/tests/inherit/ChildB.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChild1.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChild1.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChild1.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChild2.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChild2.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChild2.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChildBase.java b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChildBase.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntParent.java rename to ebean-test/src/test/java/org/tests/inherit/DIntParent.java diff --git a/ebean-core/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/Data.java rename to ebean-test/src/test/java/org/tests/inherit/Data.java diff --git a/ebean-core/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/EUncle.java rename to ebean-test/src/test/java/org/tests/inherit/EUncle.java diff --git a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java b/ebean-test/src/test/java/org/tests/inherit/InheritDiscIntTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java rename to ebean-test/src/test/java/org/tests/inherit/InheritDiscIntTest.java diff --git a/ebean-core/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/Parent.java rename to ebean-test/src/test/java/org/tests/inherit/Parent.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ParentAggregate.java b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ParentAggregate.java rename to ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/InnerReport.java rename to ebean-test/src/test/java/org/tests/inheritance/InnerReport.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationNode.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationTreeNode.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationUnit.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationUnit.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/Stockforecast.java rename to ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java rename to ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java rename to ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java rename to ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java rename to ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java rename to ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/Block.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/Block.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceA.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceA.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceB.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceB.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceBase.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/Target1.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/Target2.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/Target2.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TargetBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/TargetBase.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIAddress.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIAddress.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIBaseModel.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIBaseModel.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CICustomer.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CICustomer.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CICustomerParent.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIStreet.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIStreet.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIStreetParent.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/Foo.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java rename to ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java rename to ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java rename to ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedA.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedA.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedB.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedB.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedParent.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedParent.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java diff --git a/ebean-core/src/test/java/org/tests/insert/EIdUidBean.java b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/EIdUidBean.java rename to ebean-test/src/test/java/org/tests/insert/EIdUidBean.java diff --git a/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java b/ebean-test/src/test/java/org/tests/insert/MainDbCopy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/MainDbCopy.java rename to ebean-test/src/test/java/org/tests/insert/MainDbCopy.java diff --git a/ebean-core/src/test/java/org/tests/insert/OnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/OnlyIdEntity.java rename to ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java rename to ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java rename to ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCalendar.java b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCalendar.java rename to ebean-test/src/test/java/org/tests/iud/PcfCalendar.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCity.java b/ebean-test/src/test/java/org/tests/iud/PcfCity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCity.java rename to ebean-test/src/test/java/org/tests/iud/PcfCity.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCountry.java b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCountry.java rename to ebean-test/src/test/java/org/tests/iud/PcfCountry.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfEvent.java b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfEvent.java rename to ebean-test/src/test/java/org/tests/iud/PcfEvent.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfModel.java b/ebean-test/src/test/java/org/tests/iud/PcfModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfModel.java rename to ebean-test/src/test/java/org/tests/iud/PcfModel.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfPerson.java b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfPerson.java rename to ebean-test/src/test/java/org/tests/iud/PcfPerson.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java rename to ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java rename to ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java rename to ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java rename to ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java rename to ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_List.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_List.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-test/src/test/java/org/tests/json/TestOldValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestOldValue.java rename to ebean-test/src/test/java/org/tests/json/TestOldValue.java diff --git a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java rename to ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/ModelA.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/ModelA.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/ModelB.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/ModelB.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestModelAJson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestModelAJson.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntity.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java b/ebean-test/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java diff --git a/ebean-core/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level1.java rename to ebean-test/src/test/java/org/tests/level/Level1.java diff --git a/ebean-core/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level2.java rename to ebean-test/src/test/java/org/tests/level/Level2.java diff --git a/ebean-core/src/test/java/org/tests/level/Level3.java b/ebean-test/src/test/java/org/tests/level/Level3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level3.java rename to ebean-test/src/test/java/org/tests/level/Level3.java diff --git a/ebean-core/src/test/java/org/tests/level/Level4.java b/ebean-test/src/test/java/org/tests/level/Level4.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level4.java rename to ebean-test/src/test/java/org/tests/level/Level4.java diff --git a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java rename to ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyA.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyB.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyB.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java diff --git a/ebean-core/src/test/java/org/tests/merge/MAddress.java b/ebean-test/src/test/java/org/tests/merge/MAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MAddress.java rename to ebean-test/src/test/java/org/tests/merge/MAddress.java diff --git a/ebean-core/src/test/java/org/tests/merge/MBase.java b/ebean-test/src/test/java/org/tests/merge/MBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MBase.java rename to ebean-test/src/test/java/org/tests/merge/MBase.java diff --git a/ebean-core/src/test/java/org/tests/merge/MContact.java b/ebean-test/src/test/java/org/tests/merge/MContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MContact.java rename to ebean-test/src/test/java/org/tests/merge/MContact.java diff --git a/ebean-core/src/test/java/org/tests/merge/MContactMessage.java b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MContactMessage.java rename to ebean-test/src/test/java/org/tests/merge/MContactMessage.java diff --git a/ebean-core/src/test/java/org/tests/merge/MCustomer.java b/ebean-test/src/test/java/org/tests/merge/MCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MCustomer.java rename to ebean-test/src/test/java/org/tests/merge/MCustomer.java diff --git a/ebean-core/src/test/java/org/tests/merge/MGroup.java b/ebean-test/src/test/java/org/tests/merge/MGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MGroup.java rename to ebean-test/src/test/java/org/tests/merge/MGroup.java diff --git a/ebean-core/src/test/java/org/tests/merge/MMachine.java b/ebean-test/src/test/java/org/tests/merge/MMachine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MMachine.java rename to ebean-test/src/test/java/org/tests/merge/MMachine.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java diff --git a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java b/ebean-test/src/test/java/org/tests/mockito/TestMockitoMock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java rename to ebean-test/src/test/java/org/tests/mockito/TestMockitoMock.java diff --git a/ebean-core/src/test/java/org/tests/model/BaseModel.java b/ebean-test/src/test/java/org/tests/model/BaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/BaseModel.java rename to ebean-test/src/test/java/org/tests/model/BaseModel.java diff --git a/ebean-core/src/test/java/org/tests/model/EGenProps.java b/ebean-test/src/test/java/org/tests/model/EGenProps.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EGenProps.java rename to ebean-test/src/test/java/org/tests/model/EGenProps.java diff --git a/ebean-core/src/test/java/org/tests/model/EWhoProps.java b/ebean-test/src/test/java/org/tests/model/EWhoProps.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EWhoProps.java rename to ebean-test/src/test/java/org/tests/model/EWhoProps.java diff --git a/ebean-core/src/test/java/org/tests/model/EWhoPropsSuper.java b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EWhoPropsSuper.java rename to ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachine.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineStats.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineUse.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DOrg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DOrg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/Decimal93.java b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/Decimal93.java rename to ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java b/ebean-test/src/test/java/org/tests/model/aggregation/MachineUseData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java rename to ebean-test/src/test/java/org/tests/model/aggregation/MachineUseData.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java rename to ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java rename to ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java diff --git a/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/EArrayBean.java rename to ebean-test/src/test/java/org/tests/model/array/EArrayBean.java diff --git a/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java rename to ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java diff --git a/ebean-core/src/test/java/org/tests/model/array/IntEnum.java b/ebean-test/src/test/java/org/tests/model/array/IntEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/IntEnum.java rename to ebean-test/src/test/java/org/tests/model/array/IntEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java rename to ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java rename to ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java diff --git a/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java b/ebean-test/src/test/java/org/tests/model/array/VarcharEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java rename to ebean-test/src/test/java/org/tests/model/array/VarcharEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Address.java rename to ebean-test/src/test/java/org/tests/model/basic/Address.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Animal.java rename to ebean-test/src/test/java/org/tests/model/basic/Animal.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java rename to ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Article.java b/ebean-test/src/test/java/org/tests/model/basic/Article.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Article.java rename to ebean-test/src/test/java/org/tests/model/basic/Article.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Attribute.java rename to ebean-test/src/test/java/org/tests/model/basic/Attribute.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/AttributeHolder.java b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/AttributeHolder.java rename to ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmark.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmark.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmarkOrg.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmarkUser.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmarkUser.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java rename to ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java rename to ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BeanWithTimeZone.java rename to ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BigDog.java b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BigDog.java rename to ebean-test/src/test/java/org/tests/model/basic/BigDog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyAssoc.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyParent.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyParentId.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Car.java rename to ebean-test/src/test/java/org/tests/model/basic/Car.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java rename to ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CarFuse.java rename to ebean-test/src/test/java/org/tests/model/basic/CarFuse.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Cat.java b/ebean-test/src/test/java/org/tests/model/basic/Cat.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Cat.java rename to ebean-test/src/test/java/org/tests/model/basic/Cat.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Contact.java rename to ebean-test/src/test/java/org/tests/model/basic/Contact.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java rename to ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ContactNote.java rename to ebean-test/src/test/java/org/tests/model/basic/ContactNote.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Country.java rename to ebean-test/src/test/java/org/tests/model/basic/Country.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Customer.java rename to ebean-test/src/test/java/org/tests/model/basic/Customer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CustomerAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CustomerAggregate.java rename to ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Dog.java b/ebean-test/src/test/java/org/tests/model/basic/Dog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Dog.java rename to ebean-test/src/test/java/org/tests/model/basic/Dog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasic.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasic.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClob.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClob.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClobNoVer.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptClient.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEnumId.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEnumId.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEnumInt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEnumInt.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicVer.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ECustomId.java b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ECustomId.java rename to ebean-test/src/test/java/org/tests/model/basic/ECustomId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EDefaultProp.java b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EDefaultProp.java rename to ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ENullCollection.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ENullCollection.java rename to ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ENullCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ENullCollectionDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneA.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneA.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneB.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneB.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneC.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneC.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ESimple.java rename to ebean-test/src/test/java/org/tests/model/basic/ESimple.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ESomeType.java b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ESomeType.java rename to ebean-test/src/test/java/org/tests/model/basic/ESomeType.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ETransMany.java b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ETransMany.java rename to ebean-test/src/test/java/org/tests/model/basic/ETransMany.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EVanillaCollection.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EVanillaCollection.java rename to ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EWithInetAddr.java b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EWithInetAddr.java rename to ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/FeatureDescription.java rename to ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java rename to ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ListAttribute.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ListAttribute.java rename to ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ListAttributeValue.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ListAttributeValue.java rename to ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MNonEnum.java b/ebean-test/src/test/java/org/tests/model/basic/MNonEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MNonEnum.java rename to ebean-test/src/test/java/org/tests/model/basic/MNonEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MProtectedConstructBean.java b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MProtectedConstructBean.java rename to ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MRole.java rename to ebean-test/src/test/java/org/tests/model/basic/MRole.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MUser.java rename to ebean-test/src/test/java/org/tests/model/basic/MUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MUserType.java b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MUserType.java rename to ebean-test/src/test/java/org/tests/model/basic/MUserType.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MnocRole.java b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MnocRole.java rename to ebean-test/src/test/java/org/tests/model/basic/MnocRole.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MnocUser.java rename to ebean-test/src/test/java/org/tests/model/basic/MnocUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyAdHoc.java b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyAdHoc.java rename to ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java b/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java rename to ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyLobSize.java rename to ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java rename to ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedBean.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildA.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildB.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCar.java b/ebean-test/src/test/java/org/tests/model/basic/OCar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCar.java rename to ebean-test/src/test/java/org/tests/model/basic/OCar.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OEngine.java rename to ebean-test/src/test/java/org/tests/model/basic/OEngine.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OGearBox.java rename to ebean-test/src/test/java/org/tests/model/basic/OGearBox.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-test/src/test/java/org/tests/model/basic/Order.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Order.java rename to ebean-test/src/test/java/org/tests/model/basic/Order.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PFile.java b/ebean-test/src/test/java/org/tests/model/basic/PFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PFile.java rename to ebean-test/src/test/java/org/tests/model/basic/PFile.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PFileContent.java rename to ebean-test/src/test/java/org/tests/model/basic/PFileContent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PersistentFile.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PersistentFile.java rename to ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PersistentFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PersistentFileContent.java rename to ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Person.java rename to ebean-test/src/test/java/org/tests/model/basic/Person.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Phone.java rename to ebean-test/src/test/java/org/tests/model/basic/Phone.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Product.java rename to ebean-test/src/test/java/org/tests/model/basic/Product.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java b/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java rename to ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Section.java rename to ebean-test/src/test/java/org/tests/model/basic/Section.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeEnum.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeEnum.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeEnumBean.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeEnumBean.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeObject.java b/ebean-test/src/test/java/org/tests/model/basic/SomeObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeObject.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeObject.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SubSection.java rename to ebean-test/src/test/java/org/tests/model/basic/SubSection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java rename to ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TIntChild.java b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TIntChild.java rename to ebean-test/src/test/java/org/tests/model/basic/TIntChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TIntRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TMapSuperEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TMapSuperEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TMappedSuper2.java rename to ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-test/src/test/java/org/tests/model/basic/TOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TOne.java rename to ebean-test/src/test/java/org/tests/model/basic/TOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TSDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/TSDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TSMaster.java rename to ebean-test/src/test/java/org/tests/model/basic/TSMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TUuidEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TUuidEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TWithPreInsert.java rename to ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Trip.java b/ebean-test/src/test/java/org/tests/model/basic/Trip.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Trip.java rename to ebean-test/src/test/java/org/tests/model/basic/Trip.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Truck.java rename to ebean-test/src/test/java/org/tests/model/basic/Truck.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TruckRef.java rename to ebean-test/src/test/java/org/tests/model/basic/TruckRef.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UTDetail.java b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UTDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/UTDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UTMaster.java rename to ebean-test/src/test/java/org/tests/model/basic/UTMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UUOne.java rename to ebean-test/src/test/java/org/tests/model/basic/UUOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UUTwo.java rename to ebean-test/src/test/java/org/tests/model/basic/UUTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ValidationGroupSomething.java b/ebean-test/src/test/java/org/tests/model/basic/ValidationGroupSomething.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ValidationGroupSomething.java rename to ebean-test/src/test/java/org/tests/model/basic/ValidationGroupSomething.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Vehicle.java rename to ebean-test/src/test/java/org/tests/model/basic/Vehicle.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VwCustomer.java rename to ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhOne.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhOne.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhRef.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhTwo.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ECacheChild.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ECacheRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCacheBase.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCacheBase.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedApp.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedApp.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java b/ebean-test/src/test/java/org/tests/model/basic/finder/CustomerFinder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java rename to ebean-test/src/test/java/org/tests/model/basic/finder/CustomerFinder.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/First.java rename to ebean-test/src/test/java/org/tests/model/basic/first/First.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/Second.java rename to ebean-test/src/test/java/org/tests/model/basic/first/Second.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/SuperSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/SuperSecond.java rename to ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java rename to ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java rename to ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdChild.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdParent.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BAccessLevel.java b/ebean-test/src/test/java/org/tests/model/bridge/BAccessLevel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BAccessLevel.java rename to ebean-test/src/test/java/org/tests/model/bridge/BAccessLevel.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java rename to ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BEmbId.java b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BEmbId.java rename to ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSite.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSite.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserA.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserB.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserC.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserE.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserE.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BUser.java rename to ebean-test/src/test/java/org/tests/model/bridge/BUser.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java rename to ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java rename to ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/EColAB.java b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/EColAB.java rename to ebean-test/src/test/java/org/tests/model/cache/EColAB.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java rename to ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java rename to ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Car.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Car.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Tire.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Tire.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Wheel.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TCar.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruck.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TWheel.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TWheel.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeClient.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeClient.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeClientKey.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeUser.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeUser.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeUser.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeUserKey.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/RCustomer.java rename to ebean-test/src/test/java/org/tests/model/composite/RCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java rename to ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/ROrder.java rename to ebean-test/src/test/java/org/tests/model/composite/ROrder.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/ROrderPK.java b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/ROrderPK.java rename to ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java rename to ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Conversation.java rename to ebean-test/src/test/java/org/tests/model/converstation/Conversation.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Group.java b/ebean-test/src/test/java/org/tests/model/converstation/Group.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Group.java rename to ebean-test/src/test/java/org/tests/model/converstation/Group.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Message.java b/ebean-test/src/test/java/org/tests/model/converstation/Message.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Message.java rename to ebean-test/src/test/java/org/tests/model/converstation/Message.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Participation.java b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Participation.java rename to ebean-test/src/test/java/org/tests/model/converstation/Participation.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/User.java b/ebean-test/src/test/java/org/tests/model/converstation/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/User.java rename to ebean-test/src/test/java/org/tests/model/converstation/User.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/DExhEntity.java b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/DExhEntity.java rename to ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/DPerson.java b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/DPerson.java rename to ebean-test/src/test/java/org/tests/model/ddd/DPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/CustomerReport.java rename to ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/ProductReport.java rename to ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/Report.java rename to ebean-test/src/test/java/org/tests/model/docstore/Report.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/BaseDomain.java b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/BaseDomain.java rename to ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/BasicDraftableBean.java rename to ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Doc.java b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Doc.java rename to ebean-test/src/test/java/org/tests/model/draftable/Doc.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Document.java b/ebean-test/src/test/java/org/tests/model/draftable/Document.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Document.java rename to ebean-test/src/test/java/org/tests/model/draftable/Document.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/DocumentMedia.java b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/DocumentMedia.java rename to ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Link.java rename to ebean-test/src/test/java/org/tests/model/draftable/Link.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Organisation.java b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Organisation.java rename to ebean-test/src/test/java/org/tests/model/draftable/Organisation.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPhone.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPhone.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcTop.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcblPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcbmPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmcPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmChild.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmOne.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmParent.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmParent.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmTwo.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddr.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddress.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddressStatus.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddressStatus.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddressStatus.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddressStatus.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbInner.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbOuter.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EInvoice.java rename to ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EMain.java rename to ebean-test/src/test/java/org/tests/model/embedded/EMain.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerAddr.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson2.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson3.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java rename to ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/PrimaryRevision.java rename to ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/RevisionId.java b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/RevisionId.java rename to ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java rename to ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java rename to ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java diff --git a/ebean-core/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/ChildPerson.java rename to ebean-test/src/test/java/org/tests/model/family/ChildPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/GrandParentPerson.java rename to ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/InheritablePerson.java rename to ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/ParentPerson.java rename to ebean-test/src/test/java/org/tests/model/family/ParentPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/generated/User.java b/ebean-test/src/test/java/org/tests/model/generated/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/generated/User.java rename to ebean-test/src/test/java/org/tests/model/generated/User.java diff --git a/ebean-core/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java rename to ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HEmbiBean.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HEmbiBean.java rename to ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HEmbiId.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HEmbiId.java rename to ebean-test/src/test/java/org/tests/model/history/HEmbiId.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HeDoc.java b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HeDoc.java rename to ebean-test/src/test/java/org/tests/model/history/HeDoc.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HeLink.java b/ebean-test/src/test/java/org/tests/model/history/HeLink.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HeLink.java rename to ebean-test/src/test/java/org/tests/model/history/HeLink.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiDoc.java b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiDoc.java rename to ebean-test/src/test/java/org/tests/model/history/HiDoc.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiLink.java b/ebean-test/src/test/java/org/tests/model/history/HiLink.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiLink.java rename to ebean-test/src/test/java/org/tests/model/history/HiLink.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTOne.java b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTOne.java rename to ebean-test/src/test/java/org/tests/model/history/HiTOne.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTThree.java b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTThree.java rename to ebean-test/src/test/java/org/tests/model/history/HiTThree.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTTwo.java b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTTwo.java rename to ebean-test/src/test/java/org/tests/model/history/HiTTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HsdSetting.java b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HsdSetting.java rename to ebean-test/src/test/java/org/tests/model/history/HsdSetting.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HsdUser.java b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HsdUser.java rename to ebean-test/src/test/java/org/tests/model/history/HsdUser.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoCompany.java rename to ebean-test/src/test/java/org/tests/model/info/InfoCompany.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoContact.java b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoContact.java rename to ebean-test/src/test/java/org/tests/model/info/InfoContact.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoCustomer.java rename to ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXResource.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRelated.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRelated.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRoot.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRootOne.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRootOne.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRootTwo.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRootTwo.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MBase.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MBase.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MMedia.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MPicture.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MPicture.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MProfile.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MProfile.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Address.java b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Address.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Address.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IAddress.java b/ebean-test/src/test/java/org/tests/model/interfaces/IAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IAddress.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IPerson.java b/ebean-test/src/test/java/org/tests/model/interfaces/IPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IPerson.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java b/ebean-test/src/test/java/org/tests/model/interfaces/IPersona.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IPersona.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Person.java b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Person.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Person.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Persona.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Persona.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java rename to ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java rename to ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java rename to ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/ESomeConvertType.java b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/ESomeConvertType.java rename to ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Money.java b/ebean-test/src/test/java/org/tests/model/ivo/Money.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Money.java rename to ebean-test/src/test/java/org/tests/model/ivo/Money.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Oid.java b/ebean-test/src/test/java/org/tests/model/ivo/Oid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Oid.java rename to ebean-test/src/test/java/org/tests/model/ivo/Oid.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Segment.java b/ebean-test/src/test/java/org/tests/model/ivo/Segment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Segment.java rename to ebean-test/src/test/java/org/tests/model/ivo/Segment.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/SysTime.java b/ebean-test/src/test/java/org/tests/model/ivo/SysTime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/SysTime.java rename to ebean-test/src/test/java/org/tests/model/ivo/SysTime.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumType.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumType.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumType.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java rename to ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java rename to ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/json/BasicJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/BasicJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/BasicJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/BasicJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicHstore.java b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicHstore.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson2.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMap.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapClob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapClob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNode.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java diff --git a/ebean-core/src/test/java/org/tests/model/json/LongJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/LongJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/LongJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/LongJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/PlainBean.java b/ebean-test/src/test/java/org/tests/model/json/PlainBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/PlainBean.java rename to ebean-test/src/test/java/org/tests/model/json/PlainBean.java diff --git a/ebean-core/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java b/ebean-test/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java rename to ebean-test/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java diff --git a/ebean-core/src/test/java/org/tests/model/json/StringJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/StringJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/StringJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/StringJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java rename to ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/Looney.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/Looney.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/Tune.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DCredit.java b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DCredit.java rename to ebean-test/src/test/java/org/tests/model/m2m/DCredit.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DRol.java b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DRol.java rename to ebean-test/src/test/java/org/tests/model/m2m/DRol.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DRot.java b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DRot.java rename to ebean-test/src/test/java/org/tests/model/m2m/DRot.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MailBox.java b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MailBox.java rename to ebean-test/src/test/java/org/tests/model/m2m/MailBox.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MailUser.java rename to ebean-test/src/test/java/org/tests/model/m2m/MailUser.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyA.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyA.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyA.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyB.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyB.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyB.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyC.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyC.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyC.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyTopic.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Permission.java rename to ebean-test/src/test/java/org/tests/model/m2m/Permission.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Role.java rename to ebean-test/src/test/java/org/tests/model/m2m/Role.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Tenant.java rename to ebean-test/src/test/java/org/tests/model/m2m/Tenant.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java rename to ebean-test/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java rename to ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/Addr.java b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/Addr.java rename to ebean-test/src/test/java/org/tests/model/m2o/Addr.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/Empl.java rename to ebean-test/src/test/java/org/tests/model/m2o/Empl.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java rename to ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java diff --git a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java b/ebean-test/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java rename to ebean-test/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java diff --git a/ebean-core/src/test/java/org/tests/model/map/MpRole.java b/ebean-test/src/test/java/org/tests/model/map/MpRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/MpRole.java rename to ebean-test/src/test/java/org/tests/model/map/MpRole.java diff --git a/ebean-core/src/test/java/org/tests/model/map/MpUser.java b/ebean-test/src/test/java/org/tests/model/map/MpUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/MpUser.java rename to ebean-test/src/test/java/org/tests/model/map/MpUser.java diff --git a/ebean-core/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java rename to ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java diff --git a/ebean-core/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java rename to ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EFile2NoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EFileNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EFileNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EUserNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EUserNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java rename to ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java b/ebean-test/src/test/java/org/tests/model/nofk/TestTruncate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java rename to ebean-test/src/test/java/org/tests/model/nofk/TestTruncate.java diff --git a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java rename to ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java diff --git a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java rename to ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/Account.java b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/Account.java rename to ebean-test/src/test/java/org/tests/model/onetoone/Account.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OCompany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OCompany.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java rename to ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoAone.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoAone.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoAtwo.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoBChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoBMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoCust.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoCustAddress.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoSdChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoSdMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThMany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThMany.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThOne.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThOne.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThTop.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThTop.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUser.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUserOptional.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/User.java b/ebean-test/src/test/java/org/tests/model/onetoone/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/User.java rename to ebean-test/src/test/java/org/tests/model/onetoone/User.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/Album.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/Album.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/BaseModel.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/Cover.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/Cover.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java diff --git a/ebean-core/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orderentity/OrderEntity.java rename to ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orderentity/OrderItemEntity.java rename to ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinter.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinterListener.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinterState.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MSomeOther.java b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MSomeOther.java rename to ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java rename to ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Paggview.java b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Paggview.java rename to ebean-test/src/test/java/org/tests/model/pview/Paggview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Pview.java rename to ebean-test/src/test/java/org/tests/model/pview/Pview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/TestPview.java rename to ebean-test/src/test/java/org/tests/model/pview/TestPview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Wview.java rename to ebean-test/src/test/java/org/tests/model/pview/Wview.java diff --git a/ebean-core/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java rename to ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/BaseResourceFile.java rename to ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/ResourceFile.java rename to ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfParent.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfRefCustomer.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfRefExample.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java diff --git a/ebean-core/src/test/java/org/tests/model/site/DataContainer.java b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/DataContainer.java rename to ebean-test/src/test/java/org/tests/model/site/DataContainer.java diff --git a/ebean-core/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/Site.java rename to ebean-test/src/test/java/org/tests/model/site/Site.java diff --git a/ebean-core/src/test/java/org/tests/model/site/SiteAddress.java b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/SiteAddress.java rename to ebean-test/src/test/java/org/tests/model/site/SiteAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java rename to ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java diff --git a/ebean-core/src/test/java/org/tests/model/site/TreeEntity.java b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/TreeEntity.java rename to ebean-test/src/test/java/org/tests/model/site/TreeEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicSDChild.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelBook.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelDown.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelDown.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelMid.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelMid.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelRole.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelRole.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelTop.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelTop.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUp.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUp.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUser.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUser.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EsdDetail.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EsdDetail.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EsdMaster.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EsdMaster.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Category.java rename to ebean-test/src/test/java/org/tests/model/survey/Category.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Group.java rename to ebean-test/src/test/java/org/tests/model/survey/Group.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Question.java b/ebean-test/src/test/java/org/tests/model/survey/Question.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Question.java rename to ebean-test/src/test/java/org/tests/model/survey/Question.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Survey.java rename to ebean-test/src/test/java/org/tests/model/survey/Survey.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java rename to ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEvent.java b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEvent.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEvent.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java rename to ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomeFileBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomeFileBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomeNewTypesBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomePeriodBean.java b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomePeriodBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibChild.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibParent.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibParent.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java diff --git a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java rename to ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionChild.java rename to ebean-test/src/test/java/org/tests/model/version/VersionChild.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionParent.java rename to ebean-test/src/test/java/org/tests/model/version/VersionParent.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionToy.java b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionToy.java rename to ebean-test/src/test/java/org/tests/model/version/VersionToy.java diff --git a/ebean-core/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/view/EOrderAgg.java rename to ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java rename to ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java rename to ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/WithZero.java rename to ebean-test/src/test/java/org/tests/model/zero/WithZero.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/WithZeroParent.java rename to ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OMVertex.java b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OMVertex.java rename to ebean-test/src/test/java/org/tests/o2m/OMVertex.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OMVertexOther.java b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OMVertexOther.java rename to ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmAccountChildDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmAccountChildDBO.java rename to ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmAccountDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmAccountDBO.java rename to ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmBasicChild.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmBasicChild.java rename to ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java rename to ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWildcard.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyWildcard.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkey.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtTrainer.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtTroop.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlBar.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlBaz.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlBaz.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlFoo.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelA.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelA.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelB.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelB.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelC.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelC.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java diff --git a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java rename to ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java rename to ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderMaster.java b/ebean-test/src/test/java/org/tests/order/OrderMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderMaster.java rename to ebean-test/src/test/java/org/tests/order/OrderMaster.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderReferencedChild.java rename to ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderReferencedParent.java rename to ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderToy.java b/ebean-test/src/test/java/org/tests/order/OrderToy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderToy.java rename to ebean-test/src/test/java/org/tests/order/OrderToy.java diff --git a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/TestOrderColumn.java rename to ebean-test/src/test/java/org/tests/order/TestOrderColumn.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java rename to ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileSimpleQuery.java b/ebean-test/src/test/java/org/tests/profile/ProfileSimpleQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/profile/ProfileSimpleQuery.java rename to ebean-test/src/test/java/org/tests/profile/ProfileSimpleQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java rename to ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java rename to ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java rename to ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java rename to ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java diff --git a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java rename to ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java diff --git a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java rename to ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java diff --git a/ebean-core/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestIContains.java rename to ebean-test/src/test/java/org/tests/query/TestIContains.java diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java rename to ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java diff --git a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java rename to ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java diff --git a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java rename to ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java rename to ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestLimitQuery.java rename to ebean-test/src/test/java/org/tests/query/TestLimitQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java rename to ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java rename to ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java diff --git a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java rename to ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java diff --git a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java rename to ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java diff --git a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestOuterJoin.java rename to ebean-test/src/test/java/org/tests/query/TestOuterJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryAlias.java rename to ebean-test/src/test/java/org/tests/query/TestQueryAlias.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java rename to ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryExists.java rename to ebean-test/src/test/java/org/tests/query/TestQueryExists.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java rename to ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java rename to ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java rename to ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java rename to ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java rename to ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java rename to ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java rename to ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java rename to ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java rename to ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestRowCount.java b/ebean-test/src/test/java/org/tests/query/TestRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestRowCount.java rename to ebean-test/src/test/java/org/tests/query/TestRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestSubQuery.java rename to ebean-test/src/test/java/org/tests/query/TestSubQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java rename to ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestWhereIn.java rename to ebean-test/src/test/java/org/tests/query/TestWhereIn.java diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java rename to ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java rename to ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java rename to ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Acl.java b/ebean-test/src/test/java/org/tests/query/cache/Acl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Acl.java rename to ebean-test/src/test/java/org/tests/query/cache/Acl.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/AclContainerRelation.java rename to ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Contract.java rename to ebean-test/src/test/java/org/tests/query/cache/Contract.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/ContractCosts.java b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/ContractCosts.java rename to ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Main1.java b/ebean-test/src/test/java/org/tests/query/cache/Main1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Main1.java rename to ebean-test/src/test/java/org/tests/query/cache/Main1.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Main2.java b/ebean-test/src/test/java/org/tests/query/cache/Main2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Main2.java rename to ebean-test/src/test/java/org/tests/query/cache/Main2.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Position.java rename to ebean-test/src/test/java/org/tests/query/cache/Position.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java rename to ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java b/ebean-test/src/test/java/org/tests/query/cancel/EBasicDto.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java rename to ebean-test/src/test/java/org/tests/query/cancel/EBasicDto.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java rename to ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java rename to ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java rename to ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java rename to ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java rename to ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java rename to ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java rename to ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java rename to ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java rename to ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java rename to ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java rename to ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java rename to ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java rename to ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java rename to ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java rename to ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java rename to ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java rename to ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java rename to ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java rename to ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java diff --git a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java rename to ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java rename to ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java rename to ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java diff --git a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java rename to ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/A2Customer.java b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/A2Customer.java rename to ebean-test/src/test/java/org/tests/rawsql/A2Customer.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/ACustomer.java b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/ACustomer.java rename to ebean-test/src/test/java/org/tests/rawsql/ACustomer.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java rename to ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java rename to ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java rename to ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java rename to ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java rename to ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java rename to ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java rename to ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java diff --git a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java rename to ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java diff --git a/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java b/ebean-test/src/test/java/org/tests/repository/CustomerRepository.java similarity index 100% rename from ebean-core/src/test/java/org/tests/repository/CustomerRepository.java rename to ebean-test/src/test/java/org/tests/repository/CustomerRepository.java diff --git a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java similarity index 100% rename from ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java rename to ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java rename to ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java similarity index 100% rename from ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java rename to ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/Zone.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java diff --git a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java rename to ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/IdEntity.java rename to ebean-test/src/test/java/org/tests/sp/model/IdEntity.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Car.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Car.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Door.java b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Door.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Door.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Wheel.java b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Wheel.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java rename to ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java rename to ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java rename to ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java rename to ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java rename to ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBean.java b/ebean-test/src/test/java/org/tests/timezone/TzBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TzBean.java rename to ebean-test/src/test/java/org/tests/timezone/TzBean.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java b/ebean-test/src/test/java/org/tests/timezone/TzBeanTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java rename to ebean-test/src/test/java/org/tests/timezone/TzBeanTests.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java rename to ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java rename to ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java rename to ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java rename to ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java rename to ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java rename to ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java rename to ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java rename to ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java rename to ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNested.java rename to ebean-test/src/test/java/org/tests/transaction/TestNested.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java rename to ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java rename to ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java rename to ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java rename to ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java rename to ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java rename to ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java diff --git a/ebean-core/src/test/java/org/tests/types/EncryptedBinary.java b/ebean-test/src/test/java/org/tests/types/EncryptedBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/EncryptedBinary.java rename to ebean-test/src/test/java/org/tests/types/EncryptedBinary.java diff --git a/ebean-core/src/test/java/org/tests/types/EncryptedString.java b/ebean-test/src/test/java/org/tests/types/EncryptedString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/EncryptedString.java rename to ebean-test/src/test/java/org/tests/types/EncryptedString.java diff --git a/ebean-core/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/PasswordStoreModel.java rename to ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java diff --git a/ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java b/ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java rename to ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java diff --git a/ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java b/ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java rename to ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java diff --git a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestEncryptedString.java rename to ebean-test/src/test/java/org/tests/types/TestEncryptedString.java diff --git a/ebean-core/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestFileType.java rename to ebean-test/src/test/java/org/tests/types/TestFileType.java diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java rename to ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java diff --git a/ebean-core/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestHstore.java rename to ebean-test/src/test/java/org/tests/types/TestHstore.java diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestNewTypes.java rename to ebean-test/src/test/java/org/tests/types/TestNewTypes.java diff --git a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestPeriodType.java rename to ebean-test/src/test/java/org/tests/types/TestPeriodType.java diff --git a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java rename to ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java b/ebean-test/src/test/java/org/tests/unitinternal/HelloMain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java rename to ebean-test/src/test/java/org/tests/unitinternal/HelloMain.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNamingConvention.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestNamingConvention.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java diff --git a/ebean-core/src/test/java/org/tests/update/EPersonOnline.java b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/EPersonOnline.java rename to ebean-test/src/test/java/org/tests/update/EPersonOnline.java diff --git a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java rename to ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java diff --git a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java rename to ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java rename to ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java rename to ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java rename to ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java rename to ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/Child.java rename to ebean-test/src/test/java/org/tests/update/objects/Child.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/Parent.java rename to ebean-test/src/test/java/org/tests/update/objects/Parent.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/SiblingA.java rename to ebean-test/src/test/java/org/tests/update/objects/SiblingA.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/SiblingB.java rename to ebean-test/src/test/java/org/tests/update/objects/SiblingB.java diff --git a/ebean-core/src/test/resources/EQL.g4 b/ebean-test/src/test/resources/EQL.g4 similarity index 100% rename from ebean-core/src/test/resources/EQL.g4 rename to ebean-test/src/test/resources/EQL.g4 diff --git a/ebean-core/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory b/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory similarity index 100% rename from ebean-core/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory rename to ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory diff --git a/ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf b/ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf rename to ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-combined.mf b/ebean-test/src/test/resources/META-INF/test/test-combined.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-combined.mf rename to ebean-test/src/test/resources/META-INF/test/test-combined.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf b/ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf rename to ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-one.mf b/ebean-test/src/test/resources/META-INF/test/test-one.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-one.mf rename to ebean-test/src/test/resources/META-INF/test/test-one.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-some.mf b/ebean-test/src/test/resources/META-INF/test/test-some.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-some.mf rename to ebean-test/src/test/resources/META-INF/test/test-some.mf diff --git a/ebean-core/src/test/resources/docker-run.properties b/ebean-test/src/test/resources/docker-run.properties similarity index 100% rename from ebean-core/src/test/resources/docker-run.properties rename to ebean-test/src/test/resources/docker-run.properties diff --git a/ebean-test/src/test/resources/ebean.mf b/ebean-test/src/test/resources/ebean.mf index 86b6aa821..fc2fd6902 100644 --- a/ebean-test/src/test/resources/ebean.mf +++ b/ebean-test/src/test/resources/ebean.mf @@ -1,2 +1,7 @@ -entity-packages: org.test -transactional-packages: org.test +agent-use-only: true +profile-location: true +entity-packages: org,misc +transactional-packages: org +querybean-packages: none +synthetic: true + diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties similarity index 99% rename from ebean-core/src/test/resources/ebean.properties rename to ebean-test/src/test/resources/ebean.properties index 49aae2a31..0fc9586f9 100644 --- a/ebean-core/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -21,7 +21,7 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} -ebean.packages=org.tests +ebean.packages=org.tests,org.etest datasource.default=h2 #datasource.h2.capturestacktrace=true diff --git a/ebean-core/src/test/resources/example1.json b/ebean-test/src/test/resources/example1.json similarity index 100% rename from ebean-core/src/test/resources/example1.json rename to ebean-test/src/test/resources/example1.json diff --git a/ebean-core/src/test/resources/extra-ddl.xml b/ebean-test/src/test/resources/extra-ddl.xml similarity index 100% rename from ebean-core/src/test/resources/extra-ddl.xml rename to ebean-test/src/test/resources/extra-ddl.xml diff --git a/ebean-core/src/test/resources/java-64.png b/ebean-test/src/test/resources/java-64.png similarity index 100% rename from ebean-core/src/test/resources/java-64.png rename to ebean-test/src/test/resources/java-64.png diff --git a/ebean-core/src/test/resources/junk.json b/ebean-test/src/test/resources/junk.json similarity index 100% rename from ebean-core/src/test/resources/junk.json rename to ebean-test/src/test/resources/junk.json diff --git a/ebean-test/src/test/resources/logback-test.xml b/ebean-test/src/test/resources/logback-test.xml index ce7ad5968..bfe4a1ede 100644 --- a/ebean-test/src/test/resources/logback-test.xml +++ b/ebean-test/src/test/resources/logback-test.xml @@ -1,22 +1,99 @@ + + TRACE + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + target/log/application.log + + TRACE + + + log/application.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + target/log/readAuditQuery.log + + log/readAuditQuery.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + target/log/readAudit.log + + log/readAudit.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + target/log/change-log.log + + log/changeLog.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + + + + + + + + + + + + + - + + - + - - - + + + + + + + + + + + + + + + + diff --git a/ebean-test/src/test/resources/application-test.yaml b/ebean-test/src/test/resources/notused-application-test.yaml similarity index 100% rename from ebean-test/src/test/resources/application-test.yaml rename to ebean-test/src/test/resources/notused-application-test.yaml diff --git a/ebean-core/src/test/resources/profile-image.jpg b/ebean-test/src/test/resources/profile-image.jpg similarity index 100% rename from ebean-core/src/test/resources/profile-image.jpg rename to ebean-test/src/test/resources/profile-image.jpg diff --git a/ebean-core/src/test/resources/scripts/test-script-2.sql b/ebean-test/src/test/resources/scripts/test-script-2.sql similarity index 100% rename from ebean-core/src/test/resources/scripts/test-script-2.sql rename to ebean-test/src/test/resources/scripts/test-script-2.sql diff --git a/ebean-core/src/test/resources/scripts/test-script.sql b/ebean-test/src/test/resources/scripts/test-script.sql similarity index 100% rename from ebean-core/src/test/resources/scripts/test-script.sql rename to ebean-test/src/test/resources/scripts/test-script.sql diff --git a/ebean-core/src/test/resources/test-ebean.properties b/ebean-test/src/test/resources/test-ebean.properties similarity index 100% rename from ebean-core/src/test/resources/test-ebean.properties rename to ebean-test/src/test/resources/test-ebean.properties diff --git a/ebean-core/src/test/resources/test-properties/application.properties b/ebean-test/src/test/resources/test-properties/application.properties similarity index 100% rename from ebean-core/src/test/resources/test-properties/application.properties rename to ebean-test/src/test/resources/test-properties/application.properties diff --git a/ebean-core/src/test/resources/test-properties/application.yaml b/ebean-test/src/test/resources/test-properties/application.yaml similarity index 100% rename from ebean-core/src/test/resources/test-properties/application.yaml rename to ebean-test/src/test/resources/test-properties/application.yaml diff --git a/ebean-core/src/test/resources/test-properties/foo.yml b/ebean-test/src/test/resources/test-properties/foo.yml similarity index 100% rename from ebean-core/src/test/resources/test-properties/foo.yml rename to ebean-test/src/test/resources/test-properties/foo.yml diff --git a/ebean-core/src/test/resources/test-properties/one.properties b/ebean-test/src/test/resources/test-properties/one.properties similarity index 100% rename from ebean-core/src/test/resources/test-properties/one.properties rename to ebean-test/src/test/resources/test-properties/one.properties diff --git a/ebean-core/src/test/resources/test1.csv b/ebean-test/src/test/resources/test1.csv similarity index 100% rename from ebean-core/src/test/resources/test1.csv rename to ebean-test/src/test/resources/test1.csv From 1696caadd4ec7386ce1d31534bfb4d1d53d23cbd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 11:25:04 +1200 Subject: [PATCH 088/102] #2361 - Tidy tests only, move to LoggedSql (ebean-test) --- .../src/test/java/io/ebean/DtoQuery2Test.java | 18 +++--- .../java/io/ebean/DtoQueryFromOrmTest.java | 38 +++++------ .../src/test/java/io/ebean/DtoQueryTest.java | 10 +-- .../ebean/EbeanServer_deleteAllByIdTest.java | 22 +++---- .../io/ebean/EbeanServer_deleteByIdTest.java | 18 +++--- .../java/io/ebean/EbeanServer_deleteTest.java | 10 +-- .../java/io/ebean/EbeanServer_eqlTest.java | 10 +-- .../io/ebean/EbeanServer_saveAllTest.java | 36 +++++------ .../test/java/io/ebean/FetchGroupTest.java | 18 +++--- .../io/ebean/TestUnsetLoadedProperties.java | 10 +-- .../test/java/io/ebean/UpdateQueryTest.java | 22 +++---- .../IsEmptyExpressionQueryTest.java | 6 +- .../server/expression/NoopExpressionTest.java | 6 +- .../server/grammer/EqlParserTest.java | 6 +- .../test/java/io/ebeantest/CaptureLogger.java | 64 ------------------- .../io/ebeantest/CapturingLoggerFactory.java | 22 ------- .../src/test/java/io/ebeantest/LoggedSql.java | 31 --------- .../org/ebeantest/LoggedSqlCollector.java | 36 ----------- .../partition/MultiTenantPartitionTest.java | 20 +++--- .../TestAggregateFormula.java | 34 +++++----- .../TestAggregateInheritFormula.java | 6 +- .../java/org/tests/basic/TestFetchId.java | 2 +- .../org/tests/basic/TestQueryForUpdate.java | 6 +- .../org/tests/basic/encrypt/TestEncrypt.java | 10 +-- .../tests/basic/event/TestQueryAdapter.java | 8 +-- .../basic/lob/TestBasicClobFetchEager.java | 10 +-- .../tests/basic/lob/TestBasicClobNoVer.java | 6 +- .../batchinsert/TestBatchInsertFlush.java | 48 +++++++------- ...tBatchInsertWithInitialisedCollection.java | 6 +- .../batchload/TestBatchLazyWithCacheHits.java | 6 +- .../batchload/TestQueryDisableLazyLoad.java | 14 ++-- .../batchload/TestQueryJoinToAssocOne.java | 30 ++++----- .../tests/batchload/TestSecondaryQueries.java | 26 ++++---- .../java/org/tests/cache/TestBeanCache.java | 20 +++--- .../cache/TestBeanCacheContactLazyLoad.java | 2 +- .../cache/TestBeanCacheWithDeleteQuery.java | 18 +++--- .../tests/cache/TestBeanFetchJoinCache.java | 24 +++---- .../java/org/tests/cache/TestQueryCache.java | 34 +++++----- .../cache/personinfo/PersonCacheTests.java | 8 +-- .../tests/cascade/TestMultiCascadeBatch.java | 6 +- .../org/tests/cascade/TestOrderedList.java | 20 +++--- .../org/tests/cascade/TestPrivateOwned.java | 10 +-- .../org/tests/changelog/TestChangeLog.java | 2 +- .../org/tests/ddl/TestForeignKeyModes.java | 10 +-- .../org/tests/defaultvalues/TestDefaults.java | 6 +- .../org/tests/delete/TestDeleteByQuery.java | 38 +++++------ .../delete/TestDeleteCascadeWithListener.java | 6 +- .../java/org/tests/draftable/DocLinkTest.java | 6 +- .../org/tests/history/TestHistoryInsert.java | 2 +- .../inheritance/TestInheritanceOnMany.java | 14 ++-- .../TestInheritanceOrderColumn.java | 10 +-- .../inheritance/TestInheritanceQuery.java | 6 +- .../inheritance/TestInheritanceRefBean.java | 10 +-- .../bothsides/TestInheritanceBothSides.java | 10 +-- .../cache/TestInheritanceRefCache.java | 22 +++---- .../org/tests/insert/TestOnlyIdEntity.java | 6 +- .../java/org/tests/iud/TestCarWheelIud.java | 6 +- .../org/tests/iud/TestPersistCascade.java | 6 +- .../org/tests/json/TestDbJson_Jackson3.java | 2 +- .../java/org/tests/json/TestDbJson_List.java | 18 +++--- .../java/org/tests/json/TestJsonMapBasic.java | 2 +- .../lazyforeignkeys/TestLazyForeignKeys.java | 6 +- .../org/tests/m2m/TestM2MDeleteNoCascade.java | 14 ++-- .../tests/m2m/TestM2MDistinct_sqlServer.java | 2 +- .../java/org/tests/merge/TestMergeBasic.java | 10 +-- .../org/tests/merge/TestMergeCustomer.java | 42 ++++++------ .../java/org/tests/merge/TestMergeM2M.java | 8 +-- .../aggregation/TestAggregationMany.java | 14 ++-- .../aggregation/TestAggregationTopLevel.java | 30 ++++----- .../tests/model/array/TestDbArray_asSet.java | 10 +-- .../tests/model/array/TestDbArray_basic.java | 10 +-- .../cache/TestCacheViaComplexNaturalKey.java | 18 +++--- .../cache/TestCacheViaComplexNaturalKey3.java | 34 +++++----- .../basic/cache/TestCacheWithSoftDelete.java | 2 +- .../cache/TestNatKeyCacheWithForeignKey.java | 14 ++-- .../model/basic/cache/TestNatKeyUid.java | 6 +- .../TestInsertBatchThenFlushThenUpdate.java | 12 ++-- .../basic/xtra/TestInsertBatchThenUpdate.java | 14 ++-- ...TestInsertBatchWithDifferentRootTypes.java | 10 +-- .../tests/model/bridge/TestIdClassScalar.java | 14 ++-- .../TestInheritSoftDeleteJoin.java | 2 +- .../TestMTOInheritNoDiscriminator.java | 6 +- .../composite/TestCompositeKeyUserClient.java | 6 +- .../elementcollection/EcmPersonTest.java | 6 +- .../elementcollection/EcsPersonTest.java | 6 +- .../TestElementCollectionBasic.java | 38 +++++------ .../TestElementCollectionBasicCache.java | 18 +++--- .../TestElementCollectionBasicMap.java | 24 +++---- .../TestElementCollectionBasicMapAsLob.java | 8 +-- .../TestElementCollectionBasicMapCache.java | 18 +++--- .../TestElementCollectionBasicSet.java | 24 +++---- .../TestElementCollectionCascadeMultiple.java | 6 +- .../TestElementCollectionEmbeddedList.java | 24 +++---- ...estElementCollectionEmbeddedListCache.java | 18 +++--- .../TestElementCollectionEmbeddedMap.java | 22 +++---- ...TestElementCollectionEmbeddedMapCache.java | 18 +++--- .../embedded/TestEmbeddedAttrOverride.java | 6 +- .../model/embedded/TestEmbeddedManyToOne.java | 6 +- .../model/history/TestHistoryEmbeddedId.java | 6 +- .../model/history/TestHistoryOneToMany.java | 6 +- .../model/json/TestJacksonPlainBean.java | 2 +- .../org/tests/model/m2m/TestM2MWithWhere.java | 2 +- .../TestOneToOneImportedPkNative.java | 6 +- .../TestOneToOneOptionalRelationship.java | 14 ++-- .../onetoone/TestOneToOneOrphanRemove.java | 8 +-- .../onetoone/TestOneToOneOrphanStringId.java | 20 +++--- .../onetoone/TestOneToOnePrimaryKeyJoin.java | 6 +- .../TestOneToOnePrimaryKeyJoinBidi.java | 6 +- .../TestOneToOnePrimaryKeyJoinOptional.java | 6 +- .../album/DeleteById_SoftDelete_Tests.java | 58 ++++++++--------- .../album/TestOneToOneHardDelete.java | 10 +-- .../orphanremoval/TestOrphanRemoveO2M.java | 6 +- .../org/tests/model/site/TestTreeModel.java | 6 +- .../tests/o2m/TestOneToManyNoMappedBy.java | 6 +- .../org/tests/o2m/TestOneToManyWhere.java | 2 +- .../o2m/jointable/TestOneToManyJoinTable.java | 20 +++--- .../TestOneToManyJoinTableInheritance.java | 6 +- .../TestOneToManyJoinTableNoTableName.java | 12 ++-- .../o2o/TestOneToOneSaveWithoutChanges.java | 6 +- .../java/org/tests/o2o/TestReferenceSave.java | 6 +- .../java/org/tests/order/TestOrderColumn.java | 10 +-- .../TestAddOrderByWithFirstRowsMaxRows.java | 34 +++++----- .../java/org/tests/query/TestOuterJoin.java | 2 +- .../org/tests/query/TestQueryBaseTable.java | 6 +- .../java/org/tests/query/TestQueryExists.java | 2 +- .../query/TestQueryFetchManyTwoDeep.java | 6 +- .../org/tests/query/TestQueryFilterMany.java | 46 ++++++------- .../org/tests/query/TestQueryFindEach.java | 14 ++-- .../org/tests/query/TestQueryFindIterate.java | 10 +-- .../org/tests/query/TestQueryFindNative.java | 38 +++++------ .../tests/query/TestQueryFindPagedList.java | 18 +++--- .../org/tests/query/TestWhereRawClause.java | 6 +- .../aggregation/TestAggregationCount.java | 35 +++++----- .../query/finder/TestCustomerFinder.java | 8 +-- .../query/joins/TestQueryJoinManyNonRoot.java | 6 +- .../query/joins/TestQueryJoinOnFormula.java | 54 ++++++++-------- .../query/orderby/TestOrderByWithMany.java | 6 +- .../other/TestQueryConversationRowCount.java | 6 +- .../other/TestQueryRawExpressionMany.java | 6 +- .../other/TestQueryRowCountWithMany.java | 10 +-- .../query/other/TestWhereAnnotation.java | 10 +-- .../softdelete/TestSoftDeletePagingList.java | 6 +- .../tests/query/sqlquery/SqlQueryTests.java | 22 +++---- .../org/tests/rawsql/TestRawSqlOrmQuery.java | 14 ++-- .../rawsql/nativesql/TestNativeSqlBasic.java | 8 +-- .../nativesql/TestNativeWithEmbedded.java | 6 +- .../org/tests/readaudit/TestReadAudit.java | 6 +- .../tests/softdelete/TestSoftDeleteBasic.java | 38 +++++------ .../softdelete/TestSoftDeleteManyToMany.java | 6 +- .../TestSoftDeleteOptionalRelationship.java | 6 +- .../softdelete/TestSoftDeleteOtoCascade.java | 6 +- .../TestSoftDeleteStatelessUpdate.java | 2 +- .../transaction/TestBatchModelFlush.java | 6 +- .../transaction/TestBatchPersistCascade.java | 6 +- .../tests/transaction/TestBeanStateReset.java | 6 +- .../transaction/TestTransactionSkipCache.java | 6 +- .../TestTransparentPersist.java | 2 +- .../test/java/org/tests/types/TestHstore.java | 10 +-- .../TestSqlUpdateBindMultipleLists.java | 6 +- .../org/tests/update/TestSqlUpdateInTxn.java | 10 +-- .../org/tests/update/TestStatelessUpdate.java | 2 +- .../update/TestUpdateAllLoadedProperties.java | 10 +-- .../io.ebeaninternal.api.SpiLoggerFactory | 1 - 163 files changed, 1024 insertions(+), 1179 deletions(-) delete mode 100644 ebean-test/src/test/java/io/ebeantest/CaptureLogger.java delete mode 100644 ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java delete mode 100644 ebean-test/src/test/java/io/ebeantest/LoggedSql.java delete mode 100644 ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java delete mode 100644 ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory diff --git a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java index dd657f296..90a62f734 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); final int expectedCount = server().find(Customer.class).findCount(); - LoggedSqlCollector.start(); + LoggedSql.start(); int counter = 0; try (final QueryIterator iterator = server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) @@ -72,7 +72,7 @@ public class DtoQuery2Test extends BaseTestCase { assertThat(counter).isEqualTo(expectedCount); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -81,7 +81,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); final int expectedCount = server().find(Customer.class).findCount(); - LoggedSqlCollector.start(); + LoggedSql.start(); try (final Stream stream = server() @@ -96,7 +96,7 @@ public class DtoQuery2Test extends BaseTestCase { assertThat(names.size()).isEqualTo(expectedCount); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -105,12 +105,12 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) .findEach(it -> log.info("got " + it.getId() + " " + it.getName())); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -119,7 +119,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") .setParameter("id", 0) .findEachWhile(customer -> { @@ -127,7 +127,7 @@ public class DtoQuery2Test extends BaseTestCase { return customer.getId() > 3; }); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java index c0caf65bd..f850e3e0b 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -76,7 +76,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(Contact.class) .select("email, concat(lastName, ISO_WEEK(?)) as lastName") @@ -86,7 +86,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(list).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact"); } @@ -97,7 +97,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { // // ResetBasicData.reset(); // -// LoggedSqlCollector.start(); +// LoggedSql.start(); // // List list = DB.find(Contact.class) // .select("email, concat(lastName, ISO_WEEK(:date)) as lastName") @@ -108,7 +108,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { // // assertThat(list).isNotEmpty(); // -// List sql = LoggedSqlCollector.stop(); +// List sql = LoggedSql.stop(); // assertThat(sql).hasSize(2); // assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact"); // } @@ -118,7 +118,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) // we must explicitly add the id property for DTO query (if we want it) @@ -135,7 +135,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getFullName()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name"); } @@ -145,7 +145,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) .where().isNotNull("email").order().asc("lastName") @@ -162,7 +162,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getId()).isGreaterThan(0); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.id, t0.first_name, t0.last_name"); } @@ -171,7 +171,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -186,7 +186,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getFullName()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name"); } @@ -196,7 +196,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class).setLabel("emailFullName") .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -209,7 +209,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getFullName()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name") @@ -226,7 +226,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class) .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -240,7 +240,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getEmail()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("select top 10 t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name") @@ -256,7 +256,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class) .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").order() @@ -270,7 +270,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getEmail()).isNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where"); } @@ -279,7 +279,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where() .isNotNull("lastName").having().gt("count(*)", 1).order().desc("count(*)").asDto(ContactTotals.class) @@ -292,7 +292,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getTotalCount()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java index 4daa80eeb..53b2b4ca4 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,12 +57,12 @@ public class DtoQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) .findEach(it -> log.info("got " + it.getId() + " " + it.getName())); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -71,7 +71,7 @@ public class DtoQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") .setParameter("id", 0) .findEachWhile(customer -> { @@ -79,7 +79,7 @@ public class DtoQueryTest extends BaseTestCase { return customer.getId() > 3; }); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index 7365f430c..61c9031d0 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -20,7 +20,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { final EBasicVer bean1 = bean("foo1"); final EBasicVer bean2 = bean("foo2"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(bean0, bean1, bean2); @@ -28,7 +28,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { assertNotNull(bean1.getId()); assertNotNull(bean2.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver"); assertSqlBind(loggedSql, 1, 3); @@ -52,10 +52,10 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(EBasicVer.class, ids); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -73,12 +73,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { Database db = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = db.beginTransaction()) { db.deleteAll(EBasicVer.class, ids, txn); txn.commit(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -94,11 +94,11 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { ids.add(someBean.getId()); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(EBasicVer.class, ids); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -117,12 +117,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { Database db = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = db.beginTransaction()) { db.deleteAllPermanent(EBasicVer.class, ids, txn); txn.commit(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index ffe1a743f..dd7d461ef 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,10 +18,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(EBasicVer.class, someBean.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } @@ -33,10 +33,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deletePermanent(EBasicVer.class, someBean.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } @@ -50,7 +50,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { Database server = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.delete(EBasicVer.class, someBean.getId(), txn); @@ -58,7 +58,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } @@ -71,7 +71,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { Database server = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.deletePermanent(EBasicVer.class, someBean.getId(), txn); @@ -79,7 +79,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java index 427d4a4d0..e30c33aea 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,10 +18,10 @@ public class EbeanServer_deleteTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(someBean); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); } @@ -34,7 +34,7 @@ public class EbeanServer_deleteTest extends BaseTestCase { Database server = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.delete(someBean, txn); @@ -42,7 +42,7 @@ public class EbeanServer_deleteTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java index 7aac81b95..c913e8495 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -88,9 +88,9 @@ public class EbeanServer_eqlTest extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;"); } @@ -114,9 +114,9 @@ public class EbeanServer_eqlTest extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java index 603a3befa..474576b0c 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -19,11 +19,11 @@ public class EbeanServer_saveAllTest extends BaseTestCase { List someBeans = beans(3); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(someBeans); // assert - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -33,19 +33,19 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.updateAll(someBeans); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(3); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(someBeans); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); } @@ -57,31 +57,31 @@ public class EbeanServer_saveAllTest extends BaseTestCase { try (Transaction transaction = server.beginTransaction()) { transaction.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); for (EBasicVer bean : beans(2)) { server.save(bean); } // jdbc batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); server.saveAll(beans(3)); // still batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); for (EBasicVer bean : beans(2)) { server.save(bean); } // still batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); // flush now transaction.commit(); // and we have our SQL from jdbc batch flush - assertThat(LoggedSqlCollector.stop()).isNotEmpty(); + assertThat(LoggedSql.stop()).isNotEmpty(); } } @@ -113,14 +113,14 @@ public class EbeanServer_saveAllTest extends BaseTestCase { Database server = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.saveAll(someBeans, txn); txn.commit(); } // assert - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -130,23 +130,23 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.updateAll(someBeans, txn); txn.commit(); } - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(3); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.deleteAll(someBeans, txn); txn.commit(); } - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); } diff --git a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java index 83ef87e2c..74744391e 100644 --- a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java @@ -1,7 +1,7 @@ package io.ebean; import io.ebean.service.SpiFetchGroupQuery; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -47,10 +47,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(fetch); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.status from o_customer"); assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from contact"); @@ -75,10 +75,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(fetch); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer"); assertSql(sql.get(1)).contains(" from contact"); @@ -105,10 +105,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(FBCustomer); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.id, t1.line_1, t1.line_2, t1.city, t2.code, t2.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id left join o_country t2 on t2.code = t1.country_code "); } @@ -122,7 +122,7 @@ public class FetchGroupTest extends BaseTestCase { final FetchGroup fetchGroup = query.buildFetchGroup(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer.find .query() @@ -131,7 +131,7 @@ public class FetchGroupTest extends BaseTestCase { .select(fetchGroup) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where"); } diff --git a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java index dd21c5f99..38d6cc22a 100644 --- a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -3,7 +3,7 @@ package io.ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.converstation.User; @@ -37,10 +37,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { assertThat(beanState.loadedProps()).containsExactly("id", "name"); - LoggedSqlCollector.start(); + LoggedSql.start(); user.update(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("email"); } @@ -114,10 +114,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { updUser.setName("mod occ"); updUser.markPropertyUnset("version"); - LoggedSqlCollector.start(); + LoggedSql.start(); updUser.save(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("where id=?;"); } } diff --git a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java index 75555d6c7..26fcd0324 100644 --- a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -55,7 +55,7 @@ public class UpdateQueryTest extends BaseTestCase { UpdateQuery update = server().update(Customer.class); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = update .setRaw("status = status") @@ -63,7 +63,7 @@ public class UpdateQueryTest extends BaseTestCase { .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isGreaterThan(0); @@ -81,7 +81,7 @@ public class UpdateQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server().find(Customer.class) .where() @@ -92,7 +92,7 @@ public class UpdateQueryTest extends BaseTestCase { .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isEqualTo(0); @@ -103,7 +103,7 @@ public class UpdateQueryTest extends BaseTestCase { public void query_asUpdate_idIn() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server().find(Customer.class) .where() @@ -113,7 +113,7 @@ public class UpdateQueryTest extends BaseTestCase { .setLabel("asUpdateByIds") .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isEqualTo(0); @@ -201,7 +201,7 @@ public class UpdateQueryTest extends BaseTestCase { Country nz = server.reference(Country.class, "NZ"); - LoggedSqlCollector.start(); + LoggedSql.start(); server.update(Customer.class) .set("status", Customer.Status.ACTIVE) @@ -211,7 +211,7 @@ public class UpdateQueryTest extends BaseTestCase { .setMaxRows(100) .update(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update o_customer set status=? where id in (select t0.id from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where t1.country_code = ? and t0.id > ? limit 100)"); } @@ -221,7 +221,7 @@ public class UpdateQueryTest extends BaseTestCase { Database server = server(); - LoggedSqlCollector.start(); + LoggedSql.start(); server.update(Customer.class) .set("status", Customer.Status.ACTIVE) @@ -230,7 +230,7 @@ public class UpdateQueryTest extends BaseTestCase { .setMaxRows(100) .update(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); if (isMySql() || isH2() || isMariaDB()) { assertSql(sql.get(0)).contains("update o_customer set status=? where id > ? limit 100"); } else { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index cdccac147..cf2a11e04 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -35,13 +35,13 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EUserNoFk.class) .where().isEmpty("files") .delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformSupportsDeleteTableAlias()) { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index 0583bdb35..69bbbf6db 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.onetoone.album.Cover; @@ -35,11 +35,11 @@ public class NoopExpressionTest extends BaseExpressionTest { .where().add(NoopExpression.INSTANCE) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 287ace7ed..1fea2b556 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiQuery; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; @@ -532,12 +532,12 @@ public class EqlParserTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10"); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address"); assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id)"); diff --git a/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java b/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java deleted file mode 100644 index 4f0454ccd..000000000 --- a/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeantest; - -import io.ebeaninternal.api.SpiLogger; - -import java.util.ArrayList; -import java.util.List; - -/** - * Capture the log messages (executed SQL) for testing. - */ -class CaptureLogger implements SpiLogger { - - private final SpiLogger wrapped; - - private List messages = new ArrayList<>(); - - private boolean active; - - CaptureLogger(SpiLogger wrapped) { - this.wrapped = wrapped; - } - - @Override - public boolean isDebug() { - return true; - } - - @Override - public boolean isTrace() { - return true; - } - - @Override - public void debug(String msg) { - if (active) { - messages.add(msg); - } - wrapped.debug(msg); - } - - @Override - public void trace(String msg) { - if (active) { - messages.add(msg); - } - wrapped.trace(msg); - } - - List start() { - this.active = true; - return collect(); - } - - List stop() { - this.active = false; - return collect(); - } - - List collect() { - List response = messages; - messages = new ArrayList<>(); - return response; - } -} diff --git a/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java b/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java deleted file mode 100644 index ebbebd2fe..000000000 --- a/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.ebeantest; - -import io.ebeaninternal.api.SpiLogger; -import io.ebeaninternal.api.SpiLoggerFactory; -import io.ebeaninternal.server.logger.DSpiLogger; -import org.slf4j.LoggerFactory; - -/** - * Create a logger that captures the SQL and register it for later access in tests. - */ -public class CapturingLoggerFactory implements SpiLoggerFactory { - - @Override - public SpiLogger create(String name) { - - DSpiLogger logger = new DSpiLogger(LoggerFactory.getLogger(name)); - if (name.equals("io.ebean.SQL")) { - return LoggedSql.register(logger); - } - return logger; - } -} diff --git a/ebean-test/src/test/java/io/ebeantest/LoggedSql.java b/ebean-test/src/test/java/io/ebeantest/LoggedSql.java deleted file mode 100644 index db7cac92c..000000000 --- a/ebean-test/src/test/java/io/ebeantest/LoggedSql.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.ebeantest; - -import io.ebeaninternal.api.SpiLogger; -import io.ebeaninternal.server.logger.DSpiLogger; - -import java.util.List; - -public class LoggedSql { - - private static CaptureLogger sqlLogger; - - static SpiLogger register(DSpiLogger logger) { - if (sqlLogger == null) { - sqlLogger = new CaptureLogger(logger); - } - return sqlLogger; - } - - public static List start() { - return sqlLogger.start(); - } - - public static List stop() { - return sqlLogger.stop(); - } - - public static List collect() { - return sqlLogger.collect(); - } - -} diff --git a/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java b/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java deleted file mode 100644 index d80253edf..000000000 --- a/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.ebeantest; - -import io.ebeantest.LoggedSql; - -import java.util.List; - -/** - * Helper that can collect the SQL that is logged via SLF4J. - *

    - * Used {@link #start()} and {@link #stop()} to collect the logged messages that contain the - * executed SQL statements. - *

    - * Internally this uses a Logback Appender to collect messages for org.avaje.ebean.SQL. - */ -public class LoggedSqlCollector { - - /** - * Start collection of the logged SQL statements. - */ - public static List start() { - return LoggedSql.start(); - } - - /** - * Stop collection of the logged SQL statements return the list of captured messages that contain - * the SQL. - */ - public static List stop() { - return LoggedSql.stop(); - } - - public static List current() { - return LoggedSql.collect(); - } - -} diff --git a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 034dd6b1f..4e962ae92 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -5,7 +5,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.config.TenantMode; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -42,25 +42,25 @@ public class MultiTenantPartitionTest extends BaseTestCase { UserContext.set("rob", "ten_1"); - LoggedSqlCollector.start(); + LoggedSql.start(); MtContent content = new MtContent("first title"); server.save(content); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("insert into mt_content (title, body, when_modified, when_created, version, tenant_id) values (?,?,?,?,?,?)"); content.setBody("some body"); server.save(content); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("update mt_content set body=?, when_modified=?, version=? where id=? and tenant_id=? and version=?"); server.delete(content); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=? and version=?"); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Test @@ -71,10 +71,10 @@ public class MultiTenantPartitionTest extends BaseTestCase { MtContent content = new MtContent("first title"); server.save(content); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server.delete(MtContent.class, content.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); assertThat(rows).isEqualTo(1); @@ -93,11 +93,11 @@ public class MultiTenantPartitionTest extends BaseTestCase { List ids = Arrays.asList(a.getId(), b.getId(), 99998L); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server.deleteAll(MtContent.class, ids); assertThat(rows).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); } diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index c986a7438..8d5707da1 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -25,7 +25,7 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .setDistinct(true) @@ -33,7 +33,7 @@ public class TestAggregateFormula extends BaseTestCase { .order("min(customer) asc nulls last") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select distinct t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name order by min(t0.customer_id) nulls last"); assertThat(contacts).isNotEmpty(); @@ -49,13 +49,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertThat(contacts).isNotEmpty(); @@ -71,7 +71,7 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") @@ -83,7 +83,7 @@ public class TestAggregateFormula extends BaseTestCase { assertNotNull(customer.getName()); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where"); @@ -100,7 +100,7 @@ public class TestAggregateFormula extends BaseTestCase { public void minOnManyToOne_withFetchQueryWithJoin() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") @@ -117,7 +117,7 @@ public class TestAggregateFormula extends BaseTestCase { } } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status, t1.id, t1.city, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where"); @@ -135,13 +135,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("status, sum(id)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) from o_order t0 group by t0.status"); assertThat(orders).isNotEmpty(); @@ -156,13 +156,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("status, sum(id) as id") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) id from o_order t0 group by t0.status"); assertThat(orders).isNotEmpty(); @@ -177,13 +177,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("customer, min(cretime)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime) from contact t0 group by t0.customer_id"); assertThat(contacts).isNotEmpty(); @@ -194,13 +194,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("customer, min(cretime), max(updtime)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime), max(t0.updtime) from contact t0 group by t0.customer_id"); assertThat(contacts).isNotEmpty(); diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index 3735b5940..f7f9a3df7 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -2,7 +2,7 @@ package org.tests.aggregateformula; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -24,7 +24,7 @@ public class TestAggregateInheritFormula extends BaseTestCase { DB.saveAll(Arrays.asList(st0, st1, p0, p1)); - LoggedSqlCollector.start(); + LoggedSql.start(); List segments = DB.find(IAFPartialSegment.class) @@ -32,7 +32,7 @@ public class TestAggregateInheritFormula extends BaseTestCase { .where().eq("segmentIdZat", 108L) .findList(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(segments).hasSize(1); assertSql(sql.get(0)).contains("select t0.segment_id_zat, min(t0.status_id) from iaf_segment t0 where t0.ptype = 'target' and t0.segment_id_zat = ? group by t0.segment_id_zat"); diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index 8467abad1..df3b48d8f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 37d424b31..bf53599b9 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -8,7 +8,7 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -54,7 +54,7 @@ public class TestQueryForUpdate extends BaseTestCase { try (Transaction transaction = DB.beginTransaction()) { - LoggedSqlCollector.start(); + LoggedSql.start(); EBasic basic0 = DB.find(EBasic.class, basic.getId()); assertThat(basic0).isNotNull(); @@ -67,7 +67,7 @@ public class TestQueryForUpdate extends BaseTestCase { assertThat(basic1).isNotNull(); assertThat(basic1).isSameAs(basic0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { assertSql(sql.get(0)).contains("from e_basic t0 where t0.id ="); diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index ca8a47f3b..e0f401256 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -7,7 +7,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncryptRelate; @@ -25,12 +25,12 @@ public class TestEncrypt extends BaseTestCase { @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server public void testQueryBind() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EBasicEncrypt.class) .where().startsWith("description", "Rob") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("; --bind(****,Rob%)"); } @@ -39,7 +39,7 @@ public class TestEncrypt extends BaseTestCase { @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server public void testQueryJoin() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EBasicEncryptRelate.class) .where().eq("other.description", "foo") @@ -49,7 +49,7 @@ public class TestEncrypt extends BaseTestCase { .where().eq("other.description", "foo") .findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("left join e_basicenc t1 on t1.id = t0.other_id"); assertThat(loggedSql.get(1)).contains("left join e_basicenc t1 on t1.id = t0.other_id"); diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java index 0b106baad..f6050a161 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TOne; @@ -35,21 +35,21 @@ public class TestQueryAdapter extends BaseTestCase { Query notUsedQuery = DB.find(TOne.class); assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.update(TOne.class) .set("name", "mod") .where().idEq(o.getId()) .update(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains(" 2=2"); DB.find(TOne.class) .where().idEq(o.getId()) .delete(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertSql(sql.get(0)).contains(" 3=3"); } diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 7dbc62c5e..eaf598cf4 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -35,13 +35,13 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertThat(sql).contains(expectedSql); - LoggedSqlCollector.start(); + LoggedSql.start(); // Same as previous query - clob included by default based on annotation DB.find(EBasicClobFetchEager.class, entity.getId()); // Assert query same as previous ... - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); @@ -66,13 +66,13 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertEquals("initialClobValue", entity.getDescription()); - LoggedSqlCollector.start(); + LoggedSql.start(); // Refresh query includes all properties server.refresh(entity); // Assert all properties fetched in refresh - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); assertEquals("modified", entity.getDescription()); diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index eed250046..66b741523 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.EBasicClobNoVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -53,13 +53,13 @@ public class TestBasicClobNoVer extends BaseTestCase { assertThat(entity.getDescription()).isEqualTo("initialClobValue"); - LoggedSqlCollector.start(); + LoggedSql.start(); // Refresh query includes all properties DB.refresh(entity); // Assert all properties fetched in refresh - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob); assertThat(entity.getDescription()).isEqualTo("modified"); diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index cbefd7a68..ac113e3a1 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -13,7 +13,7 @@ import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebeaninternal.api.SpiTransaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; @@ -42,7 +42,7 @@ public class TestBatchInsertFlush extends BaseTestCase { transaction.setBatchMode(true); transaction.setLabel("TestBatchInsertFlush.no_cascade"); - LoggedSqlCollector.start(); + LoggedSql.start(); TSMaster m = new TSMaster(); m.setName("master1"); @@ -65,7 +65,7 @@ public class TestBatchInsertFlush extends BaseTestCase { transaction.commit(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we get the 2 master inserts first assertSql(sql.get(0)).contains("insert into t_atable_thatisrelatively"); @@ -95,7 +95,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batch = PersistBatch.ALL, flushOnQuery = false) public void transactional_flushOnQueryFalse() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -103,7 +103,7 @@ public class TestBatchInsertFlush extends BaseTestCase { // does not trigger JDBC batch with flushOnQuery = false DB.find(Customer.class).findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*)"); } @@ -111,7 +111,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batchSize = 20) public void transactional_flushOnSqlQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -121,7 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase { .mapToScalar(Integer.class) .findOne(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -129,7 +129,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batchSize = 20) public void transactional_flushOnDtoQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -138,7 +138,7 @@ public class TestBatchInsertFlush extends BaseTestCase { DB.findDto(DtoQuery2Test.DCust.class, "select id, name from o_customer") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -146,7 +146,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batch = PersistBatch.ALL) public void transactional_flushOnQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -154,7 +154,7 @@ public class TestBatchInsertFlush extends BaseTestCase { // by default triggers flush of JDBC batch DB.find(Customer.class).findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -164,7 +164,7 @@ public class TestBatchInsertFlush extends BaseTestCase { public void transactional_flushOnGetId() { Database server = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasicVer b1 = new EBasicVer("b1"); server.save(b1); @@ -173,10 +173,10 @@ public class TestBatchInsertFlush extends BaseTestCase { server.save(b2); //flush here - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(3); EBasicVer b3 = new EBasicVer("b3"); server.save(b3); @@ -189,7 +189,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { - LoggedSqlCollector.start(); + LoggedSql.start(); txn.setBatchMode(true); EBasicVer b1 = new EBasicVer("b1"); @@ -199,10 +199,10 @@ public class TestBatchInsertFlush extends BaseTestCase { server.save(b2, txn); //flush here - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(3); EBasicVer b3 = new EBasicVer("b3"); server.save(b3, txn); @@ -220,7 +220,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasicVer b1 = new EBasicVer("b1"); b1.setId(78965); @@ -230,11 +230,11 @@ public class TestBatchInsertFlush extends BaseTestCase { b2.setId(78645); server.save(b2); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); // dont flush here Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); EBasicVer b3 = new EBasicVer("b3"); server.save(b3); @@ -248,7 +248,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { - LoggedSqlCollector.start(); + LoggedSql.start(); txn.setBatchMode(true); EBasicVer b1 = new EBasicVer("b1"); @@ -259,17 +259,17 @@ public class TestBatchInsertFlush extends BaseTestCase { b2.setId(21354); server.save(b2, txn); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); //dont flush here Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); EBasicVer b3 = new EBasicVer("b3"); server.save(b3, txn); txn.commit(); - assertThat(LoggedSqlCollector.current()).hasSize(5); + assertThat(LoggedSql.collect()).hasSize(5); } finally { txn.end(); diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 3a8e70543..a4da626c3 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -3,7 +3,7 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; @@ -26,7 +26,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { list.add(bean); } - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = DB.beginTransaction(); try { @@ -39,7 +39,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into o_cached_bean ("); assertThat(loggedSql.get(0)).contains("name) values (?"); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 00307797e..aad2db190 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -41,7 +41,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne()); assertBeanCacheHits(1); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(UUOne.class) .select("id") @@ -55,7 +55,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { } list.get(0).getName(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from uuone t0 where t0.name like "); platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 359ca48e8..182800f35 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,7 +21,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -35,7 +35,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { List details = order.getDetails(); assertEquals(details.size(), 0); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 2)).contains("select t0.id, t0.status, t0.order_date,"); @@ -47,7 +47,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -61,7 +61,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { // normally invokes lazy loading assertNull(order.getCustomer().getStatus()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } @@ -70,7 +70,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -85,7 +85,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { // normally invokes lazy loading assertNull(order.getCustomer().getStatus()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } } diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index c1b5526e8..3814e262e 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -3,7 +3,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -25,7 +25,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -35,7 +35,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(l0).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -51,7 +51,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -62,7 +62,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(l0).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -77,7 +77,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -102,7 +102,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // normally invokes lazy loading order.getShipments().size(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -117,7 +117,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -138,7 +138,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(details).isEmpty(); assertThat(details.size()).isEqualTo(0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -156,7 +156,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { DB.save(tenant); - LoggedSqlCollector.start(); + LoggedSql.start(); Tenant found = DB.find(Tenant.class) .setDisableLazyLoading(true) @@ -166,7 +166,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(found.getRoles().size()).isEqualTo(0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -181,7 +181,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { u.getRoles().put("disableLazyLoading", r0); DB.save(u); - LoggedSqlCollector.start(); + LoggedSql.start(); MpUser found = DB.find(MpUser.class) .setDisableLazyLoading(true) @@ -193,7 +193,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(found.getRoles().size()).isEqualTo(0); // only 1 query ... no lazy loading query - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); DB.deleteAll(Arrays.asList(found, r0)); @@ -204,7 +204,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -225,7 +225,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // normally invokes lazy loading orderDetail.getShipQty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); String originQuery = trimSql(loggedSql.get(0), 5); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 3887aecc0..837341de1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.*; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -19,14 +19,14 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .select("status") .fetchQuery("customer", "name") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0"); @@ -37,7 +37,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchLazy() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.cacheManager().clearAll(); List orders = DB.find(Order.class) @@ -47,7 +47,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { .setUseCache(false) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { @@ -56,14 +56,14 @@ public class TestSecondaryQueries extends TransactionalTestCase { assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0"); } - LoggedSqlCollector.start(); + LoggedSql.start(); // invoke lazy loading for (Order order : orders) { order.getCustomer().getName(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.name from o_customer t0 where t0.id"); platformAssertIn(sql.get(0), " where t0.id"); @@ -72,7 +72,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchIterate() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (QueryIterator orders = DB.find(Order.class).select("status") @@ -84,7 +84,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { orders.next(); // dummy read } } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { @@ -105,12 +105,12 @@ public class TestSecondaryQueries extends TransactionalTestCase { .fetchQuery("contacts") .setId(custId); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer cust = query.findOne(); assertNotNull(cust); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); String generatedSql = query.getGeneratedSql(); assertThat(generatedSql).contains("from o_customer t0 where t0.id = ?"); @@ -133,7 +133,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = query.findList(); assertTrue(!list.isEmpty()); @@ -142,7 +142,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { order.getCustomer().getStatus(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); String generatedSql = sqlOf(query, 2); //select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW) diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java index 7265bebe2..f36936807 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,16 +40,16 @@ public class TestBeanCache extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNotNull(bean2); assertThat(sql).isEmpty(); } @@ -92,7 +92,7 @@ public class TestBeanCache extends BaseTestCase { beanCache.clear(); beanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); log.info("All misses (0 of 3) ..."); List list = DB.find(OCachedBean.class) @@ -102,7 +102,7 @@ public class TestBeanCache extends BaseTestCase { assertThat(list).hasSize(3); assertBeanCacheHitMiss(0, 3); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { assertSql(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)"); @@ -116,7 +116,7 @@ public class TestBeanCache extends BaseTestCase { assertBeanCacheHitMiss(3, 0); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(0); // no misses // remove a bean so that we get a "partial" hit (2 out of 3 in cache) @@ -130,7 +130,7 @@ public class TestBeanCache extends BaseTestCase { assertBeanCacheHitMiss(2, 1); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { // fetch the miss from DB @@ -149,7 +149,7 @@ public class TestBeanCache extends BaseTestCase { assertBeanCacheHitMiss(1, 2); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // fetch the misses from DB diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 232ca0e57..617737c52 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 6d7226323..905af3d8a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; @@ -29,9 +29,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); @@ -41,9 +41,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertEquals(deleted, 1); // expect not to hit the cache, expect SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNull(bean2); assertThat(sql).isNotEmpty(); } @@ -59,9 +59,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); @@ -71,9 +71,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertEquals(updated, 1); // expect not to hit the cache, expect SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNotNull(bean2); assertThat(sql).isNotEmpty(); assertEquals("updatedName", bean2.getName()); diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index bbf3f08d8..c7a45d5e6 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -26,13 +26,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase { loadCustomerBeanCache(); customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer", "status, name") .findList(); - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(1); final ServerCacheStatistics statistics = customerBeanCache.statistics(true); @@ -46,7 +46,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(customer.getStatus()).isNotNull(); } - assertThat(LoggedSqlCollector.stop()).isEmpty(); + assertThat(LoggedSql.stop()).isEmpty(); } private void loadCustomerBeanCache() { @@ -66,13 +66,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase { customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer") .findList(); - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(2); assertThat(sql0.get(0)).contains(" from o_order "); assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id "); @@ -86,7 +86,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(customer.getStatus()).isNotNull(); } - assertThat(LoggedSqlCollector.stop()).isEmpty(); + assertThat(LoggedSql.stop()).isEmpty(); } @Test @@ -100,7 +100,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer") @@ -109,7 +109,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { for (Order order : orders) { assertThat(order.getCustomer().getName()).isNotNull(); } - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(1); final ServerCacheStatistics statistics = customerBeanCache.statistics(true); @@ -124,7 +124,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { } // assert we hit the DB the second time around - final List sql1 = LoggedSqlCollector.stop(); + final List sql1 = LoggedSql.stop(); assertThat(sql1).hasSize(1); assertThat(sql1.get(0)).contains(" from o_customer t0 "); @@ -162,7 +162,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { initDataClearCache(); customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select(fgCachePartial) @@ -173,7 +173,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getMissCount()).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains(" from o_order "); assertSql(sql.get(1)).contains(" from o_customer "); diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index 71ecc925d..f70bc44c7 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.bean.BeanCollection; import io.ebean.cache.ServerCache; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -104,7 +104,7 @@ public class TestQueryCache extends BaseTestCase { new EColAB("04", "count").save(); new EColAB("05", "count").save(); - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -118,20 +118,20 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "count") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(1); // and now, ensure that we hit the database - LoggedSqlCollector.start(); + LoggedSql.start(); int count2 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.OFF) .where() .eq("columnB", "count") .findCount(); assertThat(count2).isEqualTo(count1); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -139,7 +139,7 @@ public class TestQueryCache extends BaseTestCase { public void findCountDifferentQueries() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -153,7 +153,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "def") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(2); // different queries @@ -164,7 +164,7 @@ public class TestQueryCache extends BaseTestCase { public void findCountFirstOnThenRecache() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -178,7 +178,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "uvw") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(2); // try recache as second query - it must fetch it @@ -190,7 +190,7 @@ public class TestQueryCache extends BaseTestCase { public void findCountFirstRecacheThenOn() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.PUT) @@ -204,7 +204,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "xyz") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(1); // try recache as first query - second "ON" query must fetch it. @@ -263,7 +263,7 @@ public class TestQueryCache extends BaseTestCase { new EColAB("04", "someId").save(); new EColAB("05", "someId").save(); - LoggedSqlCollector.start(); + LoggedSql.start(); List colA_first = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -277,20 +277,20 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "someId") .findIds(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(colA_first).isSameAs(colA_second); assertThat(colA_first).hasSize(3); assertThat(sql).hasSize(1); // and now, ensure that we hit the database - LoggedSqlCollector.start(); + LoggedSql.start(); colA_second = DB.find(EColAB.class) .setUseQueryCache(CacheMode.PUT) .where() .eq("columnB", "someId") .findIds(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -311,7 +311,7 @@ public class TestQueryCache extends BaseTestCase { } void differentFindCount(Consumer> q0, Consumer> q1) { - LoggedSqlCollector.start(); + LoggedSql.start(); ExpressionList el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where(); q0.accept(el0); @@ -321,7 +321,7 @@ public class TestQueryCache extends BaseTestCase { q1.accept(el1); el1.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); // different queries } diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index d351a693b..bf23b590f 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheRegion; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ public class PersonCacheTests { addTestData(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(PersonCacheInfo.class) .select("personId") // do not fetch name @@ -70,7 +70,7 @@ public class PersonCacheTests { assertThat(email.getPersonInfo().getName()).isNotNull(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); @@ -91,7 +91,7 @@ public class PersonCacheTests { assertThat(email.getPersonInfo().getName()).isNotNull(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 8cf1bafee..35aad8927 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,10 +45,10 @@ public class TestMultiCascadeBatch extends BaseTestCase { grandparent.setChildren(Collections.singletonList(parent)); parent.setChildren(Collections.singletonList(child)); - LoggedSqlCollector.start(); + LoggedSql.start(); grandparent.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); final List list = DB.find(Site.class).where() .idIn(grandparent.getId(), parent.getId(), child.getId()) diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java index 5757b10e2..f567928e3 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Collections; @@ -22,10 +22,10 @@ public class TestOrderedList extends BaseTestCase { details.add(new OmOrderedDetail("d"+i)); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql.size()).isGreaterThan(1); assertSql(sql.get(0)).contains("insert into om_ordered_master"); boolean hasId = sql.get(1).contains(" (id, name"); @@ -38,14 +38,14 @@ public class TestOrderedList extends BaseTestCase { // update without any changes DB.save(master); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // update just changing master master.setName("m1-mod"); DB.save(master); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?"); @@ -57,12 +57,12 @@ public class TestOrderedList extends BaseTestCase { OmOrderedMaster fresh = DB.find(OmOrderedMaster.class).setId(id).fetch("details").findOne(); List details1 = fresh.getDetails(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("order by t0.id, t1.sort_order"); // fetched, not dirty DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); @@ -76,7 +76,7 @@ public class TestOrderedList extends BaseTestCase { DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?"); assertSql(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?"); @@ -85,7 +85,7 @@ public class TestOrderedList extends BaseTestCase { fresh.setName("m1-mod3"); DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=? where id=? and version=?; -- bind(m1-mod3"); assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?"); @@ -93,7 +93,7 @@ public class TestOrderedList extends BaseTestCase { DB.delete(fresh); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?"); assertSqlBind(sql.get(1)); diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index e2c8ff81f..43ccfd776 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -66,11 +66,11 @@ public class TestPrivateOwned extends BaseTestCase { DB.save(m0); assertThat(m0.getDetails()).hasSize(2); - LoggedSqlCollector.start(); + LoggedSql.start(); m0.getDetails().remove(0); DB.save(m0); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?"); assertSqlBind(loggedSql.get(1)); @@ -78,9 +78,9 @@ public class TestPrivateOwned extends BaseTestCase { TSMaster masterReload = DB.find(TSMaster.class, m0.getId()); assertThat(masterReload.getDetails()).hasSize(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(m0); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(0); } diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java index b67ad2a14..02b03ad73 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java @@ -9,7 +9,7 @@ import io.ebean.annotation.ChangeLog; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPersistRequest; import io.ebean.event.changelog.*; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java index 791bfef69..8986ba8e8 100644 --- a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -75,10 +75,10 @@ public class TestForeignKeyModes extends BaseTestCase { assertThat(found.getOnes()).isNotNull(); assertThat(found.getOnes()).hasSize(0); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(none); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from dfk_none_via_mto_m_dfk_one where dfk_none_via_mto_m_id = ?"); assertSqlBind(sql.get(1)); @@ -118,10 +118,10 @@ public class TestForeignKeyModes extends BaseTestCase { DB.save(one); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(one); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("delete from dfk_cascade_one where id=?"); diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java index 0d33d5e74..828fc2b35 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -2,7 +2,7 @@ package org.tests.defaultvalues; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,9 +21,9 @@ public class TestDefaults extends BaseTestCase { main.getRelatedModels().add(ref); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(main); - final List current = LoggedSqlCollector.current(); + final List current = LoggedSql.collect(); assertThat(current).isNotEmpty(); if (isMySql() || isMariaDB()) { diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index 2f114063e..c1bd19cbb 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -7,7 +7,7 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmarkUser; import org.tests.model.basic.Contact; @@ -34,7 +34,7 @@ public class TestDeleteByQuery extends BaseTestCase { createUser("deleteWithLimit3"); createUser("deleteWithLimit4"); - LoggedSqlCollector.start(); + LoggedSql.start(); final int rows = DB.find(BBookmarkUser.class) .where().startsWith("name", "deleteWithLimit") .setMaxRows(3) @@ -42,7 +42,7 @@ public class TestDeleteByQuery extends BaseTestCase { assertThat(rows).isEqualTo(3); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("delete from bbookmark_user where id in (select top 3 t0.id from bbookmark_user t0 where t0.name like "); } else { @@ -74,20 +74,20 @@ public class TestDeleteByQuery extends BaseTestCase { .where().eq("org.name", "NahYeahMaybe") .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.delete(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 1)).contains("delete from bbookmark_user where id in (select t0.id from bbookmark_user t0 left join bbookmark_org t1 on t1.id = t0.org_id where t1.name"); Query query2 = server.find(BBookmarkUser.class) .where().eq("name", "NotARealFirstName").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query2.delete(); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isPlatformSupportsDeleteTableAlias()) { assertThat(loggedSql.get(0)).contains("delete from bbookmark_user t0 where t0.name ="); @@ -114,19 +114,19 @@ public class TestDeleteByQuery extends BaseTestCase { Query query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.delete(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 1)).contains("select t0.id from contact t0 left join contact_group t1 on t1.id = t0.group_id where t1.name = ?"); Query query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query2.delete(); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("select t0.id from contact t0 where t0.first_name = ?"); @@ -141,12 +141,12 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void queryByIdDelete() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(BBookmarkUser.class).where().eq("id", 7000).delete(); DB.find(BBookmarkUser.class).setId(7000).delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPlatformSupportsDeleteTableAlias()) { assertSql(sql.get(0)).contains("delete from bbookmark_user t0 where t0.id = ?"); assertSql(sql.get(1)).contains("delete from bbookmark_user t0 where t0.id = ?"); @@ -162,12 +162,12 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void queryByIdDelete_withEscalation() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Contact.class).where().eq("id", 7000).delete(); DB.find(Contact.class).setId(7000).delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // escalate to fetch ids then delete ... but no rows found assertSql(sql.get(0)).contains("select t0.id from contact t0 where t0.id = ?"); assertSql(sql.get(1)).contains("select t0.id from contact t0 where t0.id = ?"); @@ -179,7 +179,7 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void queryDelete_withTransactionNoCascade() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setPersistCascade(false); @@ -189,7 +189,7 @@ public class TestDeleteByQuery extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPlatformSupportsDeleteTableAlias()) { assertSql(sql.get(0)).contains("delete from contact t0 where t0.id = ?"); } else if (!isMySql()){ @@ -200,14 +200,14 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void testWithForUpdate() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .where().eq("name", "Don Roberto") .query().forUpdate() .delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { assertSql(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?"); diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index 787de2bd9..1b24ee419 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -2,7 +2,7 @@ package org.tests.delete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -23,10 +23,10 @@ public class TestDeleteCascadeWithListener extends BaseTestCase { DcMaster found = DB.find(DcMaster.class, m0.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?"); diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index 2d78a94b3..fd6f0f0f3 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; @@ -34,12 +34,12 @@ public class DocLinkTest extends BaseTestCase { assertThat(link).isNotNull(); - LoggedSqlCollector.start(); + LoggedSql.start(); // no lazy loading is invoked as draft property considered @Transient assertThat(link.isDraft()).isFalse(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).isEmpty(); } diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index c5d3f5560..f3e26c876 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -8,7 +8,7 @@ import io.ebean.Transaction; import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 587d935d2..228e3ed47 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.AnimalShelter; @@ -61,12 +61,12 @@ public class TestInheritanceOnMany extends BaseTestCase { dog.setRegistrationNumber("D2"); DB.save(dog); - LoggedSqlCollector.start(); + LoggedSql.start(); // Dog is concrete so we return as Dog even though // it could be a BigDog (so we are trusting the caller) Dog ref = DB.reference(Dog.class, dog.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertNotNull(ref); @@ -82,10 +82,10 @@ public class TestInheritanceOnMany extends BaseTestCase { bd.setRegistrationNumber("BG2"); DB.save(bd); - LoggedSqlCollector.start(); + LoggedSql.start(); BigDog bigDog = DB.reference(BigDog.class, bd.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertNotNull(bigDog); @@ -93,11 +93,11 @@ public class TestInheritanceOnMany extends BaseTestCase { assertEquals("BG2", bigDog.getRegistrationNumber()); - LoggedSqlCollector.start(); + LoggedSql.start(); // Animal is abstract so we hit the DB Animal animal = DB.reference(Animal.class, bd.getId()); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(trimSql(sql.get(0), 2)).contains("select t0.species, t0.id from animal t0 where t0.id = ?"); assertNotNull(animal); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index 12adeea1a..e6d7d7dc9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -2,8 +2,8 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; @@ -30,9 +30,9 @@ public class TestInheritanceOrderColumn extends BaseTestCase { master.getReferenced().add(orderedA); master.getReferenced().add(orderedB); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); // Some platforms insert ids and others don't need to... assertSql(trimId(sql, 1)) @@ -53,7 +53,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase { LoggedSql.start(); DB.save(result); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index 6d566ab24..dec3ecb53 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; @@ -27,7 +27,7 @@ public class TestInheritanceQuery extends BaseTestCase { server().save(b2); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Parent.class); @@ -46,7 +46,7 @@ public class TestInheritanceQuery extends BaseTestCase { query2 = DB.find(Parent.class).setInheritType(ChildB.class); assertThat(query2.findList()).contains(b1, b2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(1)).contains("where t0.type = 'A'"); assertSql(sql.get(2)).contains("where t0.type = 'B'"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 8774b3fef..33e1afe81 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; @@ -25,15 +25,15 @@ public class TestInheritanceRefBean extends BaseTestCase { Parent test; - LoggedSqlCollector.start(); + LoggedSql.start(); test = server().reference(ChildA.class, idA); assertTrue(test instanceof ChildA); - assertEquals(0, LoggedSqlCollector.stop().size()); + assertEquals(0, LoggedSql.stop().size()); - LoggedSqlCollector.start(); + LoggedSql.start(); test = server().reference(Parent.class, idB); assertTrue(test instanceof ChildB); - assertEquals(1, LoggedSqlCollector.stop().size()); + assertEquals(1, LoggedSql.stop().size()); } diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index 70ddcd518..40c75b695 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -74,7 +74,7 @@ public class TestInheritanceBothSides extends BaseTestCase { private void assertFetchAllSourceAs() { - LoggedSqlCollector.start(); + LoggedSql.start(); final List sourceAList = DB.find(SourceA.class) .fetch("target", "name") @@ -87,7 +87,7 @@ public class TestInheritanceBothSides extends BaseTestCase { assertThat(joinedNames).isEqualTo("|source a|target 1|source a2|target 1b"); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t1.dtype, t1.id, t1.name from source_base t0 left join target_base t1 on t1.id = t0.target_id and t1.dtype = 'Target1' where t0.dtype = 'SourceA' order by t0.pos"); } @@ -97,7 +97,7 @@ public class TestInheritanceBothSides extends BaseTestCase { */ private void assertFetchAllDoubleLazyLoading() { - LoggedSqlCollector.start(); + LoggedSql.start(); final List sources = DB.find(SourceBase.class).order("pos").findList(); for (SourceBase source : sources) { @@ -113,7 +113,7 @@ public class TestInheritanceBothSides extends BaseTestCase { } } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); //assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t0.target_id, t0.target_id from source_base t0 order by t0.pos"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index a306bfa65..d341db918 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -2,7 +2,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRef; @@ -33,32 +33,32 @@ public class TestInheritanceRefCache extends BaseTestCase { Integer id = ref.getId(); - LoggedSqlCollector.start(); + LoggedSql.start(); CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root"); // fetch again - from cache (but fetch second bean from cache) - LoggedSqlCollector.start(); + LoggedSql.start(); gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); // fetch again - both from cache - LoggedSqlCollector.start(); + LoggedSql.start(); gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } @@ -84,11 +84,11 @@ public class TestInheritanceRefCache extends BaseTestCase { ids.add(two.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from cinh_root"); @@ -97,11 +97,11 @@ public class TestInheritanceRefCache extends BaseTestCase { DB.find(CInhRoot.class).setUseQueryCache(true).findList(); DB.find(CInhRoot.class).setUseQueryCache(true).findList(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } diff --git a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java index effd778e5..b33391c5b 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -20,11 +20,11 @@ public class TestOnlyIdEntity extends BaseTestCase { final Database database = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); OnlyIdEntity bean = new OnlyIdEntity(); database.save(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(bean.getId()).isGreaterThan(0); assertThat(sql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index 405bca390..fb2af986b 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.carwheel.Car; import org.tests.model.carwheel.Tire; @@ -71,7 +71,7 @@ public class TestCarWheelIud extends BaseTestCase { DB.saveAll(asList(car0, car1, car2)); - LoggedSqlCollector.start(); + LoggedSql.start(); final PagedList pagedList = DB.find(Car.class) .select("brand, totalSold") @@ -84,7 +84,7 @@ public class TestCarWheelIud extends BaseTestCase { assertThat(list).hasSize(2); assertThat(count).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { assertSql(sql.get(0)).contains("select t0.brand, sum(t0.sold) from sa_car t0 group by t0.brand limit 10"); diff --git a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java index 0cd2bcda1..6aeaa4a37 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java @@ -2,7 +2,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,10 +21,10 @@ public class TestPersistCascade extends BaseTestCase { country.addCity(new PcfCity("city_" + ModUUID.newShortId(), mayor, viceMayor)); } - LoggedSqlCollector.start(); + LoggedSql.start(); country.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("insert into pcf_country"); diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 0a4bd2022..7fd2ee8ce 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -8,7 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson3; import org.tests.model.json.EBasicJsonList; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 7f2a6a0db..984cf4454 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.text.TextException; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; @@ -102,9 +102,9 @@ public class TestDbJson_List extends BaseTestCase { private void update_when_notDirty() { found.setName("mod"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=?, no longer included with dirty detection @@ -118,9 +118,9 @@ public class TestDbJson_List extends BaseTestCase { //found.setName("modAgain"); found.getTags().add("three"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included using MD5 dirty detection @@ -132,9 +132,9 @@ public class TestDbJson_List extends BaseTestCase { //found.setName("modAgain"); found.getFlags().remove(42L); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included with MD5 dirty detection @@ -148,9 +148,9 @@ public class TestDbJson_List extends BaseTestCase { found.getBeanList().clear(); found.getBeanMap().remove("key0"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included with MD5 dirty detection diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index fd10d9e99..ffbe90185 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.text.json.EJson; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.tests.model.json.EBasicJsonMap; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMapDetail; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index d3aabecd4..76baa16fa 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.DB; import io.ebean.Query; import io.ebean.text.PathProperties; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public class TestLazyForeignKeys extends BaseTestCase { @Test public void testFindOne() throws Exception { // use findOne without select, so lazy loading will occur - LoggedSqlCollector.start(); + LoggedSql.start(); MainEntityRelation rel1 = DB.find(MainEntityRelation.class).findOne(); @@ -55,7 +55,7 @@ public class TestLazyForeignKeys extends BaseTestCase { assertFalse(rel1.getEntity1().isDeleted()); assertTrue(rel1.getEntity2().isDeleted()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation"); if (isSqlServer() || isOracle()) { diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index 995641642..415f56c97 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.MnocRole; @@ -43,10 +43,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { List validRoles = loadedUser.getValidRoles(); assertThat(validRoles).hasSize(2); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(u0); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertSql(sql.get(1)).contains("delete from mnoc_user where user_id=? and version=?"); @@ -71,10 +71,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { user.setUserName("usr1-mod"); user.setValidRoles(roles); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.update(user); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("update mnoc_user set user_name=?, version=? where user_id=? and version=?"); assertSql(sql.get(1)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); @@ -97,7 +97,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { DB.save(u0); DB.save(u1); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -106,7 +106,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { txn.commit(); } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertThat(sql.get(4)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index cf10919f7..cf10512cd 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java index 438281e38..5ab159089 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; @@ -44,11 +44,11 @@ public class TestMergeBasic extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(one, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // fetch the Ids ... used to identity inserts, updates and deletes assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?"); @@ -92,11 +92,11 @@ public class TestMergeBasic extends BaseTestCase { .addPath("comments") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(one, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // fetch the Ids ... used to identity inserts, updates and deletes assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?"); diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index f02a45874..655537e4b 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -6,7 +6,7 @@ import io.ebean.FetchPath; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import io.ebean.text.PathProperties; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -26,11 +26,11 @@ public class TestMergeCustomer extends BaseTestCase { MCustomer mCustomer = partial("cust1", "(id,name,version)"); mCustomer.setName("NotCust0"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(mCustomer); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?"); } @@ -48,11 +48,11 @@ public class TestMergeCustomer extends BaseTestCase { MergeOptions options = new MergeOptionsBuilder().build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?"); } @@ -66,11 +66,11 @@ public class TestMergeCustomer extends BaseTestCase { MergeOptions options = new MergeOptionsBuilder().setClientGeneratedIds().build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id from mcustomer t0 where t0.id = ?"); assertSql(sql.get(1)).contains("update mcustomer set name=?, version=? where id=? and version=?"); @@ -90,11 +90,11 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); @@ -119,11 +119,11 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(1)).contains("insert into maddress (id, street, city, version) values (?,?,?,?)"); @@ -152,11 +152,11 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() // As we are using clientIds ... we don't know if the new UUID is an insert or update without checking .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); @@ -210,10 +210,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(20); } @@ -236,10 +236,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(20); } @@ -274,10 +274,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(16); assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?"); @@ -314,10 +314,10 @@ public class TestMergeCustomer extends BaseTestCase { .setDeletePermanent() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(cust1, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id left join mcontact t2 on t2.customer_id = t0.id where t0.id = ?"); diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java index 69b442d25..4974bfae1 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -35,11 +35,11 @@ public class TestMergeM2M extends BaseTestCase { MergeOptions options = new MergeOptionsBuilder().addPath("groups").build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(m0, options); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select"); @@ -65,7 +65,7 @@ public class TestMergeM2M extends BaseTestCase { DB.merge(m1, options); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("select"); assertSql(sql.get(1)).contains("delete from mmachine_mgroup"); diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index b2b778e6a..9660d7530 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -2,7 +2,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,7 +16,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -29,7 +29,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.organisation_id from dmachine t0 where t0.organisation_id = ?"); @@ -46,7 +46,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -60,7 +60,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, t1.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name, t1.name order by t0.id"); @@ -71,7 +71,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -86,7 +86,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name order by t0.id"); diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index 3199bc005..950ba1588 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -3,7 +3,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,11 +42,11 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("totalKms", 1) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { @@ -136,12 +136,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t1.id, t1.name having sum(t0.hours) > ?"); } @@ -156,12 +156,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t0.edate, t1.id, t1.name having sum(t0.hours) > ?"); } @@ -176,12 +176,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.machine_id having sum(t0.hours) > ?"); @@ -198,12 +198,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.edate, t0.machine_id having sum(t0.hours) > ?"); @@ -226,7 +226,7 @@ public class TestAggregationTopLevel extends BaseTestCase { @Test public void groupBy_in_fetchClause_singleRowInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(DMachine.class) .select("name") @@ -238,7 +238,7 @@ public class TestAggregationTopLevel extends BaseTestCase { assertThat(result).isNotEmpty(); assertThat(result.get(0).getMachineStats().get(0).getTotalKms()).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(sqlOf(query)).contains("select t0.id, t0.name, sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name order by t0.id"); @@ -247,7 +247,7 @@ public class TestAggregationTopLevel extends BaseTestCase { @Test public void groupBy_in_fetchClause_multipleRowsInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(DMachine.class) .select("name") @@ -264,7 +264,7 @@ public class TestAggregationTopLevel extends BaseTestCase { assertThat(firstStat.getRate()).isNotNull(); assertThat(firstStat.getDate()).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(sqlOf(query)).contains("select t0.id, t0.name, t1.edate, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name, t1.edate order by t0.id"); diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index cc4eb48ba..6b62e6255 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.HashSet; @@ -108,9 +108,9 @@ public class TestDbArray_asSet extends BaseTestCase { public void update_when_notDirty() { found.setName("jack"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) assertSql(sql.get(0)).contains("update earray_set_bean set name=?, version=? where"); @@ -122,9 +122,9 @@ public class TestDbArray_asSet extends BaseTestCase { found.getPhoneNumbers().add("9987"); found.getUids().add(UUID.randomUUID()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where"); } diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index bdd88410e..0a9f7ffb7 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -7,7 +7,7 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.SQLException; @@ -142,9 +142,9 @@ public class TestDbArray_basic extends BaseTestCase { public void update_when_notDirty() { found.setName("jack"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) assertSql(sql.get(0)).contains("update earray_bean set name=?, version=? where"); @@ -156,9 +156,9 @@ public class TestDbArray_basic extends BaseTestCase { found.getPhoneNumbers().add("9987"); found.getUids().add(UUID.randomUUID()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update earray_bean set phone_numbers=?, uids=?, version=? where"); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 672333318..5bfaa970d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,7 +95,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = Arrays.asList("1", "2", "3"); - LoggedSqlCollector.start(); + LoggedSql.start(); log.info("Partial (2 of 3) ..."); List list = DB.find(OCachedNatKeyBean.class) @@ -106,7 +106,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2) @@ -125,7 +125,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(list).hasSize(3); assertThat(sql).hasSize(0); @@ -144,7 +144,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(list).hasSize(3); assertThat(sql).hasSize(1); @@ -164,7 +164,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = new ArrayList<>(Arrays.asList("1", "2")); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean.class) .where() @@ -174,7 +174,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // no SQL - all beans from cache assertThat(sql).isEmpty(); @@ -193,7 +193,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = new ArrayList<>(Arrays.asList("3", "4")); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean.class) .where() @@ -203,7 +203,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with 2 bind params as we got not hits on the cache diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 10861e417..3e058676b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -7,7 +7,7 @@ import io.ebean.Pairs; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -100,7 +100,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001); - LoggedSqlCollector.start(); + LoggedSql.start(); Map list = DB.find(OCachedNatKeyBean3.class) .where() @@ -112,7 +112,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("sku") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertThat(list).hasSize(1); @@ -129,7 +129,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001, 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); Map list = DB.find(OCachedNatKeyBean3.class) .where() @@ -141,7 +141,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("sku") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - miss on 1000 @@ -158,7 +158,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { setup(); - LoggedSqlCollector.start(); + LoggedSql.start(); Map map = DB.find(OCachedNatKeyBean3.class) .where() @@ -169,7 +169,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("code") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - miss on 1000, 1002 @@ -190,7 +190,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001, 1000, 1002, 1003); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -202,7 +202,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order().asc("code") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2) @@ -223,7 +223,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List skus = asList("2", "3"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -234,7 +234,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // no SQL - all beans from cache assertThat(sql).isEmpty(); @@ -253,7 +253,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { String storeId = "abc"; List skus = asList("3", "2", "4"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -264,7 +264,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with 2 bind params as we got not hits on the cache @@ -349,7 +349,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .add("2", 1001) .add("3", 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -359,7 +359,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(pairs.getEntries()).hasSize(3); @@ -392,7 +392,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .add("2", 1001) .add("3", 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -402,7 +402,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(pairs.getEntries()).hasSize(3); diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 4673cbac7..0f4a902c3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index ca1c71f7d..674b060c4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -3,7 +3,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -37,12 +37,12 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { resetAllMetrics(); - LoggedSqlCollector.start(); + LoggedSql.start(); final OCachedAppDetail found1 = findDetail(app0, "detail0"); assertThat(found1).isNotNull(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(1); } @@ -67,11 +67,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { assertThat(result0).hasSize(2); assertThat(getStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); final List result1 = findListDetails(app0, "detail0", "detail1"); assertThat(result1).hasSize(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(2); } @@ -96,11 +96,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { assertThat(result0).hasSize(2); assertThat(getStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); final List result1 = findListApps("detail0", app0, app1); assertThat(result1).hasSize(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(2); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index 53aedd28a..ba6a16ac2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -3,7 +3,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -55,12 +55,12 @@ public class TestNatKeyUid extends BaseTestCase { assertThat(result).hasSize(2); assertThat(appStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); result = findMany(); assertThat(result).hasSize(2); assertThat(appStats().getHitCount()).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected hit cache, no sql").isEmpty(); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index be128fbbc..aec8a8e39 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -21,7 +21,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -38,23 +38,23 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { DB.save(parent); // nothing flushed yet - assertThat(LoggedSqlCollector.start()).isEmpty(); + assertThat(LoggedSql.start()).isEmpty(); txn.flush(); - List loggedSql1 = LoggedSqlCollector.start(); + List loggedSql1 = LoggedSql.start(); assertThat(loggedSql1).hasSize(4); parent.setName("MyDesk"); DB.save(parent); // nothing flushed yet - assertThat(LoggedSqlCollector.start()).isEmpty(); + assertThat(LoggedSql.start()).isEmpty(); DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql2 = LoggedSqlCollector.start(); + List loggedSql2 = LoggedSql.start(); assertThat(loggedSql2).hasSize(2); assertThat(loggedSql2.get(0)).contains(" update td_parent "); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index 5d9473b91..ba3a75ffb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -19,11 +19,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EdParent parent = new EdParent(); parent.setName("MyComputer"); @@ -47,7 +47,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(6); assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(2)).contains("insert into td_child "); @@ -60,11 +60,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void test_noFlushOn_getterOfNonGeneratedProperty() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EdParent parent = new EdParent(); parent.setName("MyComputer"); @@ -90,7 +90,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(2)).contains("insert into td_child "); diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index ff8996562..5f1e23178 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -19,7 +19,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void testDifferRootTypes() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -47,7 +47,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { extendedParent.setChildren(children); // nothing flushed yet - List loggedSql0 = LoggedSqlCollector.start(); + List loggedSql0 = LoggedSql.start(); assertEquals(0, loggedSql0.size()); // does not causes a flush as EdExtendedParent is same root as EdParent @@ -55,14 +55,14 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { DB.save(extendedParent); // insert statements for EdParent - List loggedSql1 = LoggedSqlCollector.start(); + List loggedSql1 = LoggedSql.start(); DB.commitTransaction(); assertEquals(0, loggedSql1.size()); // insert statements for EdExtendedParent - List loggedSql2 = LoggedSqlCollector.start(); + List loggedSql2 = LoggedSql.start(); assertEquals(7, loggedSql2.size()); } diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index d27f5155c..0b0520dca 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -96,7 +96,7 @@ public class TestIdClassScalar extends BaseTestCase { */ private void insertUpdateBridgeD(BUser user, BSite site) { - LoggedSqlCollector.start(); + LoggedSql.start(); BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id); DB.save(access); @@ -112,7 +112,7 @@ public class TestIdClassScalar extends BaseTestCase { assertThat(bridge.getUserId()).isEqualTo(user.id); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into bsite_user_d (site_id, user_id, access_level, version) values (?,?,?,?)"); assertSql(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?"); @@ -129,7 +129,7 @@ public class TestIdClassScalar extends BaseTestCase { one.setAccessLevel(BAccessLevel.THREE); DB.save(one); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id=? and t0.user_id=?"); @@ -141,7 +141,7 @@ public class TestIdClassScalar extends BaseTestCase { */ private void insertUpdateBridgeE(BUser user, BSite site) { - LoggedSqlCollector.start(); + LoggedSql.start(); BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user); DB.save(access); @@ -152,7 +152,7 @@ public class TestIdClassScalar extends BaseTestCase { List list = DB.find(BSiteUserE.class).findList(); assertThat(list).isNotEmpty(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into bsite_user_e (site_id, user_id, access_level)"); assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?"); @@ -175,7 +175,7 @@ public class TestIdClassScalar extends BaseTestCase { one.setAccessLevel(BAccessLevel.THREE); DB.save(one); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id=? and t0.user_id=?"); diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index f5253f69a..772d12c5b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 030898a62..81a13c894 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,7 +16,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase { final TTruckHolder holder = setup(); - LoggedSqlCollector.start(); + LoggedSql.start(); final TTruckHolder found = DB.find(TTruckHolder.class) .fetch("items") @@ -27,7 +27,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase { assertThat(found.getItems()).hasSize(2); assertThat(found.getItems()).extracting(TTruckHolderItem::getFoo).contains("a","b"); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2() || isPostgres()) { diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 8ff610d9f..57b3bf6d8 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -2,7 +2,7 @@ package org.tests.model.composite; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,7 +29,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase { client.setClientPK(new CkeClientKey(20, "susan")); client.setUser(user1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(client); @@ -38,7 +38,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase { DB.save(client); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index 19f250680..3627b50b5 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -4,7 +4,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,11 +25,11 @@ public class EcmPersonTest extends BaseTestCase { final EcmPerson person = json.toBean(EcmPerson.class, asJson); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecm_person "); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index ac815b67b..4b027fe06 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class EcsPersonTest extends BaseTestCase { final EcsPerson person = json.toBean(EcsPerson.class, asJson); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecs_person "); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 1c49afe79..b214a3381 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -23,10 +23,10 @@ public class TestElementCollectionBasic extends BaseTestCase { person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(eventLog()).containsOnly("preInsert", "postInsert"); assertThat(sql).hasSize(4); @@ -37,7 +37,7 @@ public class TestElementCollectionBasic extends BaseTestCase { found.getPhoneNumbers().size(); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from ec_person t0 where t0.id = ?"); assertSql(sql.get(1)).contains("from ec_person_phone t0 where"); @@ -45,7 +45,7 @@ public class TestElementCollectionBasic extends BaseTestCase { // save when not actually changed DB.save(found); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertThat(eventLog()).isEmpty(); } @@ -54,7 +54,7 @@ public class TestElementCollectionBasic extends BaseTestCase { public void test() { eventLog(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcPerson person = new EcPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); @@ -63,7 +63,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(eventLog()).containsExactly("preInsert", "postInsert"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ec_person"); @@ -83,7 +83,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(eventLog()).containsExactly("preInsert", "postInsert"); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcPerson.class).where() @@ -98,7 +98,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ec_person t0 where"); assertSql(sql.get(1)).contains("select t0.owner_id, t0.phone from ec_person_phone t0 where"); @@ -113,7 +113,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ec_person t0 left join ec_person_phone t1"); @@ -122,7 +122,7 @@ public class TestElementCollectionBasic extends BaseTestCase { jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcPerson bean) { @@ -130,7 +130,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ec_person"); @@ -148,7 +148,7 @@ public class TestElementCollectionBasic extends BaseTestCase { txn.commit(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("update ec_person"); @@ -163,7 +163,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.getPhoneNumbers().add("01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); @@ -196,7 +196,7 @@ public class TestElementCollectionBasic extends BaseTestCase { txn.commit(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(2)).contains("delete from ec_person_phone where owner_id=?"); @@ -213,7 +213,7 @@ public class TestElementCollectionBasic extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); assertThat(eventLog()).isEmpty(); @@ -230,7 +230,7 @@ public class TestElementCollectionBasic extends BaseTestCase { txn.commit(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSqlBind(sql, 1); @@ -247,7 +247,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.getPhoneNumbers().add("01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); @@ -275,7 +275,7 @@ public class TestElementCollectionBasic extends BaseTestCase { DB.delete(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id = ?"); assertSql(sql.get(1)).contains("delete from ec_person where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 550b229e5..3f1e463f1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -27,7 +27,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { one.getPhoneNumbers().size(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcPerson two = DB.find(EcPerson.class) .setId(person.getId()) @@ -36,12 +36,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase { two.setName("CacheMod"); two.getPhoneNumbers().add("027 234234"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit containing phone numbers DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSqlBind(sql, 4, 6); @@ -51,7 +51,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // no change EcPerson three = DB.find(EcPerson.class) @@ -61,13 +61,13 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit three.getPhoneNumbers().add("09 6534"); DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); // cache hit } else { @@ -82,12 +82,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(four.getName()).isEqualTo("CacheMod"); assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit DB.delete(four); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Override diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 6101352c3..366ad5570 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.HashMap; @@ -16,14 +16,14 @@ public class TestElementCollectionBasicMap extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcmPerson person = new EcmPerson("MFiona021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecm_person"); @@ -42,7 +42,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { person1.getPhoneNumbers().put("mob", "09 9876"); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcmPerson.class).where() @@ -61,7 +61,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { assertThat(phoneNumbers1).containsValues("09 1234", "09 4321", "09 9876"); assertThat(phoneNumbers1.get("mob")).isEqualTo("09 9876"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecm_person t0 where"); assertSql(sql.get(1)).contains("select t0.ecm_person_id, t0.type, t0.phnum from ecm_person_phone_numbers t0 where"); @@ -76,7 +76,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.type, t1.phnum from ecm_person t0 left join ecm_person_phone_numbers t1"); @@ -84,7 +84,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcmPerson bean) { @@ -92,7 +92,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecm_person"); @@ -105,7 +105,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.getPhoneNumbers().put("one", "01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?"); @@ -129,7 +129,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -140,7 +140,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.getPhoneNumbers().put("two", "01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?"); @@ -163,7 +163,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { DB.delete(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id = ?"); assertSql(sql.get(1)).contains("delete from ecm_person where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index fd04106c1..af02d2a26 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,14 +14,14 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcmcPerson person = new EcmcPerson("Lob021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecmc_person"); @@ -34,7 +34,7 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase { assertSql(sql.get(2)).contains("insert into ecmc_person_phone"); } - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 4d570f80b..3d6eee18f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,7 +29,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { one.getPhoneNumbers().size(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcmPerson two = DB.find(EcmPerson.class) .setId(person.getId()) @@ -38,12 +38,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { two.setName("CacheMod"); two.getPhoneNumbers().put("mob", "027 234234"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit containing phone numbers DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSqlBind(sql, 4, 6); @@ -53,7 +53,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // no change EcmPerson three = DB.find(EcmPerson.class) @@ -63,7 +63,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit three.getPhoneNumbers().put("oth", "09 6534"); @@ -71,7 +71,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { three.getPhoneNumbers().remove("work"); DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // cache hit assertSqlBind(sql, 3, 4); @@ -88,12 +88,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { assertThat(four.getPhoneNumbers().toString()).contains("027 234234", "09 6534"); assertThat(four.getPhoneNumbers()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit DB.delete(four); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Override diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 4b43b702a..3f3f8342d 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -15,14 +15,14 @@ public class TestElementCollectionBasicSet extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcsPerson person = new EcsPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecs_person"); @@ -41,7 +41,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { person1.getPhoneNumbers().add("09 9876"); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcsPerson.class).where() @@ -56,7 +56,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecs_person t0 where"); assertSql(sql.get(1)).contains("select t0.ecs_person_id, t0.phone from ecs_person_phone t0 where"); @@ -71,7 +71,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ecs_person t0 left join ecs_person_phone t1"); @@ -80,7 +80,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcsPerson bean) { @@ -88,7 +88,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecs_person"); @@ -101,7 +101,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.getPhoneNumbers().add("01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?"); @@ -125,7 +125,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -136,7 +136,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.getPhoneNumbers().add("01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?"); @@ -159,7 +159,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { DB.delete(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id = ?"); assertSql(sql.get(1)).contains("delete from ecs_person where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 4569132f8..0278dd465 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class TestElementCollectionCascadeMultiple extends BaseTestCase { top.setPerson(person); top.getPeople().add(person); - LoggedSqlCollector.start(); + LoggedSql.start(); save(top); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("insert into ecs_person"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 923ba37af..1c19069c6 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,14 +14,14 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcblPerson person = new EcblPerson("Fiona64021"); person.getPhoneNumbers().add(new EcPhone("64", "021", "1234")); person.getPhoneNumbers().add(new EcPhone("64", "021", "4321")); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecbl_person"); @@ -39,7 +39,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { person1.getPhoneNumbers().add(new EcPhone("64", "09", "4321")); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcblPerson.class).where() @@ -54,7 +54,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { assertThat(phoneNumbers0.toString()).contains("64-021-1234", "64-021-4321"); assertThat(phoneNumbers1.toString()).contains("61-09-1234", "64-09-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecbl_person"); assertSql(sql.get(1)).contains("select t0.person_id, t0.country_code, t0.area, t0.phnum from ecbl_person_phone_numbers"); @@ -69,7 +69,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); String trimmedSql = trimSql(sql.get(0)); assertThat(trimmedSql).contains("select t0.id, t0.name, t0.version, t1.country_code, t1.area, t1.phnum from ecbl_person t0 left join ecbl_person_phone_numbers t1"); @@ -80,7 +80,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcblPerson bean) { @@ -88,7 +88,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.setName("Fiona64-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecbl_person"); @@ -101,7 +101,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.getPhoneNumbers().add(new EcPhone("01", "234", "123")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?"); @@ -125,7 +125,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -136,7 +136,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); @@ -159,7 +159,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { DB.delete(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id = ?"); assertSql(sql.get(1)).contains("delete from ecbl_person where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 59ec71e0d..f3ec4b24b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { .fetch("phoneNumbers") .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); one.getPhoneNumbers().size(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); EcblPerson two = DB.find(EcblPerson.class) @@ -38,7 +38,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { two.getPhoneNumbers().size(); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit two.getPhoneNumbers().add(new EcPhone("61", "07", "11")); @@ -46,7 +46,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // update of collection only assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); @@ -67,7 +67,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-1234"); assertThat(three.getPhoneNumbers()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit @@ -76,7 +76,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(5); EcblPerson four = DB.find(EcblPerson.class) @@ -88,10 +88,10 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.delete(four); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index 4b88410de..18912a254 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -15,14 +15,14 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcbmPerson person = new EcbmPerson("Fiona64021"); person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234")); person.getPhoneNumbers().put("work", new EcPhone("64","021","4321")); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecbm_person"); @@ -41,7 +41,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcbmPerson.class).where() @@ -67,13 +67,13 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { assertThat(found2).hasSize(2); EcbmPerson foundFirst = found2.get(0); - LoggedSqlCollector.current(); + LoggedSql.collect(); jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcbmPerson bean) { @@ -81,7 +81,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.setName("Fiona64-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecbm_person"); @@ -94,7 +94,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.getPhoneNumbers().put("more", new EcPhone("01", "234", "123")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?"); @@ -117,7 +117,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -128,7 +128,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); @@ -151,7 +151,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { DB.delete(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id = ?"); assertSql(sql.get(1)).contains("delete from ecbm_person where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 8ee32aac9..3c1802e78 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,11 +25,11 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { .fetch("phoneNumbers") .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); one.getPhoneNumbers().size(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); EcbmPerson two = DB.find(EcbmPerson.class) @@ -39,7 +39,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { two.getPhoneNumbers().size(); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11")); @@ -47,7 +47,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // update of collection only assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); @@ -69,7 +69,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-4321"); assertThat(three.getPhoneNumbers()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit @@ -78,7 +78,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(5); EcbmPerson four = DB.find(EcbmPerson.class) @@ -90,10 +90,10 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.delete(four); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 3daa0894f..fe1c32cb4 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -2,7 +2,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -17,10 +17,10 @@ public class TestEmbeddedAttrOverride extends BaseTestCase { PrimaryRevision bean = new PrimaryRevision(100); bean.setName("hello"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("insert into primary_revision (id, revision, name, version) values (?,?,?,?)"); } diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 4bfbe840d..02859e645 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; @@ -37,7 +37,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { DB.save(perAddr); - LoggedSqlCollector.start(); + LoggedSql.start(); EPerAddr found = DB.find(EPerAddr.class, perAddr.getId()); @@ -45,7 +45,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { assertThat(found.getAddress().getCountry().getName()).startsWith("New"); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2()) { diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index 10773c52e..e76cd7714 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -6,7 +6,7 @@ import io.ebean.ValuePair; import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -33,13 +33,13 @@ public class TestHistoryEmbeddedId extends BaseTestCase { assertNotNull(found); assertThat(found.getName()).isEqualTo("notTen"); - LoggedSqlCollector.start(); + LoggedSql.start(); final List> versions = DB.find(HEmbiBean.class) .setId(id) .findVersions(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(versions).hasSize(2); final Map diff = versions.get(0).getDiff(); diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index 2ccd4d03c..42a214988 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.Timestamp; @@ -40,7 +40,7 @@ public class TestHistoryOneToMany extends BaseTestCase { DB.save(one); Thread.sleep(20); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(HiTOne.class) .fetch("twos") @@ -50,7 +50,7 @@ public class TestHistoryOneToMany extends BaseTestCase { .asOf(new Timestamp(System.currentTimeMillis())) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(list).hasSize(1); assertThat(list.get(0).getTwos()).hasSize(2); diff --git a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index c9241ab47..e84d82dc3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -2,7 +2,7 @@ package org.tests.model.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 48680f619..62e5e64a7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; /** * Tests M2M with complex where queries. diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 8a7b6702f..8d7d33e66 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -38,13 +38,13 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { assertThat(one).isNotNull(); - LoggedSqlCollector.start(); + LoggedSql.start(); OtoBChild child1 = one.getChild(); assertThat(child1).isNotNull(); assertThat(child1.getChild()).isEqualTo("c1"); - List lazyLoadSql = LoggedSqlCollector.stop(); + List lazyLoadSql = LoggedSql.stop(); assertThat(lazyLoadSql).hasSize(2); assertSql(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t0.id from oto_bmaster t0 where t0.id = ?"); assertSql(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id = ?"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index 34ecf0879..15d390821 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,12 +16,12 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { account.setName("AC234"); account.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.byId(account.getId()); assertNotNull(fetchedAccount); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); 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 @@ -47,7 +47,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { user.setAccount(account); user.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.byId(account.getId()); assertNotNull(fetchedAccount); @@ -56,7 +56,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { assertEquals(user.getId(), fetchedAccount.getUser().getId()); assertEquals(user.getName(), fetchedAccount.getUser().getName()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); 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 @@ -85,7 +85,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { user.setAccount(account); user.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.query().fetch("user").setId(account.getId()).findOne(); assertNotNull(fetchedAccount); @@ -94,7 +94,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { assertEquals(user.getId(), fetchedAccount.getUser().getId()); assertEquals(user.getName(), fetchedAccount.getUser().getName()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); 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 diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 9d96c4ace..01b3cca80 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -30,10 +30,10 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { jack.setAddress(address2); // Fail do to uniqueness constraint - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(jack); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); @@ -44,7 +44,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { jack.setAddress(null); DB.save(jack); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 78f35ec05..14051b5e4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -20,11 +20,11 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { OtoAone a = new OtoAone("a1", "a test"); b.setAone(a); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(b); - List update = LoggedSqlCollector.current(); + List update = LoggedSql.collect(); assertThat(update).hasSize(3); assertThat(update.get(0)).contains("insert into oto_aone"); assertSqlBind(update.get(1)); @@ -32,7 +32,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); @@ -46,11 +46,11 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { b.setAone(a); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(b); - List inserts = LoggedSqlCollector.current(); + List inserts = LoggedSql.collect(); assertThat(inserts).hasSize(3); assertThat(inserts.get(0)).contains("insert into oto_aone"); assertSqlBind(inserts.get(1)); @@ -58,7 +58,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); @@ -75,13 +75,13 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.save(b); - LoggedSqlCollector.start(); + LoggedSql.start(); OtoAone a2 = new OtoAone("a4", "a test"); b.setAone(a2); DB.save(b); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into oto_aone"); assertSqlBind(sql.get(1)); @@ -91,7 +91,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 3ca354606..6662c5033 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -72,10 +72,10 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { OtoPrime bean = DB.find(OtoPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_prime_extra where"); assertSql(sql.get(1)).contains("delete from oto_prime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index 770f671d4..b010f5b4b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -71,10 +71,10 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { OtoUBPrime bean = DB.find(OtoUBPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_ubprime_extra where"); assertSql(sql.get(1)).contains("delete from oto_ubprime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 9e80ba467..0ea4c16d1 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -94,10 +94,10 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { OtoUPrime bean = DB.find(OtoUPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_uprime_extra where"); assertSql(sql.get(1)).contains("delete from oto_uprime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index 77e835ffc..c4612e613 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -21,11 +21,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a1"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(Cover.class, cover.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id = ?"); @@ -54,11 +54,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { cover1.setDeleted(false); - LoggedSqlCollector.start(); + LoggedSql.start(); cover1.update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update cover set deleted=? where id=?; -- bind(false"); @@ -74,11 +74,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a1"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.getDefault().delete(Cover.class, cover.getId(), null); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id = ?"); @@ -94,11 +94,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a2"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.getDefault().deletePermanent(Cover.class, cover.getId(), null); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("delete from cover where id = ?"); } @@ -109,11 +109,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id "); @@ -128,14 +128,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAll(Cover.class, ids(beans), transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id"); @@ -150,11 +150,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -165,11 +165,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -181,14 +181,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAllPermanent(Cover.class, ids(beans), transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -199,11 +199,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -218,11 +218,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -238,14 +238,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAll(beans, transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -261,11 +261,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from cover where id=?"); } @@ -276,14 +276,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAllPermanent(beans, transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from cover where id=?"); } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 9f96fa221..98c4acbe7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,14 +25,14 @@ public class TestOneToOneHardDelete extends BaseTestCase { Album found1 = Album.find.byId(album.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); // --------------------- // SOFT DELETE // --------------------- found1.delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); // assert we loaded the missing/unloaded foreign key assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.cover_id from album t0 where t0.id = ?"); @@ -42,14 +42,14 @@ public class TestOneToOneHardDelete extends BaseTestCase { Album found2 = Album.find.query().setId(album.getId()).setIncludeSoftDeletes().findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); // --------------------- // HARD DELETE // --------------------- found2.deletePermanent(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); // assert we loaded the missing/unloaded foreign key assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.cover_id from album t0 where t0.id = ?"); diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index c7c63156d..d888f0c62 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -22,10 +22,10 @@ public class TestOrphanRemoveO2M extends BaseTestCase { master.getDetails().clear(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(DB.find(OrpDetail.class, "d1")).isNull(); assertThat(DB.find(OrpDetail.class, "d2")).isNull(); diff --git a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java index ecfff5430..b133061c6 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java @@ -1,7 +1,7 @@ package org.tests.model.site; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,10 +21,10 @@ public class TestTreeModel extends BaseTestCase { grandparent.setChildren(singletonList(parent)); parent.setChildren(singletonList(child)); - LoggedSqlCollector.start(); + LoggedSql.start(); grandparent.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into tree_entity"); assertSql(sql.get(1)).contains("insert into tree_entity"); diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index 9505d9d50..47e2eff50 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -2,7 +2,7 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -22,7 +22,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase { account.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); final OmAccountDBO found = DB.find(OmAccountDBO.class) .where().eq("name", "one") @@ -35,7 +35,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase { assertSame(found, child.getBananaRama()); } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(1)).contains("select t0.banana_rama_id, t0.id, t0.description, t0.banana_rama_id from om_account_child_dbo t0 where"); } diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 66ec5e744..5e63429b3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -2,7 +2,7 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 3a3a158a4..0d035fbd5 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -2,7 +2,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -27,7 +27,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { initialInsert(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make m0 dirty ... but no cascade saved? m0.setFoodPreference("banana"); @@ -36,7 +36,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { DB.save(troop); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)"); @@ -54,7 +54,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(intersectionRows).isEqualTo(2L); - LoggedSqlCollector.current(); + LoggedSql.collect(); JtTroop fetchTroop = DB.find(JtTroop.class) .fetch("monkeys") .where().idEq(troop.getPid()) @@ -62,14 +62,14 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(fetchTroop.getMonkeys()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from troop t0 left join troop_monkey t1z_ on t1z_.troop_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?"); assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version"); DB.delete(troop); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from troop_monkey where troop_pid = ?"); assertSql(sql.get(1)).contains("delete from troop where pid=? and version=?"); @@ -90,10 +90,10 @@ public class TestOneToManyJoinTable extends BaseTestCase { trainer.getMonkeys().add(new JtMonkey("FBet")); trainer.getMonkeys().add(new JtMonkey("FThe")); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(trainer); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(13); @@ -123,10 +123,10 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(intersectionRows).isEqualTo(5); - LoggedSqlCollector.current(); + LoggedSql.collect(); DB.delete(trainer); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from trainer_monkey where trainer_tid = ?"); assertSql(sql.get(1)).contains("delete from trainer where tid=?"); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index e1cdd2ba8..eb22888d3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; import org.tests.o2m.jointable.inheritance.ClassB; @@ -30,11 +30,11 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase { classA.getMonkeys().add(m1); classB.getMonkeys().add(m2); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(Arrays.asList(classA, classB)); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(11); assertSql(sql.get(0)).contains("insert into class_super "); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 7578f4f98..e86bd344c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -3,7 +3,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -28,7 +28,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { initialInsert(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make m0 dirty ... but no cascade saved? m0.setFoodPreference("camera"); @@ -37,7 +37,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { DB.save(troop); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)"); @@ -55,7 +55,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertThat(intersectionRows).isEqualTo(2); - LoggedSqlCollector.current(); + LoggedSql.collect(); JtMonkeyGroup fetchTroop = DB.find(JtMonkeyGroup.class) .fetch("monkeys") .where().idEq(troop.getPid()) @@ -63,14 +63,14 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertThat(fetchTroop.getMonkeys()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from mkeygroup t0 left join mkeygroup_monkey t1z_ on t1z_.mkeygroup_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?"); assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version"); DB.delete(troop); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from mkeygroup_monkey where mkeygroup_pid = ?"); assertSql(sql.get(1)).contains("delete from mkeygroup where pid=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index a95572545..5621d4ce8 100644 --- a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -2,7 +2,7 @@ package org.tests.o2o; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,13 +24,13 @@ public class TestOneToOneSaveWithoutChanges { OtoLevelB dbB = dbA.getB(); OtoLevelC dbC = dbB.getC(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(dbA); DB.save(dbB); DB.save(dbC); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } } diff --git a/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java index 9c4e53fcb..abc70c061 100644 --- a/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -2,7 +2,7 @@ package org.tests.o2o; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.update.EPersonOnline; @@ -17,12 +17,12 @@ public class TestReferenceSave { DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EPersonOnline bean = DB.reference(EPersonOnline.class, 1L); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); } } diff --git a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java index 5926bfbbe..e6604035d 100644 --- a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java @@ -2,7 +2,7 @@ package org.tests.order; import io.ebean.DB; import io.ebean.TransactionalTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Comparator; @@ -97,9 +97,9 @@ public class TestOrderColumn extends TransactionalTestCase { children.get(1).getToys().get(0).setTitle("tt10"); children.get(3).getToys().get(2).setTitle("tt32"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(result); - final List sql = LoggedSqlCollector.current(); + final List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update order_toy set title=?, sort_order=? where id=?"); @@ -134,9 +134,9 @@ public class TestOrderColumn extends TransactionalTestCase { child.getToys().remove(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(result); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from order_toy where id=?"); diff --git a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 4bc6e2ad3..c3c5fb7c0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -22,14 +22,14 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(3) .order().asc("id") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.id"); @@ -41,13 +41,13 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setMaxRows(10) .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -61,7 +61,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(3) @@ -69,7 +69,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .order().asc("id") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.id"); @@ -80,7 +80,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // maxRows 1 with no first rows means Ebean does not automatically // add the order by id to the query @@ -88,7 +88,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .setMaxRows(1) .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("order by t0.id"); @@ -99,7 +99,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); PagedList pagedList = DB.find(Order.class) @@ -108,7 +108,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { pagedList.getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -121,7 +121,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(10) @@ -130,7 +130,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -144,7 +144,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .order().asc("orderDate") @@ -152,7 +152,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.order_date"); @@ -163,7 +163,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .order().asc("orderDate") @@ -172,7 +172,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.order_date, t0.id desc"); diff --git a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java index 1b7aa0578..d1834ddc0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java index 51c5844f3..2f5a32b28 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -21,7 +21,7 @@ public class TestQueryBaseTable extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer one = DB.find(Customer.class) .setBaseTable("O_CUSTOMER") @@ -40,7 +40,7 @@ public class TestQueryBaseTable extends BaseTestCase { assertThat(one.getName()).isEqualTo(two.getName()); assertThat(three.getName()).isEqualTo("Fiona"); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("from O_CUSTOMER"); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java index a83fb6d83..e52212207 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index edc07ee04..004b58021 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; @@ -30,11 +30,11 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("orders.details"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertTrue(!list.isEmpty()); String mainSql = sqlOf(query); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index 3babba0f6..967efb9ba 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -24,7 +24,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer customer = DB.find(Customer.class) .fetchLazy("orders") @@ -36,7 +36,7 @@ public class TestQueryFilterMany extends BaseTestCase { final int size = customer.getOrders().size(); assertThat(size).isGreaterThan(0); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(1)).contains("status = ?"); @@ -50,7 +50,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -60,7 +60,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); assertThat(sqlList.get(1)).contains("status = ?"); @@ -78,7 +78,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -91,7 +91,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); @@ -110,7 +110,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -121,7 +121,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); assertThat(sqlList.get(1)).contains("status = ?"); @@ -168,7 +168,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .filterMany("orders").raw("1=0") @@ -180,7 +180,7 @@ public class TestQueryFilterMany extends BaseTestCase { assertThat(customer.getOrders()).isEmpty(); } - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and 1=0 order by t0.id"); } @@ -190,7 +190,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetch("orders") @@ -199,7 +199,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.findCount(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("select count(*) from o_customer"); } @@ -208,7 +208,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void test_filterMany_copy_findList() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetch("orders") @@ -217,7 +217,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.copy().findList(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status "); if (isPostgres()) { @@ -231,7 +231,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void test_filterMany_fetchQuery() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetchQuery("orders") // explicitly fetch orders separately @@ -240,7 +240,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.findList(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0"); if (isPostgres()) { @@ -256,7 +256,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void testDisjunction() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .filterMany("orders") @@ -265,7 +265,7 @@ public class TestQueryFilterMany extends BaseTestCase { .eq("orderDate", LocalDate.now()) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.status = ? or t1.order_date = ?) order by t0.id"); } @@ -274,13 +274,13 @@ public class TestQueryFilterMany extends BaseTestCase { public void testNestedFilterMany() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .filterMany("contacts").isNotNull("firstName") .filterMany("contacts.notes").istartsWith("title", "foo") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where t1.first_name is not null order by t0.id; --bind()"); @@ -292,14 +292,14 @@ public class TestQueryFilterMany extends BaseTestCase { public void testFilterManyUsingExpression() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .where() .filterMany("contacts", "firstName isNotNull and email istartsWith ?", "rob") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index f1de21cfc..0af842ade 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,13 +127,13 @@ public class TestQueryFindEach extends BaseTestCase { PersistenceContext pc = spiTxn.getPersistenceContext(); assertThat(pc.size(Customer.class)).isEqualTo(customerList.size()); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findEach(contact -> { // use customer from persistence context (otherwise would invoke lazy loading) assertNotNull(contact.getCustomer().getName()); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } } @@ -170,7 +170,7 @@ public class TestQueryFindEach extends BaseTestCase { test_setLazyLoadBatchSize_withFetchLazy(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(OmBasicChild.class) .setLazyLoadBatchSize(100) @@ -178,13 +178,13 @@ public class TestQueryFindEach extends BaseTestCase { assertNotNull(child.getParent().getName()); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql.size()).isLessThan(50); } private void test_setLazyLoadBatchSize_withFetchLazy() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(OmBasicParent.class) .setLazyLoadBatchSize(5) @@ -194,7 +194,7 @@ public class TestQueryFindEach extends BaseTestCase { it.getChildren().size(); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(11); assertThat(sql.get(0)).contains(" from om_basic_parent "); for (int i = 1; i < 11; i++) { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index 2a514f985..fa884feb2 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -119,7 +119,7 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setLazyLoadBatchSize(10) @@ -135,7 +135,7 @@ public class TestQueryFindIterate extends BaseTestCase { }); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(3, loggedSql.size()); assertTrue(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name from o_order t0 join o_customer t1")); @@ -148,7 +148,7 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make sure we don't hit the L2 cache for order shipments DB.cacheManager().clear(Order.class); @@ -170,7 +170,7 @@ public class TestQueryFindIterate extends BaseTestCase { order.getShipments().size(); }); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(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")); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index eea920c75..e9e4637db 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; import org.assertj.core.util.Lists; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -23,13 +23,13 @@ public class TestQueryFindNative extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); String sql = "select id,first_name from contact where id in(:ids)"; DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList(); DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); if (isH2()) { assertThat(loggedSql.get(0)).contains("(?,?,?)"); @@ -43,7 +43,7 @@ public class TestQueryFindNative extends BaseTestCase { ResetBasicData.reset(); String sql = "select n.id from contact n where n.first_name like ?"; - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCount = server() .findNative(Contact.class, sql) @@ -56,7 +56,7 @@ public class TestQueryFindNative extends BaseTestCase { .setParameter(1, "J%") .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(nativeIds).hasSize(rowCount); @@ -77,12 +77,12 @@ public class TestQueryFindNative extends BaseTestCase { .setMaxRows(100) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); int listSize = pagedList.getList().size(); int totalCount = pagedList.getTotalCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(listSize).isEqualTo(totalCount); @@ -204,7 +204,7 @@ public class TestQueryFindNative extends BaseTestCase { "from o_customer " + "order by order_column_1"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .setParameter(LocalDate.now()) @@ -214,7 +214,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1"); @@ -231,7 +231,7 @@ public class TestQueryFindNative extends BaseTestCase { "from o_customer " + "order by order_column_1"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .setParameter("date", LocalDate.now()) @@ -240,7 +240,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1"); @@ -255,14 +255,14 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetchQuery("contacts") .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(2); @@ -278,14 +278,14 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetch("contacts", "firstName, lastName") .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(2); @@ -301,7 +301,7 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetchQuery("orders") @@ -309,7 +309,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(3); @@ -326,7 +326,7 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) // with nativeSql fetch (default) are converted to fetchQuery() @@ -335,7 +335,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(3); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 823997ee8..580f821dc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -49,12 +49,12 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(4) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = pagedList.getList(); assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); } @@ -157,12 +157,12 @@ public class TestQueryFindPagedList extends BaseTestCase { PagedList pagedList = DB.find(Order.class).setMaxRows(4).findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = pagedList.getList(); assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); } @@ -211,7 +211,7 @@ public class TestQueryFindPagedList extends BaseTestCase { PagedList pagedList = DB.find(Order.class).setMaxRows(3).findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); // kinda not normal but just wrap in a transaction to assert // the background fetch does not occur (which explicitly creates @@ -225,7 +225,7 @@ public class TestQueryFindPagedList extends BaseTestCase { // invoke it again but cached... int totalRowCountAgain = pagedList.getTotalCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(orders.size() < totalRowCount); assertEquals(2, loggedSql.size()); @@ -253,12 +253,12 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(6) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); pagedList.getTotalCount(); pagedList.getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select count(*) from o_order b where b.id > 0"); diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index 8b28bc9e8..255bf18d3 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -7,7 +7,7 @@ import io.ebean.Expr; import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -153,7 +153,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .select("name").where().rawOrEmpty("name = any(?)", asList("Rob", "Fiona", "Jack")) @@ -167,7 +167,7 @@ public class TestWhereRawClause extends BaseTestCase { .select("name").where().rawOrEmpty("name = any(?)", null) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where t0.name = any(?);"); assertThat(sql.get(1)).contains("select t0.id, t0.name from o_customer t0; --bind()"); diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index a8508db65..f60686f3d 100644 --- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -3,8 +3,7 @@ package org.tests.query.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebeantest.LoggedSql; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; @@ -64,7 +63,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int count = DB.find(TEventOne.class) @@ -73,7 +72,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(count).isGreaterThan(1); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*) from tevent_one t0 where t0.name is not null"); } @@ -238,7 +237,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(sql).contains("having max(t0.version) >= ?"); - LoggedSqlCollector.start(); + LoggedSql.start(); for (TEventOne eventOne : list) { assertThat(eventOne.getStatus()).isNotNull(); @@ -250,7 +249,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(eventOne.getName()).isNull(); } - List lazyLoadSql = LoggedSqlCollector.stop(); + List lazyLoadSql = LoggedSql.stop(); assertThat(lazyLoadSql).isEmpty(); } @@ -375,7 +374,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); String maxLastName = DB.find(Contact.class) @@ -385,7 +384,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(maxLastName).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select max(t0.last_name) from contact t0"); } @@ -394,7 +393,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Long count = DB.find(Contact.class) @@ -404,7 +403,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(count).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)"); } @@ -413,7 +412,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List names = @@ -425,7 +424,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(names).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null order by t0.last_name"); } @@ -434,7 +433,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List names = @@ -446,7 +445,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(names).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select " + concat("t0.updtime",", ","t0.first_name") + " from contact t0"); } @@ -455,7 +454,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Instant instant = @@ -466,7 +465,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(instant).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null"); } @@ -476,7 +475,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = @@ -493,7 +492,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(lastName).contains(", "); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null order by t0.last_name; --bind()"); } diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 3bdff89b4..af7d6cdf0 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -10,7 +10,7 @@ import io.ebean.meta.QueryPlanInit; import io.ebean.meta.QueryPlanRequest; import io.ebean.meta.ServerMetrics; import io.ebean.meta.SortMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -107,14 +107,14 @@ public class TestCustomerFinder extends BaseTestCase { try { Customer.find.currentTransaction().setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasic b = new EBasic("junk"); DB.save(b); - assertTrue(LoggedSqlCollector.current().isEmpty()); + assertTrue(LoggedSql.collect().isEmpty()); Customer.find.flush(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basic"); } finally { transaction.end(); diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index 52750e354..c67d875a1 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -3,7 +3,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("id, status, orderDate") @@ -29,7 +29,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertTrue(loggedSql.get(0).contains("select distinct ")); assertTrue(loggedSql.get(0).contains(" from o_order t0 join o_order_detail u1 on u1.order_id = t0.id ")); diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index fbf8e8798..079b41d0f 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -2,7 +2,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -26,14 +26,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderIds = DB.find(Order.class) .where().eq("totalItems", 3) .findIds(); assertThat(orderIds).hasSize(2); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); } @@ -41,14 +41,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindList() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .where().eq("totalItems", 3) .findList(); assertThat(orders).hasSize(2); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); } @@ -56,14 +56,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); int orders = DB.find(Order.class) .where().eq("totalItems", 3) .findCount(); assertThat(orders).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,"); assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,"); @@ -72,7 +72,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindCount_multiFormula() { - LoggedSqlCollector.start(); + LoggedSql.start(); int orders = DB.find(Order.class) .where() @@ -82,7 +82,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { assertThat(orders).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,"); } @@ -90,7 +90,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindSingleAttributeList() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderDates = DB.find(Order.class) .select("orderDate") @@ -98,7 +98,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .findSingleAttributeList(); assertThat(orderDates).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); assertSql(sql.get(0)).contains("select t0.order_date from o_order t0"); @@ -107,7 +107,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindOne() { - LoggedSqlCollector.start(); + LoggedSql.start(); Order order = DB.find(Order.class) .select("totalItems") @@ -118,7 +118,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { assertThat(order.getTotalItems()).isEqualTo(3); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,"); if (isSqlServer()) { @@ -131,13 +131,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderIds = DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)"); } @@ -145,7 +145,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindList() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .select("identifier") @@ -153,7 +153,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .where().eq("familyName", "foo") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select t0.identifier from parent_person t0 where t0.family_name = ?"); } @@ -161,13 +161,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?)"); assertSql(sql.get(0)).contains("select count(*) from ( select t0.identifier from parent_person t0 left join (select i2.parent_identifier, count(*) as child_count"); @@ -176,14 +176,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindSingleAttributeList() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .select("address") .where().eq("totalAge", 3) .findSingleAttributeList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select t0.address from parent_person t0 left join (select i2.parent_identifier"); assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)"); @@ -192,7 +192,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindOne() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .where().eq("totalAge", 3) @@ -200,7 +200,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .orderById(true) .findOne(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ? order by t0.identifier"); } @@ -208,13 +208,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ChildPersonParentFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select t0.identifier from child_person t0 left join (select i2.parent_identifier"); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?"); @@ -223,13 +223,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ChildPersonParentFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier"); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?"); diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 2afad5bfe..f88d014f9 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -33,7 +33,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkWithLazyLoadingOnBuiltInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Order.class); @@ -47,7 +47,7 @@ public class TestOrderByWithMany extends BaseTestCase { } // first one is the main query and others are lazy loading queries - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(loggedSql.size() > 1); String lazyLoadSql = loggedSql.get(1); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index feacd3e2e..9ea1847a1 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; @@ -52,7 +52,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { assertThat(generatedSql).contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?)"); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); // select count(*) from ( @@ -62,7 +62,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) // ); --bind(1,true,1,true) - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); String countSql = trimSql(loggedSql.get(0), 0); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index b7f38538c..1d9b592ac 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,10 +25,10 @@ public class TestQueryRawExpressionMany extends BaseTestCase { .where().raw("details.orderQty = ?", quantity) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id and t1.id > 0 where t1.order_qty = ?)"); } diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 6ef74b43a..54740de23 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Long productId = 1L; @@ -64,7 +64,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase { // u1.product_id = ? // ); --bind(1) - List sqlLogged = LoggedSqlCollector.stop(); + List sqlLogged = LoggedSql.stop(); assertEquals(list.size(), rowCount); assertEquals(2, sqlLogged.size()); @@ -89,10 +89,10 @@ public class TestQueryRowCountWithMany extends BaseTestCase { .orderBy("cretime asc") .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sqlLogged = LoggedSqlCollector.stop(); + List sqlLogged = LoggedSql.stop(); assertEquals(1, sqlLogged.size()); assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id = ?)"); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 3b26ea15f..0f52d3dac 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -21,13 +21,13 @@ public class TestWhereAnnotation extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .fetch("orders") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); @@ -42,7 +42,7 @@ public class TestWhereAnnotation extends BaseTestCase { DB.cacheManager().clearAll(); - LoggedSqlCollector.start(); + LoggedSql.start(); List customers = DB.find(Customer.class) .order().asc("id") @@ -52,7 +52,7 @@ public class TestWhereAnnotation extends BaseTestCase { assertThat(orders.size()).isGreaterThan(0); orders.get(0).getStatus(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(1)).contains("t0.order_date is not null"); diff --git a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 9f85d5563..01cc7a627 100644 --- a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -3,7 +3,7 @@ package org.tests.query.softdelete; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.TransactionalTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; @@ -25,7 +25,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase { DB.saveAll(list); DB.delete(list.get(1)); - LoggedSqlCollector.start(); + LoggedSql.start(); PagedList pagedList = DB.find(Cover.class) .where().startsWith("s3Url", "SoftDelPaged-") @@ -35,7 +35,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase { int totalRowCount = pagedList.getTotalCount(); List resultList = pagedList.getList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(resultList).hasSize(2); assertThat(totalRowCount).isEqualTo(2); diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 0312b3282..3daf1a4f5 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -8,7 +8,7 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -297,10 +297,10 @@ public class SqlQueryTests extends BaseTestCase { sqlQuery.setFirstRow(3); sqlQuery.setMaxRows(10); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { // FIXME: we should order by primary key ALWAYS (not by first column) when no @@ -325,9 +325,9 @@ public class SqlQueryTests extends BaseTestCase { SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id"); sqlQuery.setFirstRow(3); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("Select * from o_order order by id offset 3"); } @@ -341,9 +341,9 @@ public class SqlQueryTests extends BaseTestCase { SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id"); sqlQuery.setMaxRows(10); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("Select * from o_order order by id offset 0 rows fetch next 10 rows only;"); @@ -367,9 +367,9 @@ public class SqlQueryTests extends BaseTestCase { .setLabel("findList-3-10"); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("select * from o_order where o_order.id > ? order by id offset 0 rows fetch next 10 rows only;"); @@ -393,9 +393,9 @@ public class SqlQueryTests extends BaseTestCase { .setMaxRows(10) .setLabel("findEach-Max10Rows"); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findEach(bean -> bean.get("id")); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("offset 0 rows fetch next 10 rows only"); diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 70e6a086d..ae8ca158e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -10,7 +10,7 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -45,9 +45,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { assertNotNull(list); // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); assertThat(query.findCount()).isEqualTo(list.size()); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select r.id, r.name from o_customer r"); assertThat(sql.get(0)).doesNotContain("order by"); } @@ -161,9 +161,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o"); assertThat(sql.get(0)).doesNotContain("order by"); } @@ -196,9 +196,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o"); assertThat(sql.get(0)).doesNotContain("order by"); } diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index dac2ee7ae..978902d6d 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql; import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -161,20 +161,20 @@ public class TestNativeSqlBasic extends BaseTestCase { List orders = DB.findNative(Order.class, nativeSql) .findList(); - LoggedSqlCollector.start(); + LoggedSql.start(); for (Order order : orders) { order.getStatus(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); for (Order order : orders) { order.getCustomer().getName(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains(" from o_customer t0 where "); } diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 5b5f82b8c..991f66724 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; @@ -35,7 +35,7 @@ public class TestNativeWithEmbedded extends BaseTestCase { String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean, jraw from eperson where id = ?"; - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.findNative(EPerson.class, sql); query.setParameter(person.getId()); @@ -46,7 +46,7 @@ public class TestNativeWithEmbedded extends BaseTestCase { assertThat(one.getAddress().getJbean().getName()).isEqualTo("hi"); assertThat(one.getAddress().getJraw().get("a")).isEqualTo("1"); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } } diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 87ab6de65..66682b272 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -11,7 +11,7 @@ import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.event.readaudit.ReadAuditQueryPlan; import io.ebean.event.readaudit.ReadEvent; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -169,7 +169,7 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = server.find(EBasicChangeLog.class) .setUseQueryCache(true) @@ -192,7 +192,7 @@ public class TestReadAudit extends BaseTestCase { System.out.println("test_findList_useL2Cache> second query " + list1.size()); assertThat(list1).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); System.out.println("test_findList_useL2Cache> sql: " + sql); //assertThat(sql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index f3ce1f658..e454438cc 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.SqlQuery; import io.ebean.SqlRow; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; @@ -36,11 +36,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { assertThat(bean.getVersion()).isEqualTo(1); assertThat(bean.getChildren().get(0).getVersion()).isEqualTo(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); -// List loggedSql = LoggedSqlCollector.stop(); +// List loggedSql = LoggedSql.stop(); // // assertEquals(new Long(2), bean.getVersion()); // assertEquals(new Long(2), bean.getChildren().get(0).getVersion()); // Fails with 1 @@ -65,20 +65,20 @@ public class TestSoftDeleteBasic extends BaseTestCase { bean.setName("findSingleAttribute"); DB.save(bean); - LoggedSqlCollector.start(); + LoggedSql.start(); final String name0 = DB.find(EBasicSoftDelete.class) .select("name") .where().eq("name", "findSingleAttribute") .findSingleAttribute(); - List sql0 = LoggedSqlCollector.current(); + List sql0 = LoggedSql.collect(); assertThat(sql0.get(0)).contains("where t0.name = ? and t0.deleted ="); assertThat(name0).isEqualTo("findSingleAttribute"); // now soft delete the bean DB.delete(bean); - List sqlUpdate = LoggedSqlCollector.current(); + List sqlUpdate = LoggedSql.collect(); assertThat(sqlUpdate.get(0)).contains("update ebasic_sdchild set"); // use setIncludeSoftDeletes @@ -88,7 +88,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { .setIncludeSoftDeletes() .findSingleAttribute(); - List sql1 = LoggedSqlCollector.current(); + List sql1 = LoggedSql.collect(); assertThat(sql1.get(0)).doesNotContain(" and t0.deleted ="); assertThat(name1).isEqualTo("findSingleAttribute"); @@ -99,7 +99,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { .where().eq("name", "findSingleAttribute") .findSingleAttribute(); - List sql2 = LoggedSqlCollector.stop(); + List sql2 = LoggedSql.stop(); assertThat(sql2.get(0)).contains(" and t0.deleted ="); assertThat(name2).isNull(); } @@ -116,7 +116,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.save(bean); DB.delete(bean.getChildren().get(0)); - LoggedSqlCollector.start(); + LoggedSql.start(); List ids = DB.find(EBasicSDChild.class).where().eq("owner", bean).findIds(); assertThat(ids).hasSize(2); @@ -124,7 +124,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { List beans = DB.find(EBasicSDChild.class).where().eq("owner", bean).findList(); assertThat(beans).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ? and t0.deleted = "); @@ -336,10 +336,10 @@ public class TestSoftDeleteBasic extends BaseTestCase { // -- test .findCount() - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCountAfter = DB.find(EBasicSoftDelete.class).findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("where t0.deleted ="); @@ -347,11 +347,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { // -- test includeSoftDeletes().findCount() - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCountFull = DB.find(EBasicSoftDelete.class).setIncludeSoftDeletes().findCount(); assertThat(rowCountFull).isGreaterThan(rowCountAfter); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("where coalesce(t0.deleted,false)=false"); } @@ -369,11 +369,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { .setId(bean.getId()) .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(partial); // check lazy loading isn't invoked (deleted set to true without invoking lazy loading) - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("update ebasic_sdchild set deleted="); assertThat(loggedSql.get(1)).contains("update ebasic_soft_delete set deleted=? where id=?"); @@ -392,11 +392,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.save(bean); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); // The children without SoftDelete are left as is (so no third statement) assertThat(loggedSql).hasSize(2); @@ -426,7 +426,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.delete(bean.getChildren().get(1)); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query1 = DB.find(EBasicSoftDelete.class) diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index ab2f2bdbd..1fd0d7091 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,10 +29,10 @@ public class TestSoftDeleteManyToMany extends BaseTestCase { DB.save(user1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(user1); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); // No Delete from the relationship table assertThat(loggedSql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 9ae327ca5..1a275dc60 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { DB.save(y); } - LoggedSqlCollector.start(); + LoggedSql.start(); Finder finder = new Finder<>(ESoftDelY.class); ESoftDelY bean = finder @@ -58,7 +58,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { assertThat(bean).isNotNull(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer() || isMySql() || isMariaDB()) { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where"); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index 81720abc0..d150d9712 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -2,7 +2,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelOneA; import org.tests.model.softdelete.ESoftDelOneB; @@ -24,13 +24,13 @@ public class TestSoftDeleteOtoCascade extends BaseTestCase { DB.save(a); - LoggedSqlCollector.start(); + LoggedSql.start(); // delete doesn't cascade to ESoftDelOneB as this is a // soft delete and ESoftDelOneB doesn't have soft delete flag DB.delete(a); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update esoft_del_one_a set deleted=?, version=? where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index 616481f6c..a8d548ebe 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -2,7 +2,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EsdDetail; import org.tests.model.softdelete.EsdMaster; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 2c5978b17..6b58c8486 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyTopic; @@ -45,7 +45,7 @@ public class TestBatchModelFlush extends BaseTestCase { @Test public void multipleTopLevel_expect_singleFlush() { - LoggedSqlCollector.start(); + LoggedSql.start(); // 2 unrelated "top level" beans being persisted MnyB m0 = new MnyB("BatchMultipleTop_0"); @@ -70,7 +70,7 @@ public class TestBatchModelFlush extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // DEBUG io.ebean.SUM - txn[1001] BatchControl flush [MnyB:100 i:2, Role:101 i:2, MnyTopic:102 i:2] diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index bd0cb17d8..7f575924a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -6,7 +6,7 @@ import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ public class TestBatchPersistCascade extends BaseTestCase { Database ebeanServer = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = ebeanServer.beginTransaction(); try { @@ -48,7 +48,7 @@ public class TestBatchPersistCascade extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(loggedSql.size() > 2); diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index fc173c957..d533dcdfb 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,11 +40,11 @@ public class TestBeanStateReset extends BaseTestCase { DB.beanState(b).resetForInsert(); b.getCs().clear(); - LoggedSqlCollector.start(); + LoggedSql.start(); b.setName("mod"); b.save(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into mny_b (id, name, version, when_created, when_modified, a_id) values ("); } diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index a48ec72ec..fab0b3eb3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -39,10 +39,10 @@ public class TestTransactionSkipCache extends BaseTestCase { try { transaction.setSkipCache(true); - LoggedSqlCollector.start(); + LoggedSql.start(); findUseQueryCache(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).as("We didn't use the L2 query cache").hasSize(1); } finally { diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 8251fa024..44adc4e48 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -4,7 +4,7 @@ import io.ebean.*; import io.ebean.annotation.*; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index 3dd2da5f7..a9ce5d365 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -52,9 +52,9 @@ public class TestHstore extends BaseTestCase { EBasicHstore found = DB.find(EBasicHstore.class, bean.getId()); found.setName("modName"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the map as it is not dirty assertSql(sql.get(0)).contains("update ebasic_hstore set name=?, version=? where"); @@ -66,9 +66,9 @@ public class TestHstore extends BaseTestCase { found.setName("modNamePlus"); found.getMap().put("foo", "9987"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update ebasic_hstore set name=?, map=?, version=? where id=? and version=?"); } diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index 94dd7a2dc..1c05bed7f 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,7 +18,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); SqlUpdate sqlUpdate = DB.sqlUpdate("delete from o_customer where id in (:ids)"); @@ -31,7 +31,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase { sqlUpdate.execute(); assertEquals("delete from o_customer where id in (?,?)", sqlUpdate.getGeneratedSql()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); } diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index 73fc6d8db..13d72c689 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.meta.MetaTimedMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; @@ -43,7 +43,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { @Test public void testExecute_inTransaction_withBatch() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(true); @@ -61,7 +61,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?"); assertSqlBind(sql, 1, 2); @@ -70,7 +70,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { @Test public void testExecute_inTransaction_withoutBatch() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(false); @@ -88,7 +88,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?; -- bind(999999)"); assertSql(sql.get(1)).contains("update audit_log set description = description where id = ?; -- bind(999998)"); diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index 5cc110bae..ab60472c9 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -2,7 +2,7 @@ package org.tests.update; import io.ebean.DB; import io.ebean.TransactionalTestCase; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index c852c335b..416e6f974 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -33,7 +33,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.setUpdateAllLoadedProperties(true); - LoggedSqlCollector.start(); + LoggedSql.start(); basic2.setDescription("bbb-mod"); server.save(basic2, txn); @@ -44,7 +44,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.commit(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); // all properties in the bean @@ -70,7 +70,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { assertEquals(2, beans.size()); - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = DB.beginTransaction(); @@ -92,7 +92,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; -- bind("); diff --git a/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory b/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory deleted file mode 100644 index e4a925737..000000000 --- a/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory +++ /dev/null @@ -1 +0,0 @@ -io.ebeantest.CapturingLoggerFactory From 7a327cb6446f7f9796fdb669c93b4945aeb63a31 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 11:29:05 +1200 Subject: [PATCH 089/102] #2361 - Tidy tests only, organise imports --- .../src/test/java/io/ebean/DbPrimaryTest.java | 4 +-- .../EbeanServerFactory_MultiTenancy_Test.java | 7 +---- .../io/ebean/EbeanServer_deleteByIdTest.java | 2 +- .../java/io/ebean/EbeanServer_deleteTest.java | 2 +- .../java/io/ebean/ExtendedServerTest.java | 1 - .../src/test/java/io/ebean/PropertyTest.java | 1 - .../test/java/io/ebean/StringHelperTest.java | 5 +--- .../java/io/ebean/TestDirtyProperties.java | 2 +- .../java/io/ebean/TextExpressionListTest.java | 3 +-- .../ebean/bean/EntityBeanInterceptTest.java | 2 +- .../io/ebean/config/DatabaseConfigTest.java | 5 +--- .../ebean/config/DbMigrationConfigTest.java | 3 ++- .../io/ebean/config/DocStoreConfigTest.java | 4 +-- .../java/io/ebean/config/TestTableName.java | 1 - .../ebean/event/BeanFindControllerTest.java | 5 +--- .../java/io/ebean/event/BeanPostLoadTest.java | 6 +---- .../test/java/io/ebean/json/EJsonTests.java | 13 +++------ .../java/io/ebean/plugin/BeanTypeTest.java | 8 +----- .../java/io/ebean/plugin/PropertyTest.java | 2 +- .../java/io/ebean/plugin/SpiServerTest.java | 8 ++---- .../test/java/io/ebean/test/DbJsonTest.java | 2 +- .../src/test/java/io/ebean/test/JsonTest.java | 2 +- .../java/io/ebean/test/UserContextTest.java | 3 ++- .../io/ebean/text/PathPropertiesTests.java | 4 +-- .../ebean/text/json/JsonBeanReaderTest.java | 4 +-- .../ebeaninternal/api/PlatformMatchTest.java | 3 ++- .../extraddl/model/ExtraDdlXmlReaderTest.java | 2 -- .../json/ModifyAwareMapTest.java | 12 ++------- .../server/cache/CacheBeanDataTest.java | 2 +- .../cache/CachedBeanDataSerializeTest.java | 8 ++---- .../cache/DefaultServerCacheConfigTest.java | 2 +- .../changelog/ChangeJsonBuilderTest.java | 2 -- .../DefaultChangeLogRegisterTest.java | 2 +- .../BeanDescriptor_documentMappingTest.java | 2 +- .../deploy/BeanDescriptor_registerTest.java | 2 +- ...eanDescriptor_whenCreatedPropertyTest.java | 2 +- .../deploy/BeanPropertyAssocManyTest.java | 4 +-- .../deploy/FormulaPropertyPathTest.java | 1 - .../server/deploy/IndexDefinitionTest.java | 3 ++- .../TestBeanDescriptorHasIdProperty.java | 2 +- ...estReferenceWithConstructorProperties.java | 5 +--- .../server/expression/BaseExpressionTest.java | 5 +++- .../expression/PrepareDocNestedTest.java | 2 +- .../server/expression/RawExpressionTest.java | 2 +- .../server/grammer/EqlParserTest.java | 3 +-- .../server/loadcontext/DLoadContextTest.java | 2 +- .../server/persist/BatchDepthOrderTest.java | 2 +- .../TestFutureRowCountErrorHandling.java | 14 +++------- .../server/querydefn/OrmQueryDetailTest.java | 2 +- .../server/rawsql/DRawSqlServiceTest.java | 2 +- .../server/rawsql/TestRawSqlBuilder.java | 14 ++-------- .../server/rawsql/TestRawSqlParsing.java | 6 +---- .../text/json/TestJsonWriteVisitor.java | 6 +---- .../json/TestTextJsonBeanReadVisitor.java | 2 +- .../server/text/json/WriteJsonDirtyTest.java | 6 ++--- .../DefaultPersistenceContextTest.java | 6 +---- .../DefaultTransactionThreadLocalTest.java | 10 ++----- .../server/type/ModifyAwareFlagTest.java | 6 +---- .../server/type/ModifyAwareListTest.java | 12 ++------- .../server/type/ModifyAwareMapTest.java | 6 +---- .../server/type/ModifyAwareSetTest.java | 6 +---- .../server/type/ScalarTypeArrayListTest.java | 4 ++- .../server/type/ScalarTypeBooleanTest.java | 6 ++--- .../server/type/ScalarTypeInstantTest.java | 4 +-- .../type/ScalarTypeJodaLocalTimeTest.java | 2 +- .../type/ScalarTypeOffsetDateTimeTest.java | 4 +-- .../server/type/TestSimpleEncryptor.java | 7 +++-- .../support/DocStoreBeanBaseAdapterTest.java | 2 +- .../api/support/DocStoreDeleteEventTest.java | 6 ++--- .../api/support/DocStoreIndexEventTest.java | 4 +-- .../migration/history/v1_0/EHistory7.java | 4 +-- .../misc/migration/v1_0/DfkCascadeOne.java | 7 +---- .../misc/migration/v1_0/DfkNoneViaJoin.java | 8 +----- .../test/java/misc/migration/v1_0/EBasic.java | 1 - .../test/java/misc/migration/v1_0/EEnum.java | 10 +++---- .../java/misc/migration/v1_0/EHistory2.java | 6 ++--- .../java/misc/migration/v1_0/EHistory3.java | 4 +-- .../java/misc/migration/v1_0/EHistory4.java | 4 +-- .../java/misc/migration/v1_0/EHistory5.java | 4 +-- .../java/misc/migration/v1_0/EHistory6.java | 6 ++--- .../test/java/misc/migration/v1_0/ERef.java | 11 ++++---- .../java/misc/migration/v1_1/CKeyParent.java | 8 +----- .../misc/migration/v1_1/DfkCascadeOne.java | 7 +---- .../misc/migration/v1_1/DfkNoneViaJoin.java | 8 +----- .../test/java/misc/migration/v1_1/EBasic.java | 12 ++------- .../java/misc/migration/v1_1/EHistory.java | 10 +++---- .../java/misc/migration/v1_1/EHistory2.java | 10 +++---- .../java/misc/migration/v1_1/EHistory3.java | 6 ++--- .../java/misc/migration/v1_1/EHistory4.java | 4 +-- .../java/misc/migration/v1_1/EHistory5.java | 8 +++--- .../java/misc/migration/v1_1/EHistory6.java | 8 +++--- .../java/misc/migration/v1_1/ESoftdelete.java | 12 ++++----- .../java/misc/migration/v1_1/MtmChild.java | 5 ++-- .../java/misc/migration/v1_1/MtmMaster.java | 5 ++-- .../java/misc/migration/v1_1/OtoMaster.java | 6 +---- .../misc/migration/v1_2/DfkCascadeOne.java | 7 +---- .../misc/migration/v1_2/DfkNoneViaJoin.java | 8 +----- .../test/java/misc/migration/v1_2/EBasic.java | 1 - .../test/java/misc/migration/v1_2/EEnum.java | 10 +++---- .../java/misc/migration/v1_2/EHistory2.java | 6 ++--- .../java/misc/migration/v1_2/EHistory3.java | 4 +-- .../java/misc/migration/v1_2/EHistory4.java | 4 +-- .../java/misc/migration/v1_2/EHistory5.java | 4 +-- .../java/misc/migration/v1_2/EHistory6.java | 8 +++--- .../test/java/misc/migration/v1_2/ERef.java | 11 ++++---- .../aggregateformula/IAFBaseSegment.java | 6 +---- .../TestAggregateFormula.java | 6 +---- .../java/org/tests/basic/MainDbBoolean.java | 3 ++- .../org/tests/basic/TestAnnotationBase.java | 4 +-- .../tests/basic/TestAssocOneEqExpression.java | 2 +- .../java/org/tests/basic/TestBatchLazy.java | 2 +- .../org/tests/basic/TestBatchLazyMany.java | 2 +- .../tests/basic/TestBeanReferenceRefresh.java | 2 +- .../org/tests/basic/TestCreateEntityBean.java | 1 - .../tests/basic/TestDeleteByIdCollection.java | 3 +-- .../basic/TestDeleteImportedPartial.java | 2 +- .../org/tests/basic/TestDeleteOneToOne.java | 2 +- .../basic/TestDeleteOneToOneMultiple.java | 2 +- .../basic/TestDeletePartialNoVersion.java | 2 +- .../org/tests/basic/TestDynamicUpdate.java | 2 +- ...stEnhancementCollectionInitialisation.java | 2 +- .../org/tests/basic/TestExplicitInsert.java | 2 +- .../java/org/tests/basic/TestFetchId.java | 5 +--- .../java/org/tests/basic/TestInEmpty.java | 3 +-- .../java/org/tests/basic/TestInheritRef.java | 2 +- .../java/org/tests/basic/TestJodaType.java | 2 +- .../org/tests/basic/TestJoinInheritance.java | 6 +---- .../org/tests/basic/TestLoadBeanCache.java | 2 +- .../org/tests/basic/TestM2MCascadeOne.java | 2 +- .../org/tests/basic/TestManyLazyLoad.java | 2 +- .../org/tests/basic/TestManyOneInterface.java | 2 +- .../java/org/tests/basic/TestMappedSuper.java | 2 +- .../org/tests/basic/TestMetaAnnotation.java | 4 +-- .../tests/basic/TestNonUpdateProperty.java | 2 +- .../tests/basic/TestOrderByAnnotation.java | 3 +-- .../basic/TestOrderTotalAmountFormula.java | 2 +- .../tests/basic/TestPersistenceContext.java | 2 +- .../org/tests/basic/TestQueryForUpdate.java | 7 +---- .../org/tests/basic/TestQueryWithCache.java | 3 +-- .../tests/basic/TestReadOnlyPropagation.java | 6 +---- .../tests/basic/TestSaveDeleteOneToOne.java | 2 +- .../basic/TestSaveDeleteOneToOneMultiple.java | 2 +- .../basic/TestSharedInstancePropagation.java | 2 +- .../java/org/tests/basic/TestTransient.java | 5 +--- .../org/tests/basic/TestUpdateManyToOne.java | 2 +- .../java/org/tests/basic/TestUuidInsert.java | 2 +- .../basic/TestUuidInsertMasterDetail.java | 2 +- .../org/tests/basic/TestWhereAnnotation.java | 3 +-- .../basic/delete/TestDeleteByIdList.java | 2 +- .../basic/delete/TestDeleteCascadeById.java | 2 +- .../org/tests/basic/encrypt/TestEncrypt.java | 2 +- .../basic/event/TestPreInsertValidation.java | 2 +- .../tests/basic/join/TestSecondaryJoin.java | 3 +-- .../basic/lob/TestBasicClobFetchEager.java | 2 +- .../tests/basic/lob/TestBasicClobNoVer.java | 2 +- .../org/tests/basic/lob/TestByteOnly.java | 2 +- .../java/org/tests/basic/one2one/Booking.java | 12 +-------- .../java/org/tests/basic/one2one/Invoice.java | 10 +------ .../one2one/TestOne2OneBookingInvoice.java | 4 +-- .../java/org/tests/basic/one2one/Tire.java | 10 +------ .../java/org/tests/basic/one2one/Wheel.java | 9 +------ .../basic/type/TestExtraScalarTypes.java | 2 +- .../basic/type/TestQueryBooleanProperty.java | 2 +- .../batchinsert/TestBatchInsertFlush.java | 9 ++----- .../batchinsert/TestBatchInsertOneToOne.java | 6 +---- .../batchinsert/TestBatchInsertSimple.java | 1 - .../batchinsert/o2o/MeterAddressData.java | 3 ++- .../batchinsert/o2o/MeterContractData.java | 3 ++- .../o2o/MeterSpecialNeedsClient.java | 2 +- .../o2o/MeterSpecialNeedsContact.java | 2 +- .../tests/batchinsert/o2o/MeterVersion.java | 3 ++- .../org/tests/batchload/TestBasicLazy.java | 9 ++----- .../batchload/TestBatchLazyWithCacheHits.java | 2 +- .../org/tests/batchload/TestLazyJoin.java | 2 +- .../TestLazyLoadEmptyCollection.java | 4 +-- .../TestLazyLoadNonExistantBean.java | 2 +- .../TestLazyLoadNonExistentBean.java | 2 +- .../batchload/TestQueryDisableLazyLoad.java | 4 +-- .../org/tests/batchload/TestQueryJoin.java | 2 +- .../batchload/TestQueryJoinToAssocOne.java | 1 - .../batchload/TestSecondQueryNoRows.java | 1 - .../tests/batchload/TestSecondaryQueries.java | 9 ++++--- .../cache/TestBeanCacheWithDeleteQuery.java | 4 +-- .../java/org/tests/cache/TestCacheBasic.java | 2 +- .../tests/cache/TestCacheCollectionIds.java | 22 +++------------ .../org/tests/cache/TestCacheCustomer.java | 6 +---- .../org/tests/cache/TestCacheManyToOne.java | 2 +- .../org/tests/cache/TestCacheNaturalId.java | 4 +-- .../tests/cache/TestExternalNotification.java | 2 +- .../cache/TestL2DirtyFlagOnLazyLoad.java | 4 +-- .../java/org/tests/cache/TestM2MCache.java | 7 +++-- .../tests/cache/TestQueryCacheCountry.java | 1 - .../org/tests/cache/TestQueryCacheInsert.java | 4 +-- .../tests/cache/TestQueryCacheReadOnly.java | 12 +++------ .../tests/cache/embeddedid/CEPProduct.java | 7 +---- .../org/tests/callable/TestMysqlCallable.java | 2 +- .../tests/cascade/OmCacheOrderedMaster.java | 6 +---- .../org/tests/cascade/OmOrderedMaster.java | 6 +---- .../java/org/tests/cascade/RelDetail.java | 7 +---- .../java/org/tests/cascade/RelMaster.java | 6 +---- .../tests/cascade/TestMasterDetailDelete.java | 5 ++-- .../tests/cascade/TestMultiCascadeBatch.java | 1 - .../org/tests/cascade/TestPrivateOwned.java | 4 +-- .../TestPrivateOwnedAddRemoveOrphan.java | 2 +- ...TestPrivateOwnedIgnoreTransientOrphan.java | 2 +- .../compositekeys/TestCKeyIdInExpression.java | 2 +- .../tests/compositekeys/TestCKeyLazyLoad.java | 2 +- ...aoCompositeKeyWithAnnotationOverrides.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 10 +------ .../org/tests/compositekeys/db/CaoBean.java | 6 +---- .../java/org/tests/compositekeys/db/Item.java | 9 +------ .../compositekeys/db/ParcelLocation.java | 6 +---- .../org/tests/compositekeys/db/Region.java | 7 +---- .../org/tests/compositekeys/db/SubType.java | 1 - .../java/org/tests/compositekeys/db/Type.java | 9 +------ .../contructor/TestProtectedConstructor.java | 2 +- .../java/org/tests/ddd/iud/TestDPersonEl.java | 5 ++-- .../java/org/tests/ddl/DfkNoneViaJoin.java | 7 +---- .../test/java/org/tests/delete/DcMaster.java | 6 +---- .../delete/TestDeleteByIdUsingModel.java | 2 +- .../org/tests/delete/TestDeleteByQuery.java | 12 ++------- .../tests/docstore/CustomerReportTest.java | 11 ++++---- .../java/org/tests/draftable/DocLinkTest.java | 1 - .../tests/draftable/LinkQueryPublishTest.java | 2 +- .../test/java/org/tests/el/TestELBasic.java | 8 ++---- .../java/org/tests/el/TestPathExpression.java | 2 +- .../org/tests/el/TestUnderscoreParam.java | 4 +-- .../TestConstructorManyAddAll.java | 2 +- .../TestConstructorPutfieldReplacement.java | 2 +- .../org/tests/family/TestInheritance.java | 5 +--- .../generated/TestGeneratedProperties.java | 2 +- .../org/tests/generated/TestGeneratedWho.java | 6 ++--- .../java/org/tests/genkey/TestSeqBatch.java | 2 +- .../org/tests/history/TestHistoryInsert.java | 7 +---- .../org/tests/idkeys/TestGeneratedKeys.java | 4 +-- .../java/org/tests/idkeys/TestLazyLoad.java | 8 +++--- .../java/org/tests/inherit/DIntParent.java | 8 +----- .../src/test/java/org/tests/inherit/Data.java | 6 +---- .../test/java/org/tests/inherit/EUncle.java | 6 +---- .../test/java/org/tests/inherit/Parent.java | 9 +------ .../org/tests/inheritance/InnerReport.java | 6 +---- .../tests/inheritance/OrganizationNode.java | 12 +++------ .../org/tests/inheritance/Stockforecast.java | 7 +---- .../tests/inheritance/TestInheritInsert.java | 8 +----- .../TestInheritanceBatchLazyLoad.java | 2 +- .../inheritance/TestInheritanceJoins.java | 2 -- .../inheritance/TestInheritanceOnMany.java | 6 +---- .../TestInheritanceOrderColumn.java | 1 - .../inheritance/TestInheritanceRefBean.java | 9 +++---- .../org/tests/inheritance/TestIntInherit.java | 2 +- .../org/tests/inheritance/TestSkippable.java | 6 ++--- .../inheritance/TestTreeOrganisations.java | 3 +-- .../abstrakt/AbstractBaseBlock.java | 8 +----- .../inheritance/cache/CICustomerParent.java | 8 +----- .../inheritance/cache/CIStreetParent.java | 7 +---- .../cache/TestInheritanceCache.java | 2 +- .../inheritance/cascadedelete/RootBean.java | 6 +---- .../company/domain/AbstractBar.java | 13 +-------- .../tests/inheritance/company/domain/Foo.java | 6 +---- .../company/domain/TestInheritAbstract.java | 2 +- .../inheritance/model/CalculationResult.java | 6 +---- .../order/OrderMasterInheritance.java | 6 +---- .../tests/insert/TestInsertCollection.java | 2 +- .../TestInsertDataIntegrityException.java | 3 --- .../tests/insert/TestInsertDuplicateKey.java | 3 +-- .../tests/insert/TestInsertOnStringKey.java | 2 +- .../java/org/tests/iud/TestCarWheelIud.java | 1 - .../java/org/tests/iud/TestInfoOneToOne.java | 2 +- .../org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../org/tests/json/TestDbJson_Jackson3.java | 6 +---- .../java/org/tests/json/TestDbJson_List.java | 8 ++---- .../java/org/tests/json/TestJsonMapBasic.java | 4 +-- .../java/org/tests/json/TestJsonMapBlob.java | 2 +- .../java/org/tests/json/TestJsonMapClob.java | 2 +- .../java/org/tests/json/TestJsonMapJsonB.java | 2 +- .../org/tests/json/TestJsonMapVarchar.java | 2 +- .../org/tests/json/TestJsonNodeBasic.java | 11 +++----- .../java/org/tests/json/TestJsonNodeBlob.java | 6 ++--- .../org/tests/json/TestJsonNodeJsonb.java | 6 ++--- .../org/tests/json/TestJsonNodeVarchar.java | 6 ++--- .../tests/json/TestUnmappedProperties.java | 2 +- .../include/TestJsonExcludeEmptyList.java | 2 +- .../json/include/TestJsonExcludeEmptyMap.java | 2 +- .../json/include/TestJsonExcludeEmptySet.java | 2 +- .../json/include/TestJsonExcludeNull.java | 2 +- .../TestJsonExcludeTransientEmptyList.java | 2 +- .../EJsonJacksonIgnore.java | 2 +- .../lazyforeignkeys/MainEntityRelation.java | 6 +---- .../lazyforeignkeys/TestLazyForeignKeys.java | 3 +-- .../src/test/java/org/tests/level/Level1.java | 7 +---- .../src/test/java/org/tests/level/Level2.java | 7 +---- .../org/tests/level/test/ManyToManyTest.java | 2 +- .../lifecycle/TestLifecycleAnnotatedBean.java | 2 +- .../lifecycle/TestLifecycleExceptions.java | 9 +++---- .../tests/lifecycle/TestLifecycleWithLog.java | 13 +++++---- .../TestM2MDeleteObjectWithCascadeToM2m.java | 2 +- .../tests/m2m/TestM2MDeleteWithCascade.java | 2 +- .../org/tests/m2m/TestM2MMultipleLists.java | 2 +- .../tests/m2m/TestM2MSelfRelationship.java | 2 +- .../org/tests/merge/TestMergeCustomer.java | 8 ++---- .../org/tests/model/aggregation/DMachine.java | 6 +---- .../model/aggregation/DMachineAuxUse.java | 7 +---- .../model/aggregation/DMachineStats.java | 7 +---- .../tests/model/aggregation/DMachineUse.java | 7 +---- .../tests/model/array/TestDbArray_asSet.java | 6 +---- .../tests/model/array/TestDbArray_basic.java | 6 +---- .../java/org/tests/model/basic/Address.java | 7 +---- .../java/org/tests/model/basic/Animal.java | 9 +------ .../java/org/tests/model/basic/Attribute.java | 7 +---- .../java/org/tests/model/basic/BBookmark.java | 7 +---- .../org/tests/model/basic/CKeyParent.java | 7 +---- .../test/java/org/tests/model/basic/Car.java | 8 +----- .../java/org/tests/model/basic/Contact.java | 15 ++--------- .../java/org/tests/model/basic/Country.java | 7 +---- .../java/org/tests/model/basic/Customer.java | 19 ++----------- .../java/org/tests/model/basic/EBasic.java | 1 - .../tests/model/basic/EBasicChangeLog.java | 17 +++--------- .../model/basic/EBasicClobFetchEager.java | 7 +---- .../org/tests/model/basic/EBasicEncrypt.java | 6 +---- .../model/basic/EBasicEncryptBinary.java | 6 +---- .../model/basic/EBasicEncryptClient.java | 7 +---- .../model/basic/EBasicWithLifecycle.java | 12 +-------- .../basic/EBasicWithLifecycleExceptions.java | 12 +-------- .../org/tests/model/basic/EBasicWithLog.java | 12 +-------- .../model/basic/EBasicWithUniqueCon.java | 8 +----- .../java/org/tests/model/basic/ESimple.java | 6 +---- .../basic/L2CachedLazyDirtFlagResetBean.java | 1 + .../tests/model/basic/MNonUpdPropEntity.java | 7 +---- .../java/org/tests/model/basic/MRole.java | 6 +---- .../java/org/tests/model/basic/MUser.java | 7 +---- .../java/org/tests/model/basic/MnocUser.java | 7 +---- .../java/org/tests/model/basic/MyLobSize.java | 7 +---- .../tests/model/basic/MyLobSizeJoinMany.java | 6 +---- .../org/tests/model/basic/OCachedBean.java | 7 +---- .../org/tests/model/basic/OCachedInhRoot.java | 4 +-- .../java/org/tests/model/basic/OEngine.java | 1 - .../java/org/tests/model/basic/OGearBox.java | 7 +---- .../org/tests/model/basic/OrderDetail.java | 6 +---- .../java/org/tests/model/basic/Person.java | 10 +------ .../java/org/tests/model/basic/Phone.java | 10 +------ .../java/org/tests/model/basic/Product.java | 6 +---- .../java/org/tests/model/basic/Section.java | 6 +---- .../org/tests/model/basic/TBytesOnly.java | 6 +---- .../java/org/tests/model/basic/TIntRoot.java | 8 +----- .../org/tests/model/basic/TMappedSuper2.java | 3 +-- .../java/org/tests/model/basic/TSDetail.java | 7 +---- .../java/org/tests/model/basic/TSMaster.java | 8 +----- .../java/org/tests/model/basic/Truck.java | 6 +---- .../java/org/tests/model/basic/UTMaster.java | 7 +---- .../java/org/tests/model/basic/UUOne.java | 6 +---- .../java/org/tests/model/basic/UUTwo.java | 6 +---- .../org/tests/model/basic/VwCustomer.java | 19 ++----------- .../org/tests/model/basic/cache/CInhRef.java | 3 +-- .../tests/model/basic/cache/ECacheChild.java | 5 ++-- .../tests/model/basic/cache/ECacheRoot.java | 5 ++-- .../org/tests/model/basic/first/First.java | 6 +---- .../org/tests/model/basic/first/Second.java | 6 +---- .../basic/metaannotation/SizeMedium.java | 6 +---- .../org/tests/model/basic/xtra/DummyDao.java | 4 +-- .../org/tests/model/basic/xtra/EdChild.java | 7 +---- .../org/tests/model/basic/xtra/EdParent.java | 13 +-------- .../TestInsertBatchThenFlushThenUpdate.java | 2 -- .../org/tests/model/bridge/BSiteUserA.java | 6 +---- .../org/tests/model/bridge/BSiteUserB.java | 6 +---- .../org/tests/model/bridge/BSiteUserC.java | 6 +---- .../tests/model/bridge/BSiteUserDMany.java | 5 +++- .../tests/model/bridge/TestIdClassScalar.java | 1 - .../org/tests/model/cache/M2MCacheChild.java | 6 ++--- .../org/tests/model/cache/M2MCacheMaster.java | 11 +++----- .../java/org/tests/model/carwheel/Car.java | 9 +------ .../java/org/tests/model/carwheel/Tire.java | 7 +---- .../java/org/tests/model/carwheel/Wheel.java | 10 +------ .../org/tests/model/carwheeltruck/TCar.java | 10 +------ .../org/tests/model/carwheeltruck/TTruck.java | 7 +---- .../model/carwheeltruck/TTruckHolder.java | 6 +---- .../org/tests/model/composite/CkeClient.java | 7 +---- .../tests/model/composite/CkeClientKey.java | 1 - .../org/tests/model/composite/CkeUserKey.java | 1 - .../org/tests/model/composite/ROrder.java | 9 +------ .../model/converstation/Conversation.java | 6 +---- .../tests/model/docstore/CustomerReport.java | 10 +++---- .../tests/model/docstore/ProductReport.java | 9 +++---- .../java/org/tests/model/docstore/Report.java | 15 +++++------ .../java/org/tests/model/draftable/Link.java | 7 +---- .../model/elementcollection/EcPerson.java | 8 +----- .../tests/model/elementcollection/EcTop.java | 6 +---- .../model/elementcollection/EcblPerson.java | 7 +---- .../model/elementcollection/EcbmPerson.java | 7 +---- .../model/elementcollection/EcmPerson.java | 9 +------ .../elementcollection/EcmPersonTest.java | 2 +- .../model/elementcollection/EcmcPerson.java | 7 +---- .../model/elementcollection/EcsPerson.java | 7 +---- .../elementcollection/EcsPersonTest.java | 2 +- .../model/elementcollection/EcsmChild.java | 7 +---- .../model/elementcollection/EcsmOne.java | 7 +---- .../model/elementcollection/EcsmTwo.java | 7 +---- .../TestElementCollectionBasicCache.java | 2 +- .../TestElementCollectionBasicMapCache.java | 2 +- .../org/tests/model/embedded/EEmbInner.java | 6 +---- .../org/tests/model/embedded/EEmbOuter.java | 8 +----- .../org/tests/model/embedded/EInvoice.java | 6 +---- .../java/org/tests/model/embedded/EMain.java | 6 +---- .../org/tests/model/embedded/EPerson.java | 8 +----- .../org/tests/model/embedded/EPerson2.java | 8 +----- .../org/tests/model/embedded/EPerson3.java | 8 +----- .../tests/model/embedded/PrimaryRevision.java | 6 +---- .../tests/model/family/GrandParentPerson.java | 17 +++++------- .../tests/model/family/InheritablePerson.java | 3 +-- .../org/tests/model/family/ParentPerson.java | 6 +---- .../org/tests/model/info/InfoCompany.java | 6 +---- .../org/tests/model/info/InfoCustomer.java | 6 +---- .../model/inheritexposedtype/IXResource.java | 6 +---- .../test/TestInheritExposeDtype.java | 2 +- .../org/tests/model/inheritmany/IMRoot.java | 6 +---- .../org/tests/model/inheritmany/MMedia.java | 6 +---- .../tests/model/interfaces/SelfManyMany.java | 6 +---- .../model/joda/TestJodaInsertUpdate.java | 4 +-- .../tests/model/json/EBasicJsonJackson.java | 7 +---- .../tests/model/json/EBasicJsonJackson2.java | 7 +---- .../tests/model/json/EBasicJsonJackson3.java | 1 - .../org/tests/model/json/EBasicJsonMap.java | 6 +---- .../org/tests/model/json/EBasicJsonMulti.java | 2 -- .../org/tests/model/json/EBasicJsonNode.java | 2 +- .../tests/model/json/EBasicJsonNodeBlob.java | 2 +- .../tests/model/json/EBasicJsonNodeJsonB.java | 2 +- .../model/json/EBasicJsonNodeVarchar.java | 2 +- .../org/tests/model/json/EBasicOldValue.java | 26 +++++++++--------- .../model/lazywithcache/ChildWithCache.java | 16 +++++------ .../TestWithCacheAndLazyLoad.java | 3 +-- .../java/org/tests/model/lazywithid/Tune.java | 11 +++----- .../java/org/tests/model/m2m/MailUser.java | 7 +---- .../java/org/tests/model/m2m/MnyEdge.java | 4 +-- .../java/org/tests/model/m2m/MnyNode.java | 7 +---- .../java/org/tests/model/m2m/MnyTopic.java | 7 +---- .../java/org/tests/model/m2m/Permission.java | 6 +---- .../test/java/org/tests/model/m2m/Role.java | 9 +------ .../test/java/org/tests/model/m2m/Tenant.java | 8 +----- .../org/tests/model/m2m/TestM2MWithWhere.java | 11 ++++---- .../test/java/org/tests/model/m2o/Empl.java | 6 +---- .../java/org/tests/model/nofk/Test2NoFk.java | 1 - .../java/org/tests/model/nofk/TestNoFk.java | 1 - .../org/tests/model/onetoone/OtoBChild.java | 6 +---- .../org/tests/model/onetoone/OtoBMaster.java | 6 +---- .../org/tests/model/onetoone/OtoCust.java | 6 +---- .../org/tests/model/onetoone/OtoPrime.java | 7 +---- .../org/tests/model/onetoone/OtoSdMaster.java | 6 +---- .../tests/model/onetoone/OtoUBPrimeExtra.java | 6 +---- .../org/tests/model/onetoone/OtoUPrime.java | 6 +---- .../org/tests/model/onetoone/OtoUser.java | 4 +-- .../tests/model/onetoone/OtoUserOptional.java | 4 +-- .../onetoone/TestOneToOneOrphanRemove.java | 1 - .../tests/model/orderentity/OrderEntity.java | 9 +------ .../model/orderentity/OrderItemEntity.java | 8 +----- .../tests/model/orphanremoval/OrpMaster.java | 7 +---- .../tests/model/orphanremoval/OrpMaster2.java | 7 +---- .../java/org/tests/model/prnt/MPrinter.java | 8 +----- .../org/tests/model/prnt/MPrinterState.java | 7 +---- .../java/org/tests/model/pview/Pview.java | 11 +------- .../java/org/tests/model/pview/Wview.java | 7 +---- .../tests/model/selfref/BaseResourceFile.java | 1 - .../org/tests/model/selfref/ResourceFile.java | 9 +------ .../org/tests/model/selfref/SelfParent.java | 7 +---- .../tests/model/selfref/SelfRefCustomer.java | 6 +---- .../tests/model/selfref/SelfRefExample.java | 7 +---- .../test/java/org/tests/model/site/Site.java | 7 +---- .../tests/model/softdelete/ESoftDelBook.java | 6 +---- .../tests/model/softdelete/ESoftDelOneA.java | 6 +---- .../org/tests/model/softdelete/ESoftDelX.java | 5 +++- .../org/tests/model/softdelete/ESoftDelY.java | 5 +++- .../java/org/tests/model/survey/Category.java | 10 ++----- .../java/org/tests/model/survey/Group.java | 11 ++------ .../java/org/tests/model/survey/Survey.java | 6 +---- .../org/tests/model/tevent/TEventOne.java | 7 +---- .../tests/model/types/SomeNewTypesBean.java | 16 +---------- .../tests/model/uuidsibling/USibChild.java | 6 +---- .../org/tests/model/version/VersionChild.java | 8 +----- .../tests/model/version/VersionParent.java | 7 +---- .../java/org/tests/model/view/EOrderAgg.java | 6 +---- .../java/org/tests/model/zero/WithZero.java | 6 +---- .../org/tests/model/zero/WithZeroParent.java | 7 +---- .../java/org/tests/o2m/OmBasicParent.java | 5 ++-- .../org/tests/o2m/TestOneToManyOnlyBean.java | 4 +-- .../org/tests/o2m/TestOneToManyWhere.java | 1 - .../tests/o2m/jointable/JtMonkeyGroup.java | 7 +---- .../org/tests/o2m/jointable/JtTrainer.java | 8 +----- .../java/org/tests/o2m/jointable/JtTroop.java | 7 +---- .../TestOneToManyJoinTableInheritance.java | 1 - .../TestOneToManyJoinTableNoTableName.java | 1 - .../o2m/jointable/inheritance/ClassSuper.java | 7 +---- .../test/java/org/tests/o2m/lazy/OmlBar.java | 6 +---- .../test/java/org/tests/o2m/lazy/OmlFoo.java | 7 +---- .../org/tests/order/OrderReferencedChild.java | 7 +---- .../tests/order/OrderReferencedParent.java | 7 +---- ...stPersistenceContextOnUpdateDuringTxn.java | 2 +- .../TestPersistenceContextQueryScope.java | 1 - ...estPersistenceContextScopeUsingOrders.java | 2 +- .../TestPersistenceContextServerConfig.java | 6 +---- .../query/TestAutofetchTuneWithJoin.java | 6 ++--- .../query/TestConnectionCloseOnSqlerr.java | 2 +- .../org/tests/query/TestDefaultFetchLazy.java | 2 +- .../java/org/tests/query/TestIContains.java | 8 ++---- .../java/org/tests/query/TestLimitQuery.java | 2 +- .../org/tests/query/TestManyWhereJoin.java | 2 +- .../org/tests/query/TestMyAdHocSqlSelect.java | 9 ++----- .../query/TestOneToManyCorrectGrouping.java | 2 +- .../query/TestQueryFetchManyTwoDeep.java | 2 +- .../tests/query/TestQueryFetchSkipPath.java | 6 +---- .../tests/query/TestQueryFilterManyOnM2M.java | 2 +- .../query/TestQueryFilterManyOnSecondary.java | 7 +---- .../query/TestQueryFilterManySimple.java | 3 +-- .../org/tests/query/TestQueryFindEach.java | 3 +-- .../tests/query/TestQueryFindEachWhile.java | 1 - .../tests/query/TestQueryFindFutureList.java | 2 +- .../org/tests/query/TestQueryFindNative.java | 2 +- .../org/tests/query/TestQueryInAssocOne.java | 2 +- .../java/org/tests/query/TestQueryIsNull.java | 3 +-- .../tests/query/TestQueryJoinBatchSize.java | 3 +-- .../tests/query/TestQueryJoinMulipleMany.java | 2 +- .../tests/query/TestQueryMultiManyOrder.java | 2 +- .../tests/query/TestQueryNullAssocOne.java | 2 +- .../org/tests/query/TestQueryOrderById.java | 2 -- .../query/TestQueryPathJoinAndOrder.java | 2 +- .../query/TestQueryPlanCacheRowCount.java | 2 +- .../tests/query/TestRefToLazyLoadMany.java | 2 +- .../tests/query/TestThreeLevelQueryJoin.java | 3 +-- .../org/tests/query/TestWhereRawClause.java | 1 - .../query/autotune/TestAutoTuneProfiling.java | 6 +---- .../query/cache/AclContainerRelation.java | 8 ++---- .../java/org/tests/query/cache/Contract.java | 7 +---- .../java/org/tests/query/cache/Position.java | 6 +---- .../tests/query/cancel/SlowDownEBasic.java | 9 +++---- .../query/cancel/SqlQueryCancelTest.java | 27 +++++++------------ .../embedded/TestMultipleEmbeddedLoading.java | 2 +- .../query/finder/TestCustomerFinder.java | 8 +----- .../joins/TestQueryJoinQueryNonRoot.java | 2 +- .../TestQueryManyToOneWhereClauseJoin.java | 2 +- .../query/lazy/TestQueryDefaultBatchSize.java | 6 +---- .../tests/query/orderby/TestOrderByClear.java | 2 +- .../orderby/TestOrderByWithDistinct.java | 6 +---- .../orderby/TestOrderByWithDistinctTake2.java | 2 +- .../orderby/TestOrderByWithFunction.java | 2 +- .../query/orderby/TestOrderByWithMany.java | 4 +-- .../other/TestFindIdsWithInheritance.java | 2 +- .../query/other/TestFindIterateHeapDump.java | 4 +-- ...stFindPartialWithConstructorSetFields.java | 2 +- .../query/other/TestFormulaWithFindCount.java | 2 +- .../tests/query/other/TestLikeEscaping.java | 3 +-- .../query/other/TestManyLazyLoadingQuery.java | 2 +- .../other/TestManyToManyLazyLoading.java | 2 +- .../tests/query/other/TestQueryDistinct.java | 2 +- .../other/TestQueryRawExpressionMany.java | 4 +-- .../query/other/TestQuerySingleAttribute.java | 13 ++------- .../org/tests/query/other/TestSelfParent.java | 2 +- .../query/other/TestSubQueryBinding.java | 8 ++---- .../tests/query/sqlquery/SqlQueryTests.java | 6 +---- .../tests/rawsql/TestOrderReportTotal.java | 8 ++---- .../org/tests/rawsql/TestRawSqlAsKeyword.java | 8 ++---- .../rawsql/TestRawSqlCustomerAggregate.java | 8 ++---- .../tests/rawsql/TestRawSqlMasterDetail.java | 6 +---- .../tests/rawsql/TestRawSqlNamedParams.java | 11 ++------ .../org/tests/rawsql/TestRawSqlOrmQuery.java | 9 +------ .../tests/rawsql/TestRawSqlOrmWrapper.java | 8 ++---- .../tests/rawsql/TestRawSqlOrmWrapper2.java | 9 ++----- .../tests/rawsql/TestRawSqlOrmWrapper3.java | 3 +-- .../tests/rawsql/TestRawSqlWithResultSet.java | 8 ++---- .../tests/rawsql/inherit/ParentQueryTest.java | 3 +-- .../rawsql/inherit/ParentRawSqlTest.java | 11 ++------ .../rawsql/nativesql/TestNativeSqlBasic.java | 5 +++- .../org/tests/readaudit/TestReadAudit.java | 6 +---- .../tests/refresh/TestRefreshWithMany.java | 4 +-- .../TestInheritQuery.java | 7 +---- .../model/PalletLocation.java | 11 +------- .../model/Warehouse.java | 10 +------ .../singleTableInheritance/model/Zone.java | 9 +------ .../tests/softdelete/TestSoftDeleteBasic.java | 7 +---- .../tests/softdelete/TestSoftDeleteBook.java | 2 +- .../softdelete/TestSoftDeleteManyToMany.java | 4 +-- .../TestSoftDeleteOptionalRelationship.java | 5 ++-- .../org/tests/sp/TestManyToManySaveTwice.java | 1 - .../java/org/tests/sp/model/IdEntity.java | 7 +---- .../test/java/org/tests/sp/model/car/Car.java | 7 +---- .../java/org/tests/text/json/TestJsonMap.java | 2 +- .../json/TestJsonSomeEnumWithToString.java | 2 -- .../text/json/TestTextJsonInheritance.java | 8 +----- .../org/tests/timezone/TimezoneTests.java | 6 +---- .../transaction/TestBatchModelFlush.java | 2 -- .../tests/transaction/TestBeanStateReset.java | 5 ++-- .../TestDeleteFromPersistenceContext.java | 6 ++--- .../transaction/TestExecuteComplete.java | 6 +---- .../transaction/TestInsertManyAndRef.java | 2 +- .../transaction/TestNestedBeginRequired.java | 12 +++------ .../TestNestedBeginRequiredWithFailure.java | 12 +++------ .../TestNestedBeginRequiresNew.java | 12 +++------ ...TestNestedBeginRequiresNewWithFailure.java | 12 +++------ .../transaction/TestNestedSubTransaction.java | 7 +---- .../transaction/TestPersistContextClear.java | 2 +- .../TestStatelessUpdateClearPC.java | 2 +- .../TestTransactionTryResources.java | 2 +- .../TestTransactionalNotSupports.java | 4 +-- .../TestTransactionalRequired.java | 4 +-- .../TestTransactionalRequiresNew.java | 11 ++------ ...TransactionNotTerminatedAfterRollback.java | 1 - .../TestTransparentPersist.java | 5 ++-- .../org/tests/types/PasswordStoreModel.java | 4 +-- .../java/org/tests/types/TestFileType.java | 5 +--- .../org/tests/types/TestFileTypeFetching.java | 2 +- .../test/java/org/tests/types/TestHstore.java | 6 ++--- .../java/org/tests/types/TestNewTypes.java | 16 +---------- .../unidirectional/TestUniDirectional.java | 2 +- .../unitinternal/TestEqualsOnEnhanced.java | 6 ++--- .../unitinternal/TestNullCollectionSet.java | 2 +- .../tests/unitinternal/TestOrderByParse.java | 6 +---- .../TestTxTypeOnTransactional.java | 6 ++--- .../TestVanillaCollectionSet.java | 2 +- .../update/TestEmbeddedRefreshUpdate.java | 2 +- .../tests/update/TestJsonStatelessUpdate.java | 2 +- .../org/tests/update/TestMarkAsDirty.java | 2 +- .../tests/update/TestSqlUpdateExceptions.java | 6 +---- .../org/tests/update/TestSqlUpdateUpsert.java | 1 - .../org/tests/update/TestStatelessUpdate.java | 6 +---- .../org/tests/update/TestUpdatePartial.java | 1 - .../tests/update/TestUpdatePartialNoVer.java | 2 +- .../java/org/tests/update/objects/Child.java | 6 +---- .../java/org/tests/update/objects/Parent.java | 7 +---- .../org/tests/update/objects/SiblingA.java | 7 +---- .../org/tests/update/objects/SiblingB.java | 7 +---- 626 files changed, 854 insertions(+), 2475 deletions(-) diff --git a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java index 0e716b159..eb94870d9 100644 --- a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java +++ b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java @@ -6,9 +6,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DbPrimaryTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java index 6f3ced974..00f395f36 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java @@ -1,11 +1,6 @@ package io.ebean; -import io.ebean.config.CurrentTenantProvider; -import io.ebean.config.DatabaseConfig; -import io.ebean.config.TenantCatalogProvider; -import io.ebean.config.TenantDataSourceProvider; -import io.ebean.config.TenantMode; -import io.ebean.config.TenantSchemaProvider; +import io.ebean.config.*; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index dd7d461ef..d86dc382d 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -1,8 +1,8 @@ package io.ebean; -import org.tests.model.basic.EBasicVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java index e30c33aea..10ed5fbb9 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -1,8 +1,8 @@ package io.ebean; -import org.tests.model.basic.EBasicVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java index 3f39680c8..9be28fa76 100644 --- a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java @@ -1,6 +1,5 @@ package io.ebean; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java index a4462f9de..128103dfb 100644 --- a/ebean-test/src/test/java/io/ebean/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/PropertyTest.java @@ -1,6 +1,5 @@ package io.ebean; -import io.ebean.OrderBy; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/StringHelperTest.java index eba711bb4..5beeeb905 100644 --- a/ebean-test/src/test/java/io/ebean/StringHelperTest.java +++ b/ebean-test/src/test/java/io/ebean/StringHelperTest.java @@ -6,10 +6,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class StringHelperTest { diff --git a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java index 019469533..3f2b0e581 100644 --- a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java @@ -3,9 +3,9 @@ package io.ebean; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.server.core.DefaultBeanState; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; -import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; diff --git a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java index 63e380715..e6c85b6f1 100644 --- a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java @@ -1,11 +1,10 @@ package io.ebean; -import io.ebean.DB; import io.ebean.search.Match; import io.ebean.search.MultiMatch; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; public class TextExpressionListTest { diff --git a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java index a04180ae1..e233bc562 100644 --- a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java @@ -2,11 +2,11 @@ package io.ebean.bean; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.AuditInfo; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.HashSet; diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java index e8c2dd208..143e3b19e 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java @@ -10,10 +10,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DatabaseConfigTest { diff --git a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java index bf0214ae1..03465543b 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java @@ -1,9 +1,10 @@ package io.ebean.config; +import io.ebean.migration.MigrationConfig; import org.junit.jupiter.api.Test; import java.util.Properties; -import io.ebean.migration.MigrationConfig; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java index 6a99267b9..a497e0d92 100644 --- a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java @@ -5,9 +5,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DocStoreConfigTest { diff --git a/ebean-test/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/config/TestTableName.java index eaf4632a9..ccf73ce03 100644 --- a/ebean-test/src/test/java/io/ebean/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/config/TestTableName.java @@ -1,7 +1,6 @@ package io.ebean.config; import io.ebean.BaseTestCase; -import io.ebean.config.TableName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java index 167d39d54..4d8b5ee88 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -13,10 +13,7 @@ import org.tests.model.basic.ECustomId; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanFindControllerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java index bba31ad7b..87cab8635 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -1,11 +1,7 @@ package io.ebean.event; -import io.ebean.BaseTestCase; -import io.ebean.BeanState; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.DatabaseFactory; +import io.ebean.*; import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java index 720e280a6..929c6582c 100644 --- a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java +++ b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java @@ -1,10 +1,10 @@ package io.ebean.json; -import io.ebean.text.json.EJson; -import io.ebeaninternal.json.ModifyAwareMap; -import io.ebean.ModifyAwareType; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; +import io.ebean.ModifyAwareType; +import io.ebean.text.json.EJson; +import io.ebeaninternal.json.ModifyAwareMap; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,12 +14,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; import java.nio.file.Files; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java index 47523eb91..cb6e4a9d2 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -9,13 +9,7 @@ import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import org.junit.jupiter.api.Test; import org.tests.inheritance.Stockforecast; -import org.tests.model.basic.Car; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Person; -import org.tests.model.basic.Product; -import org.tests.model.basic.Vehicle; +import org.tests.model.basic.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java index 82197e1e4..d20757d55 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java @@ -2,9 +2,9 @@ package io.ebean.plugin; import io.ebean.DB; import io.ebean.Database; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java index f36edd730..2189aaa44 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -3,18 +3,14 @@ package io.ebean.plugin; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import org.tests.model.basic.VwCustomer; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class SpiServerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index b1f91e4dd..17ecd262b 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -2,8 +2,8 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.DB; -import org.junit.jupiter.api.Test; import org.etest.BSimpleFor; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java index 3cb6857ad..430dc1bff 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java @@ -1,8 +1,8 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; -import org.junit.jupiter.api.Test; import org.etest.PlainBean; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java index 7ab6826c9..71dd478cb 100644 --- a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java +++ b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java @@ -2,7 +2,8 @@ package io.ebean.test; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class UserContextTest { diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java index a36e23aa8..2fb3b5fce 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -12,9 +12,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class PathPropertiesTests { diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index 69d4ecb77..6cf8f52db 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java @@ -1,11 +1,11 @@ package io.ebean.text.json; +import com.fasterxml.jackson.core.JsonParser; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; -import org.tests.model.basic.Customer; -import com.fasterxml.jackson.core.JsonParser; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import java.io.StringReader; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java index 5c3e8dc35..d20108a20 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java @@ -3,7 +3,8 @@ package io.ebeaninternal.api; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PlatformMatchTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java index b77df5424..a0bd66adb 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java @@ -4,9 +4,7 @@ import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class ExtraDdlXmlReaderTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java index 929b13d49..507475e27 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java @@ -3,16 +3,8 @@ package io.ebeaninternal.json; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; +import java.io.*; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 30a3e5afc..4bcb40b8e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -7,13 +7,13 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Customer.Status; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; -import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index ecce75b0e..53bf0c21d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -5,16 +5,12 @@ import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TBytesOnly; -import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java index 9180dd7c1..512f663fd 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java @@ -4,7 +4,7 @@ import io.ebean.cache.ServerCacheConfig; import io.ebean.cache.ServerCacheOptions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultServerCacheConfigTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 67b3b3664..86bab509f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,10 +1,8 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; -import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.io.StringWriter; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index f05d738f6..d639abf65 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -2,12 +2,12 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; import io.ebean.event.changelog.ChangeLogFilter; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.ProductConfiguration; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index 2b3dd7b11..063a7a515 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index b3883db7e..13a25e08a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -6,8 +6,8 @@ import io.ebean.event.AbstractBeanPersistListener; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 4cbffc35c..3407b37be 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index 048871533..c63966f21 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -13,9 +13,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanPropertyAssocManyTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index af2192d69..71b888046 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebeaninternal.server.query.STreeProperty; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index 2faa11bc6..aadc88109 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -2,7 +2,8 @@ package io.ebeaninternal.server.deploy; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class IndexDefinitionTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index db7c3ea55..112fcf345 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -6,11 +6,11 @@ import io.ebean.Database; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; -import org.junit.jupiter.api.Test; import org.tests.model.embedded.UserInterestLive; import org.tests.model.embedded.UserInterestLiveKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 92efbc603..551db2d8e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -9,10 +9,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestReferenceWithConstructorProperties extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index b0693d3c9..ef44734b8 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,6 +1,9 @@ package io.ebeaninternal.server.expression; -import io.ebean.*; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; import io.ebean.event.BeanQueryRequest; import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index e555a536e..58e33b9d2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index 27a696a34..c87e46c47 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.expression; +import io.ebeaninternal.api.BindValuesKey; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import io.ebeaninternal.api.BindValuesKey; public class RawExpressionTest extends BaseExpressionTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 1fea2b556..38fceeefc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -2,13 +2,12 @@ package io.ebeaninternal.server.grammer; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import io.ebeaninternal.api.SpiQuery; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiQuery; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index a90696702..a4499ae96 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -6,8 +6,8 @@ import io.ebean.Query; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java index 47cd5c2a3..ec71fcf03 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BatchDepthOrderTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index 7ea376eee..194d92aa0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,20 +1,14 @@ package io.ebeaninternal.server.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.FutureIds; -import io.ebean.FutureList; -import io.ebean.FutureRowCount; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; public class TestFutureRowCountErrorHandling extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 03f14cae3..189fd4457 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -2,8 +2,8 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java index bc7ddc8a2..a96af7b33 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.rawsql; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DRawSqlServiceTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index cb3da9f2d..84239ca9b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -1,12 +1,6 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.SqlRow; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; @@ -21,11 +15,7 @@ import org.tests.model.rawsql.ERawSqlAggBean; import javax.sql.DataSource; import java.nio.charset.StandardCharsets; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 0985f2ff8..70914dace 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -1,10 +1,6 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index a9759fa34..054269e66 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -6,12 +6,8 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteBeanVisitor; import io.ebean.text.json.JsonWriteOptions; import io.ebean.text.json.JsonWriter; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index 53c897057..682e76363 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -5,11 +5,11 @@ import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; import io.ebean.text.json.JsonReadOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.io.StringReader; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 5ebd28abe..faf74d993 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -1,14 +1,14 @@ package io.ebeaninternal.server.text.json; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index 4184980d0..4983c31e3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Car; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; -import org.tests.model.basic.Vehicle; +import org.tests.model.basic.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java index 5a77cde6f..9fe2386c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,10 +1,6 @@ package io.ebeaninternal.server.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.DatabaseFactory; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; @@ -15,9 +11,7 @@ import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class DefaultTransactionThreadLocalTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java index 57b4943cc..2b774b9d3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareFlag; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index cac5747d5..52180f322 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -4,16 +4,8 @@ import io.ebeaninternal.json.ModifyAwareList; import io.ebeaninternal.json.ModifyAwareSet; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; +import java.io.*; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 8a97f37ce..18bcaad5a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareMap; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index 1c1b17d90..5e6fe9e49 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareSet; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.Arrays; import java.util.HashSet; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java index 03a77f6ad..1da2f5773 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java @@ -12,7 +12,9 @@ import org.mockito.Mockito; import java.io.IOException; import java.io.StringReader; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index e2b80a668..fcbe7b535 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -3,15 +3,13 @@ package io.ebeaninternal.server.type; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; import java.sql.Types; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeBooleanTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index b2205f0fa..c40950842 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -11,9 +11,7 @@ import java.sql.Timestamp; import java.time.Instant; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeInstantTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 8b998ba37..80918a5a2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; import io.ebean.DB; -import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TJodaEntity; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 540491c4f..835546e1a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -9,9 +9,7 @@ import java.time.ZoneOffset; import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeOffsetDateTimeTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 47c9acb50..7ea6d2b3c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -2,15 +2,14 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; -import io.ebeaninternal.server.type.SimpleAesEncryptor; -import org.tests.basic.encrypt.BasicEncryptKey; import org.junit.jupiter.api.Test; +import org.tests.basic.encrypt.BasicEncryptKey; + +import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import java.sql.Timestamp; - public class TestSimpleEncryptor extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 89a4a5241..30708eda0 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -9,8 +9,8 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.io.IOException; diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index bc70bab28..3c10ee57e 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -1,8 +1,8 @@ package io.ebeanservice.docstore.api.support; -import io.ebean.DocStoreQueueEntry; import io.ebean.DB; import io.ebean.Database; +import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; @@ -13,9 +13,7 @@ import org.tests.model.basic.Order; 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 { diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index 42832258a..e353f1a01 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -1,14 +1,14 @@ package io.ebeanservice.docstore.api.support; -import io.ebean.DocStoreQueueEntry; import io.ebean.DB; import io.ebean.Database; +import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import org.tests.model.basic.Order; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java index 28ca8c5de..0148551a6 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java @@ -1,12 +1,12 @@ package misc.migration.history.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - /** * detects a bug where dropHistoryTable is not applied correctly * diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java index 1d57570bf..b05ccab94 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java index c8147fdcd..96e588017 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index e1c16afd6..6e895a2f1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java index f2db733e7..834099a10 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java @@ -1,16 +1,16 @@ package misc.migration.v1_0; +import io.ebean.annotation.EnumValue; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; - @Entity @Table(name = "migtest_e_enum") public class EEnum { - + public enum Status { @EnumValue("N") NEW, @@ -21,9 +21,9 @@ public class EEnum { @EnumValue("I") INACTIVE, } - + @Id Integer id; - + Status testStatus; } diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java index d8c76df75..d29a2c45b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java @@ -1,13 +1,13 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java index b5e41db5d..1224581a7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java index aba167995..ce1b464e1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java index 133a00c3d..a6e5f5ee6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java index c95eb7796..9a1fd23b7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java @@ -1,13 +1,13 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java index f4cfdf875..46103c173 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java @@ -1,23 +1,22 @@ package misc.migration.v1_0; -import java.util.List; +import io.ebean.annotation.Index; +import io.ebean.annotation.NotNull; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import java.util.List; @Entity @Table(name = "migtest_e_ref") public class ERef { - + @Id Integer id; - + @OneToMany List basics; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java index e331399ed..5c039bb06 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java @@ -1,12 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java index 07a523039..deed36868 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java index dae77dd67..5cac1da05 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 9e5b1742d..0c2e5cde1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -1,18 +1,10 @@ package misc.migration.v1_1; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index 9cad6715c..d949d4838 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -1,15 +1,15 @@ package misc.migration.v1_1; +import io.ebean.annotation.DbComment; +import io.ebean.annotation.DbMigration; +import io.ebean.annotation.History; +import io.ebean.annotation.Platform; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Platform; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java index 7b05d9fe7..951173c5c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java @@ -1,16 +1,16 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.Size; + @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java index a3756572a..e8ab4ecc8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java @@ -1,13 +1,13 @@ package misc.migration.v1_1; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java index ba5628390..1ac4d4508 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_1; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java index 9bb9aba0b..f10731489 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java @@ -1,14 +1,14 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java index c05f51a15..171772b0d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java @@ -1,14 +1,14 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java index 3213ddcd3..7c23cc540 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java @@ -1,22 +1,22 @@ package misc.migration.v1_1; +import io.ebean.annotation.SoftDelete; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.SoftDelete; - @Entity @Table(name = "migtest_e_softdelete") public class ESoftdelete { - + @Id Integer id; - - + + String testString; - + @SoftDelete boolean deleted; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 7cf239f91..bdcd43845 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -1,11 +1,10 @@ package misc.migration.v1_1; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; +import java.util.List; @Entity @Table(name = "migtest_mtm_c") @@ -38,7 +37,7 @@ public class MtmChild { public List getMasters() { return masters; } - + public void setMasters(List masters) { this.masters = masters; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 067d396dc..ecc97bbe7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -1,11 +1,10 @@ package misc.migration.v1_1; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; +import java.util.List; @Entity @Table(name = "migtest_mtm_m") @@ -38,7 +37,7 @@ public class MtmMaster { public List getChildren() { return children; } - + public void setChildren(List children) { this.children = children; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java index f44bbaa9d..80de9b999 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java @@ -1,10 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java index 8cdb2a38a..de1e43003 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java index 809b17f76..38b64fee7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index eb2a16d9e..8ebd0776a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java index 26f2a5d31..b77161f21 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java @@ -1,16 +1,16 @@ package misc.migration.v1_2; +import io.ebean.annotation.EnumValue; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; - @Entity @Table(name = "migtest_e_enum") public class EEnum { - + public enum Status { @EnumValue("N") NEW, @@ -21,9 +21,9 @@ public class EEnum { @EnumValue("I") INACTIVE, } - + @Id Integer id; - + Status testStatus; } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java index 18a2c17fe..2647b7af4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java @@ -1,13 +1,13 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java index f945e6e7b..2e31ad85c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java index 083928e5c..c556f2c47 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java index 9de9206a0..957ba43f4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java index 1d886ccb2..7c321b580 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java @@ -1,14 +1,14 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java index df16ba21c..66ef3e373 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java @@ -1,23 +1,22 @@ package misc.migration.v1_2; -import java.util.List; +import io.ebean.annotation.Index; +import io.ebean.annotation.NotNull; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import java.util.List; @Entity @Table(name = "migtest_e_ref") public class ERef { - + @Id Integer id; - + @OneToMany List basics; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java index 798fd7fd3..32b65492a 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java @@ -1,10 +1,6 @@ package org.tests.aggregateformula; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 8d5707da1..c51e7ff58 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -6,11 +6,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java index 1a7f8375c..a45243287 100644 --- a/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java +++ b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java @@ -14,7 +14,8 @@ import org.tests.model.basic.TSMaster; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Used to run some tests manually on a specific Database type. diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 23794b476..547483ceb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -25,9 +25,7 @@ import java.util.Set; import static io.ebean.annotation.Platform.H2; import static io.ebean.annotation.Platform.POSTGRES; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestAnnotationBase extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index 219cdc63b..d32d86d4c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java index 7a003e1eb..a619cebce 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java index 1823cc8f1..efe924f85 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; public class TestBatchLazyMany extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 76d170d6f..74e2441a5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java index 1d526b52e..4365d4860 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -2,7 +2,6 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index 955b8b199..ef0717cdb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -2,11 +2,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index ba2e50621..16ba29c32 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 9db52ad7f..dfe431246 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index d130bf67d..433fb270c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 6c86524c4..824f6bca3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TMapSuperEntity; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java index 8197c1bfc..3b049591b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.embedded.EMain; import org.junit.jupiter.api.Test; +import org.tests.model.embedded.EMain; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 11d94f3d2..35c137540 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -3,9 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java index 80a2c24ca..afc456e04 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -3,10 +3,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.MyEBasicConfigStartup; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index df3b48d8f..2ebc4dab4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -2,15 +2,12 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; -import io.ebean.test.LoggedSql; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java index f80c513c7..a42667b7d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java @@ -3,12 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInEmpty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java index 2df6b2667..c4b12d8e7 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java index d2bbdd893..30b98d23b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java @@ -6,9 +6,9 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; -import org.tests.model.basic.TJodaEntity; import org.joda.time.LocalTime; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TJodaEntity; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java index f9548cc36..70a2290c1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -2,12 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Address; -import org.tests.model.basic.Car; -import org.tests.model.basic.Trip; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.sql.Timestamp; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index beb486ed9..c96373de3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java index fce2ed0ba..5722ffbbb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -3,9 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; public class TestM2MCascadeOne extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java index 00aac40f4..10591aa09 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java index eab068fec..7f601523a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -2,12 +2,12 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.interfaces.Address; import org.tests.model.interfaces.IAddress; import org.tests.model.interfaces.IPerson; import org.tests.model.interfaces.Person; -import org.junit.jupiter.api.Test; public class TestManyOneInterface extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java index a43efaccf..6c6f34fa1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TMapSuperEntity; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index 1aef8eb4f..71007df58 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -2,11 +2,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.Platform; import io.ebean.annotation.IgnorePlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; diff --git a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java index ea0fb44b7..030d4e3a4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.MNonUpdPropEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MNonUpdPropEntity; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java index 848a9dde7..a552f0a92 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -3,11 +3,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 6c1fdb0c4..2d8263759 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 9d9d8becd..e18c55c57 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index bf53599b9..1347da7e2 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -1,11 +1,6 @@ package org.tests.basic; -import io.ebean.AcquireLockException; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java index 08db38a0b..63dec52d1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -8,11 +8,10 @@ import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestQueryWithCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index f7cb9eadd..c9b687fae 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -4,11 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.Iterator; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 320f16ea0..75208a534 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 660366c12..e7e23283d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index 23d1f1a68..bf98a2d00 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java index 8ea4d3f86..9edd48cac 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-test/src/test/java/org/tests/basic/TestTransient.java @@ -10,10 +10,7 @@ import java.sql.Types; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestTransient extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java index cf40d4890..c00635678 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java index cf0c7ade7..95cfce6d1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TUuidEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TUuidEntity; public class TestUuidInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 9a4b48729..1c554e093 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java index ad2f35453..f0989b7ac 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -3,11 +3,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index f2f2679f4..99197ac98 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -3,11 +3,11 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 83003b889..17af48c3c 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -3,11 +3,11 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index e0f401256..143aa059c 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -6,8 +6,8 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncryptRelate; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index b4ed0fb0a..54f26782e 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -3,8 +3,8 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TWithPreInsert; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TWithPreInsert; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index b8376087a..01da50bbe 100644 --- a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -2,11 +2,10 @@ package org.tests.basic.join; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index eaf598cf4..9068b760a 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.tests.model.basic.EBasicClobFetchEager; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicClobFetchEager; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index 66b741523..7289a7ac2 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -3,9 +3,9 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.EBasicClobNoVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicClobNoVer; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java index 1bba53a87..092924ed1 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -2,8 +2,8 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TBytesOnly; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TBytesOnly; public class TestByteOnly extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java index 20a6c468e..fb5369233 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,16 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java index 631863de5..7687f56d8 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,14 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "drel_invoice") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 8a26d64de..ab4f0c4ba 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -4,9 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestOne2OneBookingInvoice extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java index 98ded2763..a26f18257 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,14 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "tire") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java index 2f07043dc..01b617d0d 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,13 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "wheel") diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index 854f0a574..133adada4 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -2,8 +2,8 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.ESomeType; import org.junit.jupiter.api.Test; +import org.tests.model.basic.ESomeType; import java.util.Currency; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index d70bdd3b1..5229806e5 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -2,8 +2,8 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index ac113e3a1..65b7b8005 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,19 +1,14 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DtoQuery2Test; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; -import io.ebeaninternal.api.SpiTransaction; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java index cc89ca3d4..f20e9bf91 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java @@ -4,11 +4,7 @@ import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; -import org.tests.batchinsert.o2o.MeterAddressData; -import org.tests.batchinsert.o2o.MeterContractData; -import org.tests.batchinsert.o2o.MeterSpecialNeedsClient; -import org.tests.batchinsert.o2o.MeterSpecialNeedsContact; -import org.tests.batchinsert.o2o.MeterVersion; +import org.tests.batchinsert.o2o.*; public class TestBatchInsertOneToOne { private MeterVersion build(){ diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 61a405681..b8c041f5b 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -2,7 +2,6 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java index d91cc475e..9357a2668 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java @@ -1,9 +1,10 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.Entity; import javax.persistence.Id; +import java.util.UUID; @Entity public class MeterAddressData { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java index 537dc411b..f4112c746 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java @@ -1,11 +1,12 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterContractData { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java index d042b5dff..c2c6375c2 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java @@ -1,10 +1,10 @@ package org.tests.batchinsert.o2o; -import java.util.UUID; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterSpecialNeedsClient { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java index 029868433..e75f24aeb 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java @@ -1,8 +1,8 @@ package org.tests.batchinsert.o2o; -import java.util.UUID; import javax.persistence.Entity; import javax.persistence.Id; +import java.util.UUID; @Entity public class MeterSpecialNeedsContact { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java index 49ce21860..8339ca353 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java @@ -1,11 +1,12 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterVersion { diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java index 1bfcf92ef..dfca84655 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -3,15 +3,10 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; -import io.ebean.FetchConfig; import io.ebean.Transaction; -import org.tests.basic.MyTestDataSourcePoolListener; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.basic.MyTestDataSourcePoolListener; +import org.tests.model.basic.*; import java.util.ArrayList; import java.util.Collections; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index aad2db190..879fb1097 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.tests.model.basic.UUOne; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java index d0179d210..8dd286907 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -3,11 +3,11 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 8381f78f4..d819dbe2f 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,12 +1,10 @@ package org.tests.batchload; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 8137164a1..6766cfe9a 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -2,8 +2,8 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import javax.persistence.EntityNotFoundException; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 7e20c0990..0eabc9570 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -2,8 +2,8 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import javax.persistence.EntityNotFoundException; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 182800f35..deae22962 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -2,11 +2,11 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; +import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import io.ebean.test.LoggedSql; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java index 4f5e38abf..64a88e1f1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -5,11 +5,11 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 3814e262e..03386f656 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -2,7 +2,6 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index d632e1039..ac0127398 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -2,7 +2,6 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 837341de1..ffa0a5608 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,6 +1,9 @@ package org.tests.batchload; -import io.ebean.*; +import io.ebean.DB; +import io.ebean.Query; +import io.ebean.QueryIterator; +import io.ebean.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -10,9 +13,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestSecondaryQueries extends TransactionalTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 905af3d8a..069287b91 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -9,9 +9,7 @@ import org.tests.model.basic.OCachedBean; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; /** * Test class testing clearing cache with delete query diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java index 042c02d51..59e54d538 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 575d9f3b6..4f22cff59 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -1,33 +1,17 @@ package org.tests.cache; -import io.ebean.BaseTestCase; -import io.ebean.CacheMode; -import io.ebean.DB; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; -import io.ebean.Update; +import io.ebean.*; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.server.cache.CachedManyIds; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.OBeanChild; -import org.tests.model.basic.OCachedBean; -import org.tests.model.basic.OCachedBeanChild; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestCacheCollectionIds extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java index bb3c01e6e..829d07279 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -4,11 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java index 415591b14..225a7ac38 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -2,9 +2,9 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedInhChildA; import org.tests.model.basic.OCachedInhRoot; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java index 48baaaadb..1da96116a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -11,9 +11,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestCacheNaturalId extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java index 83686b795..a6a52c38b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index 8c70e5922..c65383dc0 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -8,9 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java index 40eee3349..fdeb6f30d 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java @@ -1,13 +1,12 @@ package org.tests.cache; -import static org.assertj.core.api.Assertions.assertThat; - +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; import org.tests.model.cache.M2MCacheMaster; -import io.ebean.BaseTestCase; -import io.ebean.DB; +import static org.assertj.core.api.Assertions.assertThat; public class TestM2MCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 890a70b0b..bafb239eb 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -2,7 +2,6 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 677baec98..292a361af 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -11,9 +11,7 @@ import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCacheInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index 602809718..8f08e776c 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -1,19 +1,15 @@ package org.tests.cache; -import io.ebean.BaseTestCase; -import io.ebean.CacheMode; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; - -import org.tests.model.basic.EBasicVer; +import io.ebean.*; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Map; import java.util.Set; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestQueryCacheReadOnly extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java index 064b76890..fd58c7d5c 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java @@ -2,12 +2,7 @@ package org.tests.cache.embeddedid; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java index 933bb076f..6ead0106b 100644 --- a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -5,8 +5,8 @@ import io.ebean.CallableSql; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java index 7e0dd4df3..093a2946f 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java @@ -2,11 +2,7 @@ package org.tests.cascade; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java index 8607084d3..89141a345 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java @@ -1,10 +1,6 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java index 170f194b0..29e494539 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java @@ -1,13 +1,8 @@ package org.tests.cascade; +import javax.persistence.*; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; - @Entity public class RelDetail { diff --git a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java index e7a736b0f..06bf64f18 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java @@ -1,10 +1,6 @@ package org.tests.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class RelMaster { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index 853ff3ae2..c1eca9d9b 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -2,12 +2,11 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.Transaction; - -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.List; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; public class TestMasterDetailDelete extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 35aad8927..94cc8b6f7 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -2,7 +2,6 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index 43ccfd776..66f14e982 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -3,10 +3,10 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; -import org.tests.model.basic.TSDetail; -import org.tests.model.basic.TSMaster; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 5924c9d4f..376389835 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -2,9 +2,9 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index 0fe581597..f265bf341 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -2,9 +2,9 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.jupiter.api.Test; import javax.persistence.OptimisticLockException; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index b796d5c05..4545424d2 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; import org.tests.model.composite.ROrder; import org.tests.model.composite.ROrderPK; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 7c0f3c955..26db614db 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index 77344808f..bcaf57f4a 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -2,9 +2,9 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.CaoBean; import org.tests.compositekeys.db.CaoKey; -import org.junit.jupiter.api.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index c3472f57c..e637a0465 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -9,15 +9,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -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 javax.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java index 441035b6a..8638fe610 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,10 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class CaoBean { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java index 1b0aa526b..9aca96574 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,13 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class Item { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java index b9822b807..79d541673 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,10 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import javax.persistence.*; @Entity public class ParcelLocation { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java index e75aae7de..be0891ac8 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,11 +1,6 @@ package org.tests.compositekeys.db; -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 javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java index 4cbe63fec..a6defdc4e 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java @@ -1,7 +1,6 @@ package org.tests.compositekeys.db; import io.ebean.annotation.Identity; -import io.ebean.annotation.IdentityGenerated; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java index 298d6bc4b..bfd160d98 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,13 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 0c4a56d67..9a90095bf 100644 --- a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -5,8 +5,8 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; -import org.tests.model.basic.MProtectedConstructBean; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MProtectedConstructBean; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 8927ded5d..e01f736f8 100644 --- a/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -6,15 +6,16 @@ import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.ddd.DPerson; import org.tests.model.ivo.Money; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Currency; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestDPersonEl { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java index 148e219b9..5d95be203 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java @@ -1,11 +1,6 @@ package org.tests.ddl; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class DfkNoneViaJoin { diff --git a/ebean-test/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java index e1c8d0144..22a0e1b3a 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcMaster.java +++ b/ebean-test/src/test/java/org/tests/delete/DcMaster.java @@ -1,10 +1,6 @@ package org.tests.delete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index 2db15fdee..dc563f1a2 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -1,8 +1,8 @@ package org.tests.delete; import io.ebean.BaseTestCase; -import org.tests.model.onetoone.Account; import org.junit.jupiter.api.Test; +import org.tests.model.onetoone.Account; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index c1bd19cbb..4e826b584 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -1,19 +1,11 @@ package org.tests.delete; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.BBookmarkUser; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java index d3729226c..ecea5c295 100644 --- a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -1,10 +1,8 @@ package org.tests.docstore; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; - +import io.ebean.BaseTestCase; +import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; @@ -12,8 +10,9 @@ import org.tests.model.basic.ResetBasicData; import org.tests.model.docstore.CustomerReport; import org.tests.model.docstore.ProductReport; -import io.ebean.BaseTestCase; -import io.ebean.text.json.JsonReadOptions; +import java.util.Arrays; + +import static org.assertj.core.api.Assertions.assertThat; public class CustomerReportTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index fd6f0f0f3..f21d12225 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -15,7 +15,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertTrue; public class DocLinkTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java index 5c5613a28..13540041c 100644 --- a/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -4,8 +4,8 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.PagedList; import io.ebean.Query; -import org.tests.model.draftable.Link; import org.junit.jupiter.api.Test; +import org.tests.model.draftable.Link; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java index c29d8b70b..9fd4d619b 100644 --- a/ebean-test/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-test/src/test/java/org/tests/el/TestELBasic.java @@ -3,15 +3,11 @@ package org.tests.el; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.deploy.BeanFkeyProperty; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.*; import io.ebeaninternal.server.el.ElPropertyChain; import io.ebeaninternal.server.el.ElPropertyDeploy; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/el/TestPathExpression.java b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java index 26fa4e0e4..3c7e87c26 100644 --- a/ebean-test/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java @@ -5,10 +5,10 @@ import io.ebean.bean.EntityBean; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; import io.ebean.plugin.SpiServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java index 5cffc6f19..2646707e6 100644 --- a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -3,10 +3,8 @@ package org.tests.el; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; +import org.tests.model.basic.Customer; public class TestUnderscoreParam extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index ef33658fd..1360c1cb6 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -1,9 +1,9 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index fc12e6ea1..3a945c8e7 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -3,9 +3,9 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java index 239e4f77b..485428b79 100644 --- a/ebean-test/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-test/src/test/java/org/tests/family/TestInheritance.java @@ -13,10 +13,7 @@ import org.tests.model.family.ChildPerson; import org.tests.model.family.GrandParentPerson; import org.tests.model.family.ParentPerson; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestInheritance extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java index d18f8fa2d..c44fea1fa 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -2,8 +2,8 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.EGenProps; import org.junit.jupiter.api.Test; +import org.tests.model.EGenProps; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index c26692fb1..00c3b03cb 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -3,14 +3,12 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MyCurrentUserProvider; -import org.tests.model.EWhoProps; import org.junit.jupiter.api.Test; +import org.tests.model.EWhoProps; import org.tests.model.generated.User; import org.tests.model.generated.WhoPropsOneToMany; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; public class TestGeneratedWho extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java index d3ef275fc..5f2b96fb3 100644 --- a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -3,8 +3,8 @@ package org.tests.genkey; import io.ebean.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index f3e26c876..c78e49c6e 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -1,11 +1,6 @@ package org.tests.history; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.Transaction; -import io.ebean.Version; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index c6672bc67..537c2fe4b 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -14,9 +14,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class TestGeneratedKeys extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java index d6fb39d36..e6b2fbad8 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,15 +1,15 @@ package org.tests.idkeys; +import io.ebean.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; -import io.ebean.BaseTestCase; - -import static org.junit.jupiter.api.Assertions.*; - import java.sql.SQLException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test lazy loading */ diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java index 1b491a9bd..f67cd5041 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java @@ -1,12 +1,6 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "dint_parent") diff --git a/ebean-test/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java index 616beefec..0f20e16c3 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Data.java +++ b/ebean-test/src/test/java/org/tests/inherit/Data.java @@ -1,10 +1,6 @@ package org.tests.inherit; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java index f9c8960f7..6dbe92089 100644 --- a/ebean-test/src/test/java/org/tests/inherit/EUncle.java +++ b/ebean-test/src/test/java/org/tests/inherit/EUncle.java @@ -1,10 +1,6 @@ package org.tests.inherit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "rawinherit_uncle") diff --git a/ebean-test/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java index ff1dfb140..4eac1553a 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Parent.java +++ b/ebean-test/src/test/java/org/tests/inherit/Parent.java @@ -1,13 +1,6 @@ package org.tests.inherit; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java index 2a8449c8e..8a3964f9e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java +++ b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,10 +1,6 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import javax.persistence.*; /** */ diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java index 3582a7b7d..613637800 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java @@ -1,16 +1,10 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotNull; - import io.ebean.annotation.Index; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + /** * Model class to reference an organization node. * diff --git a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java index 4ae802112..c5ac10b64 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java +++ b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,11 +1,6 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java index aab913688..6dbe29216 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -3,17 +3,11 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Car; -import org.tests.model.basic.CarAccessory; -import org.tests.model.basic.CarFuse; -import org.tests.model.basic.Truck; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestInheritInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index a4a0547e2..0f72ec0e6 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -1,10 +1,10 @@ package org.tests.inheritance; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index 1f2301da0..deb32300f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -3,8 +3,6 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.DB; -import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.CalculationResult; import org.tests.inheritance.model.Configurations; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 228e3ed47..1be175266 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -6,11 +6,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Animal; -import org.tests.model.basic.AnimalShelter; -import org.tests.model.basic.BigDog; -import org.tests.model.basic.Cat; -import org.tests.model.basic.Dog; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index e6d7d7dc9..57e36f9f6 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -3,7 +3,6 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 33e1afe81..a041117ac 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,15 +1,14 @@ package org.tests.inheritance; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - +import io.ebean.BaseTestCase; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; -import org.junit.jupiter.api.Test; -import io.ebean.BaseTestCase; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritanceRefBean extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java index 438f18cb3..a67d6a764 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -3,9 +3,9 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TIntChild; import org.tests.model.basic.TIntRoot; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java index 37c7fc9b1..3f9f870ed 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java @@ -2,12 +2,12 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.AttributeHolder; -import org.tests.model.basic.ListAttribute; -import org.tests.model.basic.ListAttributeValue; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.AttributeHolder; +import org.tests.model.basic.ListAttribute; +import org.tests.model.basic.ListAttributeValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index 05fdb92e7..b9391055c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -2,11 +2,10 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; - public class TestTreeOrganisations extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java index 334752405..c4c3d0202 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java @@ -1,12 +1,6 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "block") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java index fdcbf0a3f..7e376add8 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java @@ -1,12 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java index 9ea1f90a7..88b2de299 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java @@ -1,11 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index a87ebd3ff..aea64c388 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -3,9 +3,9 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java index d9d9ab08e..76d9ddc0c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java @@ -1,10 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.PreRemove; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 0f580744a..899381d4e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,17 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java index 8bc2dbf1a..5ef6ef7c8 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,10 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 05860052c..3d32d3d05 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestInheritAbstract { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java index 9cde2d7f3..6d315b65a 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,10 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java index 408d764ff..e28fe6b66 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java @@ -1,10 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java index 9a711b781..0d3679d91 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java @@ -2,8 +2,8 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index c4c0095df..1794098e6 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -3,7 +3,6 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DataIntegrityException; -import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -11,8 +10,6 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; - import static org.junit.jupiter.api.Assertions.assertThrows; public class TestInsertDataIntegrityException extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 87a427a65..8682874dc 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -1,10 +1,9 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import io.ebean.DuplicateKeyException; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.annotation.Transactional; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 0615e42f6..436f2e6b4 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -2,9 +2,9 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.orderentity.OrderEntity; import org.tests.model.orderentity.OrderItemEntity; -import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index fb2af986b..4b57bede3 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -2,7 +2,6 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java index d478dcbeb..b86cc5e5c 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -2,9 +2,9 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.info.InfoCompany; import org.tests.model.info.InfoCustomer; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 306f1cdbc..3741a2d55 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -3,8 +3,8 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 7fd2ee8ce..ff9c3216c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -10,11 +10,7 @@ import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.json.EBasicJsonJackson3; -import org.tests.model.json.EBasicJsonList; -import org.tests.model.json.EBasicJsonMulti; -import org.tests.model.json.PlainBean; -import org.tests.model.json.PlainBeanDirtyAware; +import org.tests.model.json.*; import java.util.Arrays; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 984cf4454..ce84f08b3 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -4,18 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebean.text.TextException; import io.ebean.test.LoggedSql; +import io.ebean.text.TextException; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; import javax.persistence.PersistenceException; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index ffbe90185..e186de792 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -3,10 +3,10 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.text.json.EJson; import io.ebean.test.LoggedSql; -import org.tests.model.json.EBasicJsonMap; +import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMap; import org.tests.model.json.EBasicJsonMapDetail; import java.io.IOException; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java index 0fc2ff68c..d73f27625 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapBlob; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapBlob; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java index fb69a3e53..c87ad37f4 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapClob; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapClob; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java index 76226c209..66e28b5f9 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapJsonB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapJsonB; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java index 46ced092a..551040e72 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapVarchar; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapVarchar; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java index 48a78a3ce..77bdfbb1c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -3,24 +3,21 @@ package org.tests.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.json.EBasicJsonNode; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeBasic extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java index c910a5115..0e349ff26 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeBlob; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 292dc2807..f863981f6 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeJsonB; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 105e0eacd..c2de2026a 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeVarchar; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java index 6f483933b..4ab61389b 100644 --- a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -2,8 +2,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.json.EBasicJsonUnmapped; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonUnmapped; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index 8186ba1b5..dcab59dcf 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index 5bc591256..846717a3c 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.json.EBasicJsonMap; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMap; import java.util.LinkedHashMap; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index e674504bb..5a24b7539 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.basic.AttributeHolder; import org.junit.jupiter.api.Test; +import org.tests.model.basic.AttributeHolder; import java.util.LinkedHashSet; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java index ed1b5b9b8..5da6413bf 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.json.transientproperties.EJsonTransientObject; import org.junit.jupiter.api.Test; +import org.tests.json.transientproperties.EJsonTransientObject; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index 1047a5dcf..03f7ac156 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -4,9 +4,9 @@ import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.json.transientproperties.EJsonTransientEntityList; import org.tests.json.transientproperties.EJsonTransientList; -import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index c835041c2..a3d937a77 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -1,7 +1,7 @@ package org.tests.json.transientproperties; -import io.ebean.annotation.Sql; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 6b4740512..5da5ffdbf 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -2,11 +2,7 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 76baa16fa..9d88e84ed 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -2,10 +2,9 @@ package org.tests.lazyforeignkeys; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Query; -import io.ebean.text.PathProperties; import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java index 4ddd33314..16f79a6ee 100644 --- a/ebean-test/src/test/java/org/tests/level/Level1.java +++ b/ebean-test/src/test/java/org/tests/level/Level1.java @@ -1,11 +1,6 @@ package org.tests.level; -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 javax.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java index d49732c0c..76d1339f4 100644 --- a/ebean-test/src/test/java/org/tests/level/Level2.java +++ b/ebean-test/src/test/java/org/tests/level/Level2.java @@ -1,11 +1,6 @@ package org.tests.level; -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 javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java index aa1ce507e..73675df63 100644 --- a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -2,11 +2,11 @@ package org.tests.level.test; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.level.Level1; import org.tests.level.Level2; import org.tests.level.Level3; import org.tests.level.Level4; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 452998032..9700a1229 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.EBasicWithLifecycle; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicWithLifecycle; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index b3bd52fa2..48efd17ec 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -2,14 +2,13 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasicWithLifecycleExceptions; import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import java.io.IOException; +import org.tests.model.basic.EBasicWithLifecycleExceptions; import javax.persistence.PersistenceException; +import java.io.IOException; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestLifecycleExceptions extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 97b07b941..67841cff6 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -1,16 +1,15 @@ package org.tests.lifecycle; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; -import java.util.List; - +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; import org.tests.model.basic.EBasicWithLog; -import io.ebean.BaseTestCase; -import io.ebean.DB; +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; public class TestLifecycleWithLog extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index 0011b53bc..b60af0b06 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -2,10 +2,10 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; -import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index 2dbfa06f0..6d996c61c 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -2,9 +2,9 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index fbe5ca783..425ae3812 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -2,9 +2,9 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MailBox; import org.tests.model.m2m.MailUser; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 5d5c85ca7..0cd6ca95d 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -2,8 +2,8 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.m2m.MnyTopic; import org.junit.jupiter.api.Test; +import org.tests.model.m2m.MnyTopic; /** * Added to test DDL generation for ManyToMany related back to itself. diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index 655537e4b..43928257d 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -1,12 +1,8 @@ package org.tests.merge; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchPath; -import io.ebean.MergeOptions; -import io.ebean.MergeOptionsBuilder; -import io.ebean.text.PathProperties; +import io.ebean.*; import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java index afc915bb9..af12d5787 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java @@ -2,11 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java index e967f3150..58eae294d 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java @@ -2,12 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java index 54c8eb0a4..d88df603d 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java @@ -1,11 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java index d8015931f..66d3677f3 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java @@ -2,12 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 6b62e6255..0ff6f57e1 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -8,11 +8,7 @@ import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index 0a9f7ffb7..69328ce15 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -11,11 +11,7 @@ import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java index 3b68776bd..98234699a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Address.java @@ -3,12 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java index 62e893506..069b1e4cf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Animal.java @@ -1,13 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java index 49efb2b6e..d660c93f0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance() diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java index 3e18cb56d..9cc71440d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; /** * A user may have multiple bookmarks diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java index 36ef22ab8..1b1cb0a81 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java index 9bf17245e..268920a34 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Car.java @@ -2,13 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index 4612fbf14..883d27d5c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -1,21 +1,10 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; import io.ebean.annotation.Index; +import io.ebean.annotation.*; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java index c2de046f1..bde38fc78 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Country.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.CacheBeanTuning; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.ReadAudit; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 4f8c7d206..0b4f98539 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -1,24 +1,9 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbEnumValue; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.JsonIgnore; -import io.ebean.annotation.Where; +import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java index 278328f92..603102032 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java @@ -7,7 +7,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java index 0ac02e749..214a2447f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -1,25 +1,16 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.ReadAudit; -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.WhenModified; -import io.ebean.annotation.WhoCreated; -import io.ebean.annotation.WhoModified; +import io.ebean.annotation.*; +import org.tests.model.json.PlainBean; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; import javax.validation.constraints.Size; - -import org.tests.model.json.PlainBean; +import java.sql.Timestamp; import static io.ebean.annotation.MutationDetection.SOURCE; -import java.sql.Timestamp; - @Cache(enableQueryCache = true) @ReadAudit @ChangeLog(updatesThatInclude = {"name", "shortDescription", "plainBean"}) @@ -52,7 +43,7 @@ public class EBasicChangeLog { @Version Long version; - + @DbJson(length = 500, mutationDetection = SOURCE) // such that we can rebuild old values PlainBean plainBean; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index b95d56bf8..4ae5a6b1d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import javax.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java index 31cbcab7a..3fb5cc9e4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import java.sql.Date; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index bd13f97e2..77c6b2f2b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java index 64426c075..f77af37f5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index f375b9823..44902ed31 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -6,17 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_withlife") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java index 76c1f00f0..e5df815e9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java @@ -5,17 +5,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_with_ex") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java index 3ff7634f0..eee062e94 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java @@ -6,17 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_withlog") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 4766414dc..20a1326b2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,13 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java index fdf1aa9e5..a827bc5b4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import javax.persistence.*; @Entity public class ESimple { diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java index 5d9c1aeee..3f426696d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java @@ -1,6 +1,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; + import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index bae5aa6dc..3e6ebfaec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "non_updateprop") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java index 280a91ce0..c66a1db60 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MRole.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java index a2e1a701c..7abf2ec60 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUser.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java index f34eb753d..aa71e9497 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java index d189decb2..df731191e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 10c1bc385..2534a6ebf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class MyLobSizeJoinMany { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index 7879b5251..abe945bb5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java index 1027070cc..ef6acaec8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java @@ -1,12 +1,12 @@ package org.tests.model.basic; +import io.ebean.annotation.Cache; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.Table; -import io.ebean.annotation.Cache; - /** * Cached entity for inheritance. * diff --git a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java index fc3a4cc8f..cb239a007 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java @@ -4,7 +4,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; import javax.persistence.Version; - import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java index 955807fab..9f758cf21 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; - +import javax.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java index 8d4060cc6..6face7896 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,11 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java index 39496a703..d58d0f681 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Person.java @@ -1,14 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java index 3ba7b3ebe..736e748af 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Phone.java @@ -1,14 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java index 30f5b62b1..60f73475c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Product.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.CacheQueryTuning; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.Identity; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java index 6330543d3..039541188 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Section.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java index 22551e37a..80c0f8d36 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; +import javax.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java index db7d3d89c..e71c03998 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,14 +1,8 @@ package org.tests.model.basic; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; - @Entity @Inheritance @DiscriminatorColumn(name = "my_type", length = 3, discriminatorType = DiscriminatorType.INTEGER) diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java index aa3943278..543958ed7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,10 +1,9 @@ package org.tests.model.basic; -import java.io.Serializable; - import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import javax.persistence.Version; +import java.io.Serializable; @MappedSuperclass public class TMappedSuper2 implements Serializable { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java index 2898ad07e..50667a784 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java @@ -3,12 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Index; import io.ebean.annotation.Platform; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java index 7861490ff..6ef9960ba 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,12 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java index 1c7778734..c32d70777 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Truck.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java index 7aa42e28a..07c5fec39 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java index 53c88446a..6a97b4fed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java index f446fe397..1c9116065 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java index ba5130156..72fbc08cf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java @@ -1,24 +1,9 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbEnumValue; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.JsonIgnore; -import io.ebean.annotation.View; -import io.ebean.annotation.Where; +import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java index 63e918724..fcfb8479f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java @@ -1,8 +1,7 @@ package org.tests.model.basic.cache; -import org.tests.model.basic.BasicDomain; - import io.ebean.annotation.Cache; +import org.tests.model.basic.BasicDomain; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java index fb96be1d3..bed1d44ab 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import java.util.UUID; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -8,8 +8,7 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; - -import io.ebean.annotation.Cache; +import java.util.UUID; @Entity @Cache(enableQueryCache = true, enableBeanCache = false) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java index 5c9925c35..7c458bd12 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java @@ -1,13 +1,12 @@ package org.tests.model.basic.cache; -import java.util.UUID; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.validation.constraints.Size; - -import io.ebean.annotation.Cache; +import java.util.UUID; @Entity @Cache(enableQueryCache = true, enableBeanCache = false) diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java index 8c848ed10..d6c96c825 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/First.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/First.java @@ -1,10 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "f_first") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java index ca015b149..dd3ffd624 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java @@ -1,10 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java index ce1d7a68d..5f73cc56c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java +++ b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java @@ -1,11 +1,7 @@ package org.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 java.lang.annotation.*; /** * Meta-Annotation that defines @Size(max=100) diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java index 1c8301889..3f38c166e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -8,9 +8,7 @@ import io.ebean.annotation.TxType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DummyDao { diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java index ccbb77d38..c405b9ed7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,11 +1,6 @@ package org.tests.model.basic.xtra; -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 javax.persistence.*; @Entity @Table(name = "td_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java index 5347430fc..1f401072c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,18 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index aec8a8e39..9b9b13028 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -12,8 +12,6 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java index e3c57c10d..f8eb5b2a3 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java index ef93cc984..9d4b37f1b 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java index a23eff0d3..99b3143b7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java index 4d7a84f95..ceda12349 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java @@ -1,6 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.IdClass; +import javax.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 0b0520dca..78952eb7a 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -2,7 +2,6 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java index d40b26a63..07b3b9a91 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java @@ -1,10 +1,10 @@ package org.tests.model.cache; +import io.ebean.annotation.Cache; + import javax.persistence.Entity; import javax.persistence.Id; -import io.ebean.annotation.Cache; - @Entity @Cache(enableQueryCache = true, enableBeanCache = true) public class M2MCacheChild { @@ -30,4 +30,4 @@ public class M2MCacheChild { this.name = name; } -} \ No newline at end of file +} diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java index 5eedc2994..d422eb5a4 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java @@ -1,16 +1,11 @@ package org.tests.model.cache; +import io.ebean.annotation.Cache; + +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; - -import io.ebean.annotation.Cache; - @Entity @Cache(enableQueryCache = true, enableBeanCache = true) public class M2MCacheMaster { diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java index 65981f46b..7da07463b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java @@ -2,14 +2,7 @@ package org.tests.model.carwheel; import io.ebean.annotation.Aggregation; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java index 9561cb796..886ea8d53 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,11 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "sa_tire") diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java index 3390f6dd4..402f90788 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,14 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "sa_wheel") diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java index 988ab4666..3479c3a65 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -2,15 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import javax.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java index 86529a19c..746a2233b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,11 +1,6 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java index 74f9e8248..d9f917421 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java @@ -2,11 +2,7 @@ package org.tests.model.carwheeltruck; import org.tests.model.basic.EBasic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java index 59cd53edb..d19b742db 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java @@ -1,11 +1,6 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class CkeClient { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java index 2d4456ce9..4a897c1b6 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java @@ -4,7 +4,6 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.Size; - import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java index 09939ead3..de55f7c1a 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java @@ -4,7 +4,6 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.Size; - import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java index 0b543321a..b5b48bcd9 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java @@ -1,13 +1,6 @@ package org.tests.model.composite; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java index 7fe9bcfdf..0caada259 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,11 +3,7 @@ package org.tests.model.converstation; import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java index 74ffb0e92..4deef720b 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java @@ -1,18 +1,16 @@ package org.tests.model.docstore; -import java.util.List; +import io.ebean.annotation.DocStore; +import org.tests.model.basic.Customer; import javax.persistence.DiscriminatorValue; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; - -import org.tests.model.basic.Customer; - -import io.ebean.annotation.DocStore; +import java.util.List; /** * Entity that will stored as JSON in database - * + * * @author Roland Praml, FOCONIS AG * */ diff --git a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java index 605ccde9a..194fa8385 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java @@ -1,19 +1,18 @@ package org.tests.model.docstore; +import io.ebean.annotation.DocStore; +import org.tests.model.basic.Product; + import javax.persistence.DiscriminatorValue; import javax.persistence.ManyToOne; -import org.tests.model.basic.Product; - -import io.ebean.annotation.DocStore; - @DocStore @DiscriminatorValue("PR") public class ProductReport extends Report { @ManyToOne private Product product; - + public Product getProduct() { return product; } diff --git a/ebean-test/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java index cefcbce10..707a56bd8 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/Report.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/Report.java @@ -1,32 +1,31 @@ package org.tests.model.docstore; -import java.util.List; +import io.ebean.annotation.DocStore; import javax.persistence.Inheritance; import javax.persistence.OneToMany; - -import io.ebean.annotation.DocStore; +import java.util.List; @DocStore @Inheritance public class Report { private String title; - + @OneToMany private List embeddedReports; - + public void setTitle(String title) { this.title = title; } - + public String getTitle() { return title; } - + public List getEmbeddedReports() { return embeddedReports; } - + public void setEmbeddedReports(List embeddedReports) { this.embeddedReports = embeddedReports; } diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java index 956282059..547f3012b 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Link.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Link.java @@ -1,11 +1,6 @@ package org.tests.model.draftable; -import io.ebean.annotation.Draft; -import io.ebean.annotation.DraftDirty; -import io.ebean.annotation.DraftReset; -import io.ebean.annotation.Draftable; -import io.ebean.annotation.History; -import io.ebean.annotation.SoftDelete; +import io.ebean.annotation.*; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java index 763b137ab..c41a7540a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java @@ -2,13 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java index 29f82cb41..de38b9a11 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java @@ -1,10 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java index c4998d855..03b6cb086 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java index 992178c54..b4e2b70d1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java index 8bd280ea1..2dad35c3c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java @@ -2,14 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.Transient; -import javax.persistence.Version; - +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index 3627b50b5..b3b505068 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.text.json.JsonContext; import io.ebean.test.LoggedSql; +import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java index fe7d326e6..d89cbc311 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MapKeyColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java index f0c854db7..d6661f1e2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index 4b027fe06..44bd1d576 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -2,8 +2,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.text.json.JsonContext; import io.ebean.test.LoggedSql; +import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java index 5299f4dca..6cf06f282 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java index 58f3ec21b..750512cc7 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java index 084a8f1a7..0f3cb85a1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3f1e463f1..3fa8ac694 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 3d6eee18f..fef7fb95e 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java index f08c5a35b..c42510d67 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "eemb_inner") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java index 1ae4da057..2f6797c33 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.CascadeType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java index 0b833fdd1..98e3a1733 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java @@ -2,11 +2,7 @@ package org.tests.model.embedded; import io.ebean.annotation.Cache; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Date; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java index 2b5776999..edb13ac1b 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java index 8a0c60446..ef5e82a80 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java index e4c11d935..b532ceff6 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson2 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java index 78c87ab9b..59e793384 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson3 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java index ac5f5d6b3..912e95e87 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class PrimaryRevision { diff --git a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java index 9ea2c97a2..621d81885 100644 --- a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -3,19 +3,14 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @Entity public class GrandParentPerson extends InheritablePerson { private static final long serialVersionUID = 1L; - + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL) @OrderBy("identifier") private List children = new ArrayList<>(); @@ -41,8 +36,8 @@ public class GrandParentPerson extends InheritablePerson { @ManyToOne(optional = true, fetch = FetchType.EAGER) @Formula(select = "f3.id", join = "left join e_basic f3 on f3.name = ${ta}.family_name") private EBasic basicSameName; - - + + // Demonstrate formula usage @Formula(select = "coalesce(${ta}.some_bean_id,1)") @ManyToOne @@ -84,11 +79,11 @@ public class GrandParentPerson extends InheritablePerson { public EBasic getEffectiveBean() { return effectiveBean; } - + public EBasic getBasicSameName() { return basicSameName; } - + public void setBasicSameName(EBasic basicSameName) { this.basicSameName = basicSameName; } diff --git a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java index 36c7fc74f..113e95bc0 100644 --- a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java @@ -2,11 +2,10 @@ package org.tests.model.family; import org.tests.model.basic.EBasic; -import java.io.Serializable; - import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; +import java.io.Serializable; @MappedSuperclass public abstract class InheritablePerson implements Serializable { diff --git a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java index 242721993..4f48c9d33 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java @@ -3,11 +3,7 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.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 javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java index c2f699723..ea2651039 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java @@ -4,11 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.JsonIgnore; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java index 086475b59..bf93c9c58 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java @@ -3,11 +3,7 @@ package org.tests.model.info; import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class InfoCustomer extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java index b7b93cd85..e2c052a49 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,10 +1,6 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index e0a7b1c2a..395f99a13 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -2,8 +2,8 @@ package org.tests.model.inheritexposedtype.test; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.inheritexposedtype.IXPhoto; import org.junit.jupiter.api.Test; +import org.tests.model.inheritexposedtype.IXPhoto; public class TestInheritExposeDtype extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java index 553b12fad..f8d38fab5 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,10 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java index d59055c71..95e3b97e8 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,10 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java index 6cfc52193..0950feaab 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java @@ -1,10 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index 61f1f66ff..127eb6162 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -9,9 +9,7 @@ import org.joda.time.Period; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestJodaInsertUpdate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java index bdfa43add..6a84ff2f7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java @@ -7,12 +7,7 @@ import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Entity public class EBasicJsonJackson { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java index 45a305105..8e801113c 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java @@ -7,12 +7,7 @@ import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Entity public class EBasicJsonJackson2 { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java index cee12d9e7..225939bb7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java @@ -2,7 +2,6 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import io.ebean.annotation.MutationDetection; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java index 520016df9..30e0f502f 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -2,11 +2,7 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java index 23dcd33d9..7e294914d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java @@ -2,13 +2,11 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import io.ebean.annotation.MutationDetection; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import static io.ebean.annotation.MutationDetection.NONE; import static io.ebean.annotation.MutationDetection.SOURCE; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java index 7488ac4f8..97ce8bb81 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -1,7 +1,7 @@ package org.tests.model.json; -import io.ebean.annotation.DbJson; import com.fasterxml.jackson.databind.JsonNode; +import io.ebean.annotation.DbJson; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 844ab3569..527dcdfd0 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -1,8 +1,8 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index d0f7016a3..f8f8392dc 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -1,7 +1,7 @@ package org.tests.model.json; -import io.ebean.annotation.DbJsonB; import com.fasterxml.jackson.databind.JsonNode; +import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index 8acd2c016..c8b2939e3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -1,8 +1,8 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java index 37e805412..614758a1c 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java @@ -1,13 +1,11 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbArray; import io.ebean.annotation.DbJson; import javax.persistence.Entity; import javax.persistence.Id; - -import com.fasterxml.jackson.databind.JsonNode; - import java.util.*; import static io.ebean.annotation.MutationDetection.SOURCE; @@ -25,35 +23,35 @@ public class EBasicOldValue { @DbJson(mutationDetection = SOURCE) Set longSet = new LinkedHashSet<>(); - + @DbJson(mutationDetection = SOURCE) Set intSet = new LinkedHashSet<>(); - + @DbJson(mutationDetection = SOURCE) List stringList = new ArrayList<>(); @DbJson(mutationDetection = SOURCE) List longList = new ArrayList<>(); - + @DbJson(mutationDetection = SOURCE) List intList = new ArrayList<>(); - + @DbJson(mutationDetection = SOURCE) Map objectMap = new LinkedHashMap<>(); @DbJson(mutationDetection = SOURCE) Map longMap = new LinkedHashMap<>(); - + @DbJson(mutationDetection = SOURCE) Map intMap = new LinkedHashMap<>(); @DbJson(mutationDetection = SOURCE) JsonNode jsonNode; - + @DbArray() List stringArr = new ArrayList<>(); - - + + public Long getId() { return id; } @@ -141,15 +139,15 @@ public class EBasicOldValue { public void setIntMap(Map intMap) { this.intMap = intMap; } - + public JsonNode getJsonNode() { return jsonNode; } - + public void setJsonNode(JsonNode jsonNode) { this.jsonNode = jsonNode; } - + public List getStringArr() { return stringArr; } diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java index d15c36d49..ff591d427 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java @@ -1,12 +1,12 @@ package org.tests.model.lazywithcache; +import io.ebean.annotation.Cache; + import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; -import io.ebean.annotation.Cache; - /** * Class with @Cache and lazy load property. * @@ -16,15 +16,15 @@ import io.ebean.annotation.Cache; @Entity @Cache(enableQueryCache = true) public class ChildWithCache { - + @Id Long id; String name; - + @Basic(fetch = FetchType.LAZY) String address; - + public Long getId() { return id; } @@ -32,7 +32,7 @@ public class ChildWithCache { public void setId(Long id) { this.id = id; } - + public String getName() { return name; } @@ -40,11 +40,11 @@ public class ChildWithCache { public void setName(String name) { this.name = name; } - + public void setAddress(String address) { this.address = address; } - + public String getAddress() { return address; } diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index aa6c04542..380f82c5d 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,9 +1,8 @@ package org.tests.model.lazywithcache; -import org.junit.jupiter.api.Test; - import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java index 93c374d03..65930791f 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java @@ -1,15 +1,10 @@ package org.tests.model.lazywithid; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; - import io.ebean.common.BeanList; +import javax.persistence.*; +import java.util.List; + @Entity public class Tune { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java index 3dba93d6b..2f51929df 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,11 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index 2e86cb9df..28e7636a4 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -1,11 +1,11 @@ package org.tests.model.m2m; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import io.ebean.annotation.Index; - @Entity @Index(unique = true, columnNames = { "from_id", "to_id" }) @Index(unique = true, columnNames = { "to_id", "from_id" }) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index 3f9a8d347..edbd87cc0 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -1,15 +1,10 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; - import io.ebean.annotation.Identity; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; +import javax.persistence.*; import java.util.List; @Identity(start = 1000) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java index 02e751024..e4710130c 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,11 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java index 517a56882..2bf201542 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java @@ -2,11 +2,7 @@ package org.tests.model.m2m; import io.ebean.annotation.Cache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java index 0a2b13703..1b32e7ef9 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Role.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Role.java @@ -1,13 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java index 9a740f54a..32db7e352 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,12 +1,6 @@ package org.tests.model.m2m; -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 javax.persistence.Version; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 62e5e64a7..0525c0896 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -1,14 +1,13 @@ package org.tests.model.m2m; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.List; - -import org.junit.jupiter.api.Test; - import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; /** * Tests M2M with complex where queries. diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java index 6341bd725..bf9b5b2c7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java @@ -1,10 +1,6 @@ package org.tests.model.m2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index 1ac972597..f93459556 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -2,7 +2,6 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index 767a5b86f..e27df52db 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -2,7 +2,6 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java index 744b1fd6c..108c91a94 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,11 +3,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.*; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index 43e968ef0..d9a694476 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import javax.persistence.*; @Entity public class OtoBMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java index 50f5efad6..49d6eb502 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoCust { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java index 33adbd04a..3c1cbc193 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -1,11 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoPrime { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java index 95e5f947c..6dea4f146 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java @@ -2,11 +2,7 @@ package org.tests.model.onetoone; import io.ebean.Finder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoSdMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index 0a87366fa..df14dee01 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index a8da23578..e4371304f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -2,11 +2,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java index dabab0825..58a9b06a9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java @@ -1,12 +1,12 @@ package org.tests.model.onetoone; +import org.tests.model.BaseModel; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.OneToOne; import javax.persistence.Table; -import org.tests.model.BaseModel; - @Entity @Table(name = "oto_user_model") public class OtoUser extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java index 65dd701b0..9b21ba440 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java @@ -1,10 +1,10 @@ package org.tests.model.onetoone; +import org.tests.model.BaseModel; + import javax.persistence.Entity; import javax.persistence.Table; -import org.tests.model.BaseModel; - @Entity @Table(name = "oto_user_model_optional") public class OtoUserOptional extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 01b3cca80..a15ba6a15 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -4,7 +4,6 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java index 2a1e032dc..d131ed6d8 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,14 +1,7 @@ package org.tests.model.orderentity; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index d1d40961c..eb8543c64 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,13 +1,7 @@ package org.tests.model.orderentity; -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 javax.persistence.*; import javax.validation.constraints.Size; - import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java index cd443a84c..96384d261 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java @@ -2,13 +2,8 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java index 09338bdda..9565a6a42 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java @@ -2,13 +2,8 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java index 76c229d92..de541ec3c 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,12 +1,6 @@ package org.tests.model.prnt; -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; +import javax.persistence.*; @Entity public class MPrinter { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java index 9d6657043..3bef094f5 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,11 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class MPrinterState { diff --git a/ebean-test/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java index e3445c396..a985fb76c 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Pview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Pview.java @@ -1,15 +1,6 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java index 364b73bf0..10f8b6237 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Wview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Wview.java @@ -1,12 +1,7 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java index fa96461c1..80cbd64c8 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -3,7 +3,6 @@ package org.tests.model.selfref; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.MappedSuperclass; - import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java index 3be5e7674..2efff0071 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,13 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java index 0e94da293..7999dcb80 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,11 +1,6 @@ package org.tests.model.selfref; -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 javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java index 73e7aab1c..f29430aed 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,10 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "self_ref_customer") diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java index 09a6ab1dc..2e054e5ad 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,11 +1,6 @@ package org.tests.model.selfref; -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 javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java index ce5c12594..1b950f821 100644 --- a/ebean-test/src/test/java/org/tests/model/site/Site.java +++ b/ebean-test/src/test/java/org/tests/model/site/Site.java @@ -2,12 +2,7 @@ package org.tests.model.site; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 249f6dfea..1c50b91dc 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,10 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java index 3ecd9b044..6de682429 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java @@ -2,11 +2,7 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class ESoftDelOneA { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java index fbc3f9964..8b9ce71e7 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java @@ -2,7 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java index a65cc75c1..608343d56 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java @@ -2,7 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; @Entity public class ESoftDelY { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java index c31b63550..9cbeca792 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Category.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Category.java @@ -1,12 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.List; @Entity @@ -41,7 +35,7 @@ public class Category { public void setSequenceNumber(int number) { this.sequenceNumber = number; } - + public int getSequenceNumber() { return sequenceNumber; } diff --git a/ebean-test/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java index dcbc3fe83..5b1fb9e99 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Group.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Group.java @@ -1,13 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -44,7 +37,7 @@ public class Group { public void setSequenceNumber(int number) { this.sequenceNumber = number; } - + public int getSequenceNumber() { return sequenceNumber; } diff --git a/ebean-test/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java index 645ca9a50..328dd2ab2 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Survey.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Survey.java @@ -1,10 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index f69ad23fe..896d5a147 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -2,12 +2,7 @@ package org.tests.model.tevent; import io.ebean.annotation.Aggregation; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java index 2397279cd..2596dbcba 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -6,21 +6,7 @@ import javax.persistence.Id; import javax.persistence.Version; import java.nio.file.Path; import java.sql.Date; -import java.time.DayOfWeek; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.Month; -import java.time.MonthDay; -import java.time.OffsetDateTime; -import java.time.Period; -import java.time.Year; -import java.time.YearMonth; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; +import java.time.*; @Entity public class SomeNewTypesBean { diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java index 7fa10caea..dd28ae184 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -4,11 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import javax.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java index 03e4725b1..26223b801 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java @@ -1,12 +1,6 @@ package org.tests.model.version; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java index 288992225..fdcce6782 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java @@ -1,11 +1,6 @@ package org.tests.model.version; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java index 8a38ef15c..1700e0f2d 100644 --- a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java +++ b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java @@ -4,11 +4,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.View; import org.tests.model.basic.Order; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import javax.persistence.*; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java index 460478d16..3f961f85e 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java @@ -1,10 +1,6 @@ package org.tests.model.zero; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class WithZero { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java index 610e747c8..c6ea43821 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,11 +1,6 @@ package org.tests.model.zero; -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 javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java index 15b117bd0..76f23c86a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java @@ -1,12 +1,11 @@ package org.tests.o2m; +import io.ebean.annotation.Where; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Version; - -import io.ebean.annotation.Where; - import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index 9ca312ce8..c1d7b40b6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -8,9 +8,7 @@ import org.junit.jupiter.api.Test; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestOneToManyOnlyBean extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 5e63429b3..e60142a8f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -3,7 +3,6 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java index 496782f2b..4e335aa0c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java @@ -1,11 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java index 66a2e3474..5782c220f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java @@ -1,12 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java index 06a4b79eb..db64e6be2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java @@ -1,11 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index eb22888d3..9413f6cfd 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -3,7 +3,6 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index e86bd344c..ee58d1964 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -2,7 +2,6 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java index 08d3bbf54..2b62d81bf 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java @@ -2,12 +2,7 @@ package org.tests.o2m.jointable.inheritance; import org.tests.o2m.jointable.JtMonkey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java index 6e35c1e17..b5b18eb6d 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java @@ -1,10 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java index 52d428d07..8195d1757 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java @@ -1,11 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java index 47a2f6ed5..4e1751cab 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java @@ -1,11 +1,6 @@ package org.tests.order; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java index b98e9f2eb..19ea3481c 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java @@ -2,12 +2,7 @@ package org.tests.order; import io.ebean.annotation.Index; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import javax.persistence.*; @Entity @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index 0a5eaeed9..aa4971107 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -3,8 +3,8 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index ef94d337b..235976ee4 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -2,7 +2,6 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index f1658ada9..81aed21f8 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -2,10 +2,10 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashSet; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 62faa4694..67fc1d549 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -1,10 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; -import io.ebean.Database; -import io.ebean.DatabaseFactory; -import io.ebean.PersistenceContextScope; -import io.ebean.Query; +import io.ebean.*; import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index a2c930ee5..52a3dd791 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -6,16 +6,16 @@ import io.ebean.Query; import io.ebean.bean.ObjectGraphNode; import io.ebean.bean.ObjectGraphOrigin; import io.ebeaninternal.api.SpiQuery; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + public class TestAutofetchTuneWithJoin extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index 2fcf67d61..d12e052ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -3,8 +3,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 92d3de1d3..0328af33f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.MyLobSize; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MyLobSize; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java index 346fe17a9..c014aace4 100644 --- a/ebean-test/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-test/src/test/java/org/tests/query/TestIContains.java @@ -1,14 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java index e593402f6..52442979c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java @@ -2,9 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java index d33edf7bb..4fa4d5685 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -3,11 +3,11 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 4d10df1be..0b51c347d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,15 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMyAdHocSqlSelect extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 139a762c1..47db41e2c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -3,10 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 004b58021..aa1592787 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index 683c926c6..cf840ba25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -2,12 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Contact; -import org.tests.model.basic.ContactNote; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 1142cf761..f47d9da52 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -2,8 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.MUser; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MUser; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index 042082dcb..de9b567df 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -2,14 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.Query; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java index e0aee3b11..7864838ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -2,11 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index 0af842ade..9dce80a77 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -6,8 +6,8 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; -import io.ebeaninternal.api.SpiTransaction; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,6 @@ import org.tests.model.basic.ResetBasicData; import org.tests.o2m.OmBasicChild; import org.tests.o2m.OmBasicParent; -import javax.persistence.PersistenceException; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java index c7a2dbb98..d444d54e0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -2,7 +2,6 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java index 57a04439c..2a05cb16d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FutureList; import io.ebean.Transaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index e9e4637db..b3c229f71 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; -import org.assertj.core.util.Lists; import io.ebean.test.LoggedSql; +import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java index 7af8308af..77a3088cc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -3,10 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java index ff3a7b1a6..f93a9e450 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java @@ -3,11 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.m2m.Role; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 0c75084b6..fa478dd20 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -2,11 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 6fe7a9771..171df676f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -2,10 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index fb3a03d44..a67aaec76 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java index 7432639a8..c48c11f87 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java index c9f5c8bb3..f98a0c04d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java @@ -6,8 +6,6 @@ import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import static org.assertj.core.api.Assertions.assertThat; - public class TestQueryOrderById extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index f00a6d282..1d41c026e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -2,9 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 2d5187d6f..fb1fac598 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index bb1a9f94a..5b0e4c931 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -2,10 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index a81957b7e..8b2ed0939 100644 --- a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -2,10 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index 255bf18d3..ebb5ce146 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -2,7 +2,6 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; import io.ebean.annotation.ForPlatform; diff --git a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 2c0487e6b..2595c5bfb 100644 --- a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -5,11 +5,7 @@ import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; import java.util.Random; diff --git a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java index 9038bb56f..53d8f95e8 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java +++ b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java @@ -1,10 +1,6 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; import javax.validation.constraints.NotNull; @Entity @@ -45,4 +41,4 @@ public class AclContainerRelation { this.aclEntry = aclEntry; } -} \ No newline at end of file +} diff --git a/ebean-test/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java index 795fbb466..344a09be6 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Contract.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Contract.java @@ -1,12 +1,7 @@ package org.tests.query.cache; import javax.annotation.Nonnull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java index 3d1060fd4..288582d0d 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Position.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Position.java @@ -1,10 +1,6 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "e_position") diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java index 7a56f46d5..bace1ccb9 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java @@ -1,14 +1,13 @@ package org.tests.query.cancel; +import io.ebean.DB; +import io.ebean.Transaction; +import org.h2.api.Trigger; + import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import org.h2.api.Trigger; - -import io.ebean.DB; -import io.ebean.Transaction; - /** * Class to artificially slow down selects on 'e_basic' table */ diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index dfb1ab580..eb065149e 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -1,9 +1,13 @@ package org.tests.query.cancel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.assertThrows; +import io.ebean.*; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; +import javax.persistence.PersistenceException; import java.sql.SQLException; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -11,20 +15,9 @@ import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.PersistenceException; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.EBasic; - -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DtoQuery; -import io.ebean.Query; -import io.ebean.QueryIterator; -import io.ebean.SqlQuery; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.Platform; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests, if all kind of queries are cancelable. There are two ways how to diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 6a174e792..9291cde2e 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -6,10 +6,10 @@ import io.ebean.Database; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EInvoice; import org.tests.model.embedded.EInvoice.State; -import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index af7d6cdf0..85e43db88 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -3,13 +3,7 @@ package org.tests.query.finder; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.meta.MetaQueryMetric; -import io.ebean.meta.MetaQueryPlan; -import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.QueryPlanInit; -import io.ebean.meta.QueryPlanRequest; -import io.ebean.meta.ServerMetrics; -import io.ebean.meta.SortMetric; +import io.ebean.meta.*; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 2dab70e77..7d417f1ed 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -5,10 +5,10 @@ import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyValue; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index eaeceb7aa..76e5952d0 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -3,9 +3,9 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index 4a841a1bb..ade9da0e7 100644 --- a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -3,12 +3,8 @@ package org.tests.query.lazy; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 3f032cf9d..6d09bf18c 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.OrderBy; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index 4d32e02ab..9d7f1780b 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -6,11 +6,7 @@ import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; -import org.tests.model.basic.MRole; -import org.tests.model.basic.MUser; -import org.tests.model.basic.MUserType; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index bd23305c3..f97b20167 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -3,8 +3,8 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index 42c165202..b85867d7f 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -3,9 +3,9 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index f88d014f9..9a399d344 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -3,11 +3,11 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import io.ebean.test.LoggedSql; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index e32bcff15..9ca47f36c 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -2,9 +2,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index 7c56986f5..cc2a58594 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,12 +1,12 @@ package org.tests.query.other; +import com.sun.management.HotSpotDiagnosticMXBean; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; -import org.tests.model.basic.EBasic; -import com.sun.management.HotSpotDiagnosticMXBean; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import javax.management.MBeanServer; import java.io.File; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 13784f672..7ea317f94 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -3,9 +3,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index e832dfdcc..1109e3043 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ExpressionList; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java index f775c5944..b52522de9 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -2,10 +2,9 @@ package org.tests.query.other; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index 50b101ce0..c0f3deff8 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -6,10 +6,10 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index 48ed870b2..052165d16 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -2,9 +2,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java index c830b9c10..8f64e0836 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 1d9b592ac..153e3c120 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -3,10 +3,10 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 6b3ad1a7f..735bddddd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -1,11 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; -import io.ebean.CountDistinctOrder; -import io.ebean.CountedValue; -import io.ebean.DB; -import io.ebean.DB; -import io.ebean.Query; +import io.ebean.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -15,11 +10,7 @@ import org.tests.inherit.Data; import org.tests.inherit.EUncle; import org.tests.lazyforeignkeys.MainEntity; import org.tests.lazyforeignkeys.MainEntityRelation; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; -import org.tests.model.basic.VwCustomer; +import org.tests.model.basic.*; import org.tests.o2m.OmBasicParent; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java index 74e53f13f..483b85998 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java @@ -2,8 +2,8 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.selfref.SelfParent; import org.junit.jupiter.api.Test; +import org.tests.model.selfref.SelfParent; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java index 20e0fc7a9..c3eb3a2bd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,12 +1,8 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Expression; -import io.ebean.Query; -import org.tests.model.basic.Customer; +import io.ebean.*; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; public class TestSubQueryBinding extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 3daf1a4f5..71501faa7 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -1,10 +1,6 @@ package org.tests.query.sqlquery; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.RowMapper; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 2e188921e..c6c541de7 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,14 +1,10 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 5a8b8e39f..9b9540003 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index 645bdaf46..d61d4c8e4 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 1d7ae564f..dcc81e2da 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -4,12 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.tests.model.basic.Customer; -import org.tests.model.basic.EBasic; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; import java.util.Random; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index f229009b1..e40fe30bd 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -1,19 +1,12 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.CallableSql; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index ae8ca158e..ac27ba981 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,13 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchConfig; -import io.ebean.FutureRowCount; -import io.ebean.PagedList; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index 4149ecd8a..aa8048769 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,15 +1,11 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 813e6d917..8e477055c 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,15 +1,10 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 19a8a181e..404b12861 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -2,14 +2,13 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 06b5ddae6..59a2bfa81 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.Transaction; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index d29a2be12..b3e879e71 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -2,12 +2,11 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; import org.tests.inherit.Parent; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index 38ea00f63..0369ba346 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -6,19 +6,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.tests.inherit.ChildA; -import org.tests.inherit.ChildB; -import org.tests.inherit.Data; -import org.tests.inherit.EUncle; -import org.tests.inherit.Parent; -import org.tests.inherit.ParentAggregate; +import org.tests.inherit.*; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ParentRawSqlTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 978902d6d..f73ce824b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,6 +1,9 @@ package org.tests.rawsql.nativesql; -import io.ebean.*; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.DB; +import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 66682b272..2b1a2740d 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -18,11 +18,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.EBasicChangeLog; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java index fcb5b6d1b..078839f6a 100644 --- a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -1,14 +1,12 @@ package org.tests.refresh; -import io.ebean.DB; import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index b17942ad3..061475a40 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -2,13 +2,8 @@ package org.tests.singleTableInheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.singleTableInheritance.model.PalletLocation; -import org.tests.singleTableInheritance.model.PalletLocationExternal; -import org.tests.singleTableInheritance.model.Warehouse; -import org.tests.singleTableInheritance.model.Zone; -import org.tests.singleTableInheritance.model.ZoneExternal; -import org.tests.singleTableInheritance.model.ZoneInternal; import org.junit.jupiter.api.Test; +import org.tests.singleTableInheritance.model.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 51aafc413..694246b5b 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,15 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index 58b935c49..b79e59950 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,14 +1,6 @@ package org.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 javax.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java index 0c27f7742..f0f820ded 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,13 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index e454438cc..4d5fd67af 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -1,11 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 472ff8cb9..992ada21a 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -3,9 +3,9 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelBook; import org.tests.model.softdelete.ESoftDelUser; -import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 1fd0d7091..45d44dd82 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -2,10 +2,10 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.softdelete.ESoftDelRole; -import org.tests.model.softdelete.ESoftDelUser; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.softdelete.ESoftDelRole; +import org.tests.model.softdelete.ESoftDelUser; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 1a275dc60..f5650673b 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -2,11 +2,10 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; -import io.ebean.test.LoggedSql; -import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.softdelete.ESoftDelMid; import org.tests.model.softdelete.ESoftDelY; import org.tests.model.softdelete.ESoftDelZ; diff --git a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index 4d7d4188c..17a211de7 100644 --- a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -2,7 +2,6 @@ package org.tests.sp; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.sp.model.car.Car; diff --git a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java index c6e8d68ca..a45108d28 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java +++ b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,13 +1,8 @@ package org.tests.sp.model; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; - @MappedSuperclass public abstract class IdEntity implements Serializable { private static final long serialVersionUID = 7804145008732783678L; diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java index d742444d2..415dcecba 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java @@ -2,12 +2,7 @@ package org.tests.sp.model.car; import org.tests.sp.model.IdEntity; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java index 4b8279bae..c955939d5 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 656391b05..08f171196 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -7,8 +7,6 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.SomeEnum; import org.tests.model.basic.SomeEnumBean; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonSomeEnumWithToString extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 6cf13502f..5c1f02cd3 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -3,14 +3,8 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.Car; -import org.tests.model.basic.CarAccessory; -import org.tests.model.basic.CarFuse; -import org.tests.model.basic.Trip; -import org.tests.model.basic.Truck; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java index 8f455c0f7..67c700fbc 100644 --- a/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java @@ -5,11 +5,7 @@ import io.ebean.Transaction; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; +import java.sql.*; import java.util.Calendar; import java.util.TimeZone; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 6b58c8486..639b52c69 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -2,11 +2,9 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index d533dcdfb..2fcb01543 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -3,17 +3,16 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.tests.model.m2m.MnyB; -import org.tests.model.m2m.MnyC; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.m2m.MnyB; +import org.tests.model.m2m.MnyC; import javax.persistence.PersistenceException; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBeanStateReset extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 124f32bc5..a4b4ee099 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -3,13 +3,11 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiTransaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestDeleteFromPersistenceContext extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java index b24a87dda..be3b6557b 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -1,10 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DataIntegrityException; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index a69b91087..ecab276e9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -2,9 +2,9 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmark; import org.tests.model.basic.BBookmarkUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 093f360eb..58b4c68c5 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequired extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 17afc712f..6f91cf2fd 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,17 +1,13 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.Product; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class TestNestedBeginRequiredWithFailure extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 62d726ca9..b7c7fd3e0 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequiresNew extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 2755f81a1..927d3380a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequiresNewWithFailure extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index ffa089eb1..44e8f7299 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -1,11 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.PersistenceContextScope; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java index ef990e899..7b993e92d 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -6,10 +6,10 @@ import io.ebean.Database; import io.ebean.Transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index 1573e65fa..946fcda03 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -2,8 +2,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java index 60c2d9bd1..e2511c543 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.DuplicateKeyException; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index 14b9c1f7e..b530252f8 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -9,9 +9,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalNotSupports extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java index 3fedd0ab5..a3c367dc3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -9,9 +9,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalRequired extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 67aed59d6..3e38e2d0c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -1,10 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; import org.junit.jupiter.api.Test; @@ -14,10 +10,7 @@ import org.slf4j.LoggerFactory; import java.sql.Connection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalRequiresNew extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index 0aeb45f26..3a2d3e83d 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -14,7 +14,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * It shows the issue that the user record does NOT rolback when there is an exception thrown diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 44adc4e48..ed0cfb175 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -1,10 +1,11 @@ package org.tests.transparentpersist; import io.ebean.*; -import io.ebean.annotation.*; +import io.ebean.annotation.Transactional; +import io.ebean.annotation.TxOption; +import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java index 07578ed6c..904ae2350 100644 --- a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java +++ b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java @@ -1,12 +1,12 @@ package org.tests.types; +import org.tests.model.BaseModel; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.validation.constraints.Size; -import org.tests.model.BaseModel; - @Entity public class PasswordStoreModel extends BaseModel { private static final long serialVersionUID = 1L; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java index c99b57c2e..39dc9e528 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileType.java @@ -11,10 +11,7 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestFileType extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java index a027ab056..6518e2919 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -3,8 +3,8 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.tests.model.types.SomeFileBean; import org.junit.jupiter.api.Test; +import org.tests.model.types.SomeFileBean; import java.io.File; import java.net.URL; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index a9ce5d365..e852a6955 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -2,12 +2,10 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.Platform; -import org.tests.model.json.EBasicHstore; -import org.assertj.core.api.Assertions; import io.ebean.test.LoggedSql; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicHstore; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java index fb8fb0e00..35732801e 100644 --- a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java @@ -9,26 +9,12 @@ import org.tests.model.types.SomeNewTypesBean; import java.io.File; import java.nio.file.Paths; -import java.time.DayOfWeek; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.Month; -import java.time.MonthDay; -import java.time.OffsetDateTime; -import java.time.Period; -import java.time.Year; -import java.time.YearMonth; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class TestNewTypes extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java index f4f0c9522..daa493385 100644 --- a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -2,9 +2,9 @@ package org.tests.unidirectional; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index ac21a2642..915df69e0 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,12 +1,12 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; -import io.ebean.bean.EntityBean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class TestEqualsOnEnhanced extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index ccce09fd8..668be5317 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -3,9 +3,9 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ENullCollection; import org.tests.model.basic.ENullCollectionDetail; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 6f3f084ff..3f65621b6 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -5,11 +5,7 @@ import io.ebean.OrderBy; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Test the OrderBy object and especially its parsing. diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index a7a42cdbb..fcfcb5aef 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -3,12 +3,12 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.tests.model.basic.EBasicVer; -import org.tests.model.basic.xtra.DummyDao; -import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.EBasicVer; +import org.tests.model.basic.xtra.DummyDao; +import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; import javax.persistence.OptimisticLockException; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 9f7a56f32..c580d23cf 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -3,9 +3,9 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EVanillaCollection; import org.tests.model.basic.EVanillaCollectionDetail; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 410eac1cb..3bc09dae3 100644 --- a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -2,10 +2,10 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index 502ddbb34..009283e11 100644 --- a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java index 3b1b845d3..49d6f7222 100644 --- a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -2,8 +2,8 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index dfc78d1f3..0aad43977 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -1,10 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DuplicateKeyException; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; +import io.ebean.*; import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index 8397615f9..9cd59bf23 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -2,7 +2,6 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index ab60472c9..e8243bdd1 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -10,11 +10,7 @@ import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import javax.persistence.EntityNotFoundException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java index b6feec344..978ef0589 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java @@ -2,7 +2,6 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index bf6a52680..0af27a760 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -2,9 +2,9 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; -import org.junit.jupiter.api.Test; public class TestUpdatePartialNoVer extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java index b8a91a2b7..87166bfda 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Child.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Child.java @@ -1,10 +1,6 @@ package org.tests.update.objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_d") diff --git a/ebean-test/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java index bdcfa58f9..6a582a981 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Parent.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Parent.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_c") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java index 2e5806657..71fb72816 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_a") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java index 63b358645..cbd32a7fb 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_b") From 8f8d031d91d11c25e8bd83cf9b80a8b6abbe6263 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 11:39:17 +1200 Subject: [PATCH 090/102] #2361 - Tidy tests dependencies in ebean-core --- ebean-core/pom.xml | 123 --------------------------------------------- ebean-test/pom.xml | 17 ++++++- 2 files changed, 15 insertions(+), 125 deletions(-) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index d4c068bf8..e4ff17668 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -18,20 +18,6 @@ ebean-parent-12.8.0 - - - db2 - - - - com.ibm.db2 - jcc - 11.5.5.0 - test - - - - @@ -52,30 +38,6 @@ 1.1 - - - io.ebean - ebean-migration - 12.4.0 - test - - - - - - - - - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - test - - io.ebean ebean-api @@ -187,76 +149,6 @@ test - - com.nuodb.jdbc - nuodb-jdbc - 20.2.0 - test - - - - com.oracle.ojdbc - ojdbc10 - 19.3.0.0 - test - - - - io.ebean - ebean-test-docker - 4.1 - test - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - org.xerial - sqlite-jdbc - 3.15.1 - test - - - - org.hsqldb - hsqldb - 2.3.4 - test - - - - com.microsoft.sqlserver - mssql-jdbc - 7.2.2.jre8 - test - - - - mysql - mysql-connector-java - 8.0.17 - test - - - - org.mariadb.jdbc - mariadb-java-client - 2.6.0 - test - - - - com.sap.cloud.db.jdbc - ngdbc - 2.3.48 - test - - io.avaje junit @@ -264,23 +156,8 @@ test - - commons-io - commons-io - 2.7 - test - - - - io.avaje - mod-uuid - 1.1 - test - - - diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7fe6d6f9a..d376e17ad 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -144,7 +144,6 @@ test - org.postgresql postgresql @@ -196,6 +195,20 @@ + + + db2 + + + + com.ibm.db2 + jcc + 11.5.5.0 + test + + + + @@ -203,7 +216,7 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.20 true From 4cca3bfa986757dba6cd18e4950054c099afa86c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 11:44:27 +1200 Subject: [PATCH 091/102] #2361 - Tidy test dependencies bump tiles-maven-plugin --- ebean-autotune/pom.xml | 4 ++-- ebean-externalmapping-xml/pom.xml | 4 ++-- ebean-postgis/pom.xml | 4 ++-- ebean-querybean/pom.xml | 4 ++-- ebean-redis/pom.xml | 4 ++-- ebean-test/pom.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 5248a7359..6a9ea5871 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -59,12 +59,12 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.24 true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index bc2d2f3a8..246b915d8 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -84,12 +84,12 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.24 true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index cabdf629a..91035b7d9 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -101,11 +101,11 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.24 true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 6c51f665b..a1e4f6fc9 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -98,11 +98,11 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.24 true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 34831f325..5a55646d0 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -76,11 +76,11 @@ io.repaint.maven tiles-maven-plugin - 2.19 + 2.24 true - io.ebean.tile:enhancement:12.6.1 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index d376e17ad..5d6dccd65 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -216,7 +216,7 @@ io.repaint.maven tiles-maven-plugin - 2.20 + 2.24 true From 88fd4f5569f6a74251cc104763a72d0dac18e22d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 12:04:11 +1200 Subject: [PATCH 092/102] #2361 - Update test-java16 test dependencies --- pom.xml | 1 + tests/test-java16/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e1d70a943..68cdce53d 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,7 @@ ebean-querybean ebean-postgis ebean-redis + diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 21dfa7852..e3c81605e 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -19,7 +19,7 @@ io.ebean ebean - 12.8.1-SNAPSHOT + 12.11.4-SNAPSHOT @@ -31,14 +31,14 @@ io.ebean ebean-test - 12.8.1-SNAPSHOT + 12.11.4-SNAPSHOT test - org.avaje.composite + io.avaje junit - 5.0 + 1.0 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 12.8.1-SNAPSHOT + 12.11.4-SNAPSHOT From b739326fca334e4e2ce16cc941c7836185cbba1a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 12:13:34 +1200 Subject: [PATCH 093/102] #2361 - Update test-java16 tests - use record style accessors with entity beans --- .../java/org/example/records/BaseModel.java | 8 ++--- .../java/org/example/records/Contact.java | 14 ++++----- .../main/java/org/example/records/Course.java | 6 ++-- .../java/org/example/records/UserRole.java | 6 ++-- .../java/org/example/records/UserSite.java | 12 +++---- .../records/DtoQueryUsingRecordsTest.java | 6 ++-- .../example/records/RecordAsEmbeddedTest.java | 31 +++++++++++-------- .../example/records/RecordIdClassTest.java | 18 ++++++++--- .../org/example/records/UserRoleTest.java | 2 +- 9 files changed, 59 insertions(+), 44 deletions(-) diff --git a/tests/test-java16/src/main/java/org/example/records/BaseModel.java b/tests/test-java16/src/main/java/org/example/records/BaseModel.java index b5116e638..a2698576c 100644 --- a/tests/test-java16/src/main/java/org/example/records/BaseModel.java +++ b/tests/test-java16/src/main/java/org/example/records/BaseModel.java @@ -17,19 +17,19 @@ public class BaseModel extends Model { @Version long version; - public long getId() { + public long id() { return id; } - public void setId(long id) { + public void id(long id) { this.id = id; } - public long getVersion() { + public long version() { return version; } - public void setVersion(long version) { + public void version(long version) { this.version = version; } } diff --git a/tests/test-java16/src/main/java/org/example/records/Contact.java b/tests/test-java16/src/main/java/org/example/records/Contact.java index 871862f21..4b054511f 100644 --- a/tests/test-java16/src/main/java/org/example/records/Contact.java +++ b/tests/test-java16/src/main/java/org/example/records/Contact.java @@ -28,31 +28,31 @@ public class Contact extends Model { this.name = name; } - public String getName() { + public String name() { return name; } - public Address getHomeAddress() { + public Address homeAddress() { return homeAddress; } - public void setHomeAddress(Address homeAddress) { + public void homeAddress(Address homeAddress) { this.homeAddress = homeAddress; } - public Address getWorkAddress() { + public Address workAddress() { return workAddress; } - public void setWorkAddress(Address workAddress) { + public void workAddress(Address workAddress) { this.workAddress = workAddress; } - public long getId() { + public long id() { return id; } - public long getVersion() { + public long version() { return version; } } diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java index 19e8d09fe..90e725416 100644 --- a/tests/test-java16/src/main/java/org/example/records/Course.java +++ b/tests/test-java16/src/main/java/org/example/records/Course.java @@ -19,15 +19,15 @@ public class Course extends BaseModel { this.name = name; } - public String getName() { + public String name() { return name; } - public String getSummary() { + public String summary() { return summary; } - public void setSummary(String summary) { + public void summary(String summary) { this.summary = summary; } } diff --git a/tests/test-java16/src/main/java/org/example/records/UserRole.java b/tests/test-java16/src/main/java/org/example/records/UserRole.java index 682e61f4a..1d25f6e97 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRole.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRole.java @@ -22,15 +22,15 @@ public class UserRole extends Model { this.note = note; } - public UserRoleId getId() { + public UserRoleId id() { return id; } - public String getNote() { + public String note() { return note; } - public long getVersion() { + public long version() { return version; } } diff --git a/tests/test-java16/src/main/java/org/example/records/UserSite.java b/tests/test-java16/src/main/java/org/example/records/UserSite.java index a8cf46449..fb881c32e 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSite.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSite.java @@ -25,27 +25,27 @@ public class UserSite extends Model { this.siteId = siteId; } - public UUID getUserId() { + public UUID userId() { return userId; } - public UUID getSiteId() { + public UUID siteId() { return siteId; } - public void setNote(String note) { + public void note(String note) { this.note = note; } - public void setVersion(long version) { + public void version(long version) { this.version = version; } - public String getNote() { + public String note() { return note; } - public long getVersion() { + public long version() { return version; } } diff --git a/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java b/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java index e64c15b1c..36c4a4fbf 100644 --- a/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java +++ b/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java @@ -16,7 +16,7 @@ class DtoQueryUsingRecordsTest { void dtoQuery_projectRecords() { var course = new Course("Calculus"); - course.setSummary("Something here"); + course.summary("Something here"); course.save(); performOrmQuery(); @@ -41,7 +41,7 @@ class DtoQueryUsingRecordsTest { .findList(); assertThat(records).hasSize(1); - assertThat(records.get(0).name()).isEqualTo(course.getName()); + assertThat(records.get(0).name()).isEqualTo(course.name()); } private void records_via_OrmQueryToDtoQuery(Course course) { @@ -52,7 +52,7 @@ class DtoQueryUsingRecordsTest { .findList(); assertThat(records2).hasSize(1); - assertThat(records2.get(0).name()).isEqualTo(course.getName()); + assertThat(records2.get(0).name()).isEqualTo(course.name()); } public record Foo(long id, String name){} diff --git a/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java index 271481468..90cc1c5e4 100644 --- a/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java +++ b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java @@ -13,36 +13,41 @@ public class RecordAsEmbeddedTest { void insert_query() { var contact = new Contact("Rob"); - contact.setWorkAddress(new Address("45 work", "workling", "wo")); - contact.setHomeAddress(new Address("94 home st", "homeline", "wo")); + contact.workAddress(new Address("45 work", "workling", "wo")); + contact.homeAddress(new Address("94 home st", "homeline", "wo")); contact.save(); Contact found = new QContact() - .id.eq(contact.getId()) + .id.eq(contact.id()) .findOne(); - assertThat(found.getWorkAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]"); - assertThat(found.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); + assert found != null; + + assertThat(found.workAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]"); + assertThat(found.homeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); Contact foundPartial = new QContact() .select(name, homeAddress) - .id.eq(contact.getId()) + .id.eq(contact.id()) .findOne(); - // invoke lazy loading on getWorkAddress - assertThat(foundPartial.getWorkAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]"); - assertThat(foundPartial.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); + assert foundPartial != null; + + // invoke lazy loading on workAddress + assertThat(foundPartial.workAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]"); + assertThat(foundPartial.homeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); Contact foundNoLazyLoading = new QContact() .select(name, homeAddress) .setDisableLazyLoading(true) - .id.eq(contact.getId()) + .id.eq(contact.id()) .findOne(); - // no lazy loading on getWorkAddress this time - assertThat(foundNoLazyLoading.getWorkAddress()).isNull(); - assertThat(foundNoLazyLoading.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); + assert foundNoLazyLoading != null; + // no lazy loading on workAddress this time + assertThat(foundNoLazyLoading.workAddress()).isNull(); + assertThat(foundNoLazyLoading.homeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]"); } } diff --git a/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java b/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java index 47008c544..28696b6a2 100644 --- a/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java +++ b/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java @@ -16,7 +16,7 @@ class RecordIdClassTest { UUID siteId = UUID.randomUUID(); var userSite = new UserSite(userId, siteId); - userSite.setNote("HelloIdClass"); + userSite.note("HelloIdClass"); userSite.save(); var id = new UserSiteId(userId, siteId); @@ -25,10 +25,20 @@ class RecordIdClassTest { .setId(id) .findOne(); - assertThat(found.getUserId()).isEqualTo(userId); - assertThat(found.getSiteId()).isEqualTo(siteId); - assertThat(found.getNote()).isEqualTo("HelloIdClass"); + assert found != null; + assertThat(found.userId()).isEqualTo(userId); + assertThat(found.siteId()).isEqualTo(siteId); + assertThat(found.note()).isEqualTo("HelloIdClass"); + // again but using the scalar id properties + UserSite found2 = new QUserSite() + .siteId.eq(id.siteId()) + .userId.eq(id.userId()) + .findOne(); + assert found2 != null; + assertThat(found2.userId()).isEqualTo(userId); + assertThat(found2.siteId()).isEqualTo(siteId); + assertThat(found2.note()).isEqualTo("HelloIdClass"); } } diff --git a/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java b/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java index 1b4231b58..3f2e4a150 100644 --- a/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java +++ b/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java @@ -30,7 +30,7 @@ class UserRoleTest { .id.eq(new UserRoleId(42, "R7")) .findOne(); - UserRoleId id1 = found.getId(); + UserRoleId id1 = found.id(); assertThat(id1).isEqualTo(id); assertThat(id1.userId()).isEqualTo(42); assertThat(id1.roleId()).isEqualTo("R7"); From 9fc2ec044d0a99e39550ff9474c77d65447b800d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 18:18:16 +1200 Subject: [PATCH 094/102] #2362 - ENH: Add lock(bean) method as convenience for DB pessimistic locking --- ebean-api/src/main/java/io/ebean/DB.java | 15 +++++ .../src/main/java/io/ebean/Database.java | 14 ++++ .../server/core/DefaultServer.java | 25 ++++--- .../io/ebeaninternal/api/TDSpiServer.java | 4 ++ .../org/tests/basic/TestQueryForUpdate.java | 66 ++++++++++++++++++- 5 files changed, 113 insertions(+), 11 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 7c8523648..9bcfb047d 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -1272,6 +1272,21 @@ public final class DB { return beanId(bean); } + /** + * Load and lock the bean using {@code select for update}. + *

    + * This should be executed inside a transaction. + *

    + * The bean needs to have an ID property set and can be a reference bean (only has ID) + * or partially or fully populated bean. This will load all the properties of the bean + * from the database using {@code select for update}. + * + * @param bean The entity bean that we wish to obtain a database lock on. + */ + public static void lock(Object bean) { + getDefault().lock(bean); + } + /** * Deprecated migrate to cacheManager(). */ diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 594644c62..396f3225a 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1714,6 +1714,20 @@ public interface Database { */ Set validateQuery(Query query); + /** + * Load and lock the bean using {@code select for update}. + *

    + * This should be executed inside a transaction and results in the bean being loaded or + * refreshed from the database and a database row lock held via {@code select for update}. + *

    + * The bean needs to have an ID property set and can be a reference bean (only has ID) + * or partially or fully populated bean. This will load all the properties of the bean + * from the database using {@code select for update} obtaining a database row lock (using WAIT). + * + * @param bean The entity bean that we wish to obtain a database lock on. + */ + void lock(Object bean); + /** * Truncate all the given tables. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 576ee5add..0e293d37d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -129,16 +129,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.time.Clock; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.Spliterator; +import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; @@ -930,6 +921,20 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { executeInTrans((txn) -> persister.merge(desc, checkEntityBean(bean), options, txn), transaction); } + @Override + public void lock(Object bean) { + BeanDescriptor desc = descriptor(bean.getClass()); + if (desc == null) { + throw new PersistenceException(bean.getClass() + " is NOT an Entity Bean registered with this server?"); + } + Object id = desc.id(bean); + Objects.requireNonNull(id, "Bean missing an @Id value which is required to lock"); + new DefaultOrmQuery<>(desc, this, expressionFactory) + .setId(id) + .withLock(Query.LockType.DEFAULT, Query.LockWait.NOWAIT) + .findOne(); + } + @Override public Query find(Class beanType) { return createQuery(beanType); diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java index 2ea3b617d..620e9664a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java @@ -137,6 +137,10 @@ public class TDSpiServer implements SpiServer { return null; } + @Override + public void lock(Object bean) { + } + @Override public Object nextId(Class beanType) { return null; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 1347da7e2..527146367 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -7,12 +7,13 @@ import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; +import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryForUpdate extends BaseTestCase { @@ -40,6 +41,69 @@ public class TestQueryForUpdate extends BaseTestCase { } } + @Test + @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB}) + public void testForUpdate_when_alreadyInPCAsReference() { + ResetBasicData.reset(); + Order o0 = DB.find(Order.class).orderBy("id").setMaxRows(1).findOne(); + Integer customerId = o0.getCustomer().getId(); + + try (Transaction transaction = DB.beginTransaction()) { + + LoggedSql.start(); + Order order = DB.find(Order.class, o0.getId()); + assert order != null; + + Customer customer = order.getCustomer(); + assertTrue(DB.beanState(customer).isReference()); + assertEquals(customerId, customer.getId()); + + Customer customer1 = DB.find(Customer.class).where().idEq(customer.getId()).forUpdate().findOne(); + + assertThat(customer).isSameAs(customer1); + assertThat(customer.getName()).isNotNull(); + + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("from o_order"); + assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update"); + + transaction.commit(); + } + } + + @Test + @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB}) + public void testForUpdate_when_alreadyInPCAsReference_usingLock() { + ResetBasicData.reset(); + Order o0 = DB.find(Order.class).orderBy("id").setMaxRows(1).findOne(); + Integer customerId = o0.getCustomer().getId(); + + try (Transaction transaction = DB.beginTransaction()) { + + LoggedSql.start(); + Order order = DB.find(Order.class, o0.getId()); + assert order != null; + + Customer customer = order.getCustomer(); + assertEquals(customerId, customer.getId()); + assertTrue(DB.beanState(customer).isReference()); + + DB.lock(customer); // load the customer bean using select for update + // bean is now loaded and database row lock held until commit + assertFalse(DB.beanState(customer).isReference()); + + assertThat(customer.getName()).isNotNull(); + + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("from o_order"); + assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update"); + + transaction.commit(); + } + } + @Test @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB}) public void testForUpdate_when_alreadyInPC() { From e29e032693d5243da89185477d582887b81a27b7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 21:57:43 +1200 Subject: [PATCH 095/102] [maven-release-plugin] prepare release ebean-parent-12.11.4 --- ebean-api/pom.xml | 2 +- ebean-api/pom.xml.releaseBackup | 131 ++++++++++ ebean-autotune/pom.xml | 6 +- ebean-autotune/pom.xml.releaseBackup | 85 ++++++ ebean-bom/pom.xml | 30 +-- ebean-bom/pom.xml.releaseBackup | 162 ++++++++++++ ebean-core-type/pom.xml | 4 +- ebean-core-type/pom.xml.releaseBackup | 31 +++ ebean-core/pom.xml | 10 +- ebean-core/pom.xml.releaseBackup | 246 ++++++++++++++++++ ebean-ddl-generator/pom.xml | 6 +- ebean-ddl-generator/pom.xml.releaseBackup | 108 ++++++++ ebean-externalmapping-api/pom.xml | 2 +- .../pom.xml.releaseBackup | 28 ++ ebean-externalmapping-xml/pom.xml | 10 +- .../pom.xml.releaseBackup | 110 ++++++++ ebean-postgis/pom.xml | 6 +- ebean-postgis/pom.xml.releaseBackup | 117 +++++++++ ebean-querybean/pom.xml | 10 +- ebean-querybean/pom.xml.releaseBackup | 124 +++++++++ ebean-redis/pom.xml | 12 +- ebean-redis/pom.xml.releaseBackup | 92 +++++++ ebean-test/pom.xml | 6 +- ebean-test/pom.xml.releaseBackup | 242 +++++++++++++++++ ebean/pom.xml | 8 +- ebean/pom.xml.releaseBackup | 57 ++++ kotlin-querybean-generator/pom.xml | 8 +- .../pom.xml.releaseBackup | 186 +++++++++++++ pom.xml | 4 +- pom.xml.releaseBackup | 97 +++++++ querybean-generator/pom.xml | 2 +- querybean-generator/pom.xml.releaseBackup | 41 +++ release.properties | 83 ++++++ 33 files changed, 2003 insertions(+), 63 deletions(-) create mode 100644 ebean-api/pom.xml.releaseBackup create mode 100644 ebean-autotune/pom.xml.releaseBackup create mode 100644 ebean-bom/pom.xml.releaseBackup create mode 100644 ebean-core-type/pom.xml.releaseBackup create mode 100644 ebean-core/pom.xml.releaseBackup create mode 100644 ebean-ddl-generator/pom.xml.releaseBackup create mode 100644 ebean-externalmapping-api/pom.xml.releaseBackup create mode 100644 ebean-externalmapping-xml/pom.xml.releaseBackup create mode 100644 ebean-postgis/pom.xml.releaseBackup create mode 100644 ebean-querybean/pom.xml.releaseBackup create mode 100644 ebean-redis/pom.xml.releaseBackup create mode 100644 ebean-test/pom.xml.releaseBackup create mode 100644 ebean/pom.xml.releaseBackup create mode 100644 kotlin-querybean-generator/pom.xml.releaseBackup create mode 100644 pom.xml.releaseBackup create mode 100644 querybean-generator/pom.xml.releaseBackup create mode 100644 release.properties diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index e3872012e..eac6fe0c0 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean api diff --git a/ebean-api/pom.xml.releaseBackup b/ebean-api/pom.xml.releaseBackup new file mode 100644 index 000000000..e3872012e --- /dev/null +++ b/ebean-api/pom.xml.releaseBackup @@ -0,0 +1,131 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean api + ebean api + ebean-api + + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.avaje + avaje-config + 1.3 + + + + + io.avaje + avaje-jsr305 + 1.0 + provided + + + + io.ebean + persistence-api + 2.2.4 + + + + io.ebean + ebean-annotation + 7.2 + + + + io.ebean + ebean-types + 2.1 + + + + io.ebean + ebean-datasource-api + ${ebean-datasource.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + + com.h2database + h2 + 1.4.199 + true + + + + javax.transaction + jta + 1.1 + true + + + + javax.servlet + javax.servlet-api + 3.1.0 + true + + + + io.avaje + junit + 1.0 + test + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 6a9ea5871..bd04fae50 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.4 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided diff --git a/ebean-autotune/pom.xml.releaseBackup b/ebean-autotune/pom.xml.releaseBackup new file mode 100644 index 000000000..6a9ea5871 --- /dev/null +++ b/ebean-autotune/pom.xml.releaseBackup @@ -0,0 +1,85 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + + + + + + + scm:git:git@github.com:ebean-orm/ebean.git + ebean-parent-12.8.0 + + + ebean autotune + ebean automatic query tuning module + ebean-autotune + + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + + io.ebean.tile:enhancement:12.11.3 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 0d6fea6c8..ebf6e398b 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-api - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-core-type - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-ddl-generator - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-externalmapping-api - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-externalmapping-xml - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-autotune - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-querybean - 12.11.4-SNAPSHOT + 12.11.4 io.ebean querybean-generator - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean kotlin-querybean-generator - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean ebean-test - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean ebean-postgis - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-redis - 12.11.4-SNAPSHOT + 12.11.4 diff --git a/ebean-bom/pom.xml.releaseBackup b/ebean-bom/pom.xml.releaseBackup new file mode 100644 index 000000000..0d6fea6c8 --- /dev/null +++ b/ebean-bom/pom.xml.releaseBackup @@ -0,0 +1,162 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean bom + ebean bill of materials pom + ebean-bom + pom + + + + + + + + + io.ebean + ebean-ddl-runner + ${ebean-ddl-runner.version} + + + + io.ebean + ebean-migration-auto + ${ebean-migration-auto.version} + + + + io.ebean + ebean-migration + ${ebean-migration.version} + + + + io.ebean + ebean-datasource-api + ${ebean-datasource.version} + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-agent + ${ebean-agent.version} + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + + io.ebean + ebean-test-docker + ${ebean-test-docker.version} + + + + + + io.ebean + ebean + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-api + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-core-type + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-ddl-generator + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-externalmapping-api + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-externalmapping-xml + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-autotune + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-querybean + 12.11.4-SNAPSHOT + + + + io.ebean + querybean-generator + 12.11.4-SNAPSHOT + provided + + + + io.ebean + kotlin-querybean-generator + 12.11.4-SNAPSHOT + provided + + + + io.ebean + ebean-test + 12.11.4-SNAPSHOT + test + + + + io.ebean + ebean-postgis + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-redis + 12.11.4-SNAPSHOT + + + + + + + diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index b892e1dad..8192d1900 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.4-SNAPSHOT + 12.11.4 diff --git a/ebean-core-type/pom.xml.releaseBackup b/ebean-core-type/pom.xml.releaseBackup new file mode 100644 index 000000000..b892e1dad --- /dev/null +++ b/ebean-core-type/pom.xml.releaseBackup @@ -0,0 +1,31 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean-core-type + ebean core type + ebean scalar types api + + + + + io.ebean + ebean-api + 12.11.4-SNAPSHOT + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + + diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e4ff17668..33b417bf3 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.4 @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-core-type - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-externalmapping-api - 12.11.4-SNAPSHOT + 12.11.4 diff --git a/ebean-core/pom.xml.releaseBackup b/ebean-core/pom.xml.releaseBackup new file mode 100644 index 000000000..e4ff17668 --- /dev/null +++ b/ebean-core/pom.xml.releaseBackup @@ -0,0 +1,246 @@ + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean-core + jar + + ebean core + ebean core module + https://ebean.io/ + + + scm:git:git@github.com:ebean-orm/ebean.git + ebean-parent-12.8.0 + + + + + + io.ebean + ebean-ddl-runner + 1.0 + + + + io.avaje + classpath-scanner + 6.0 + + + + io.ebean + ebean-migration-auto + 1.1 + + + + io.ebean + ebean-api + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-core-type + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-externalmapping-api + 12.11.4-SNAPSHOT + + + + org.antlr + antlr4-runtime + 4.8-1 + + + + + io.avaje + avaje-jsr305 + 1.0 + provided + + + + + com.h2database + h2 + 1.4.199 + provided + + + + javax.transaction + jta + 1.1 + true + + + + + javax.validation + validation-api + 1.1.0.Final + true + + + jakarta.validation + jakarta.validation-api + 3.0.0 + true + + + + joda-time + joda-time + 2.9.7 + true + + + + javax.annotation + javax.annotation-api + 1.3.2 + true + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + + org.postgresql + postgresql + 42.2.20 + true + + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=0 + + + testEnhance + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M4 + + false + false + false + + **/Test*.java + **/*Test.java + **/*Tests.java + + + + + datasource.default + ${datasource.default} + + + + dbClockDelta + ${dbClockDelta} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + Ebean 12 + src/main/java/io/ebean/overview.html + io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform + true + src/main/java/com/avaje/ebean/overview.html + + + + attach-javadocs + + jar + + + + + + + + + + diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 53be2b49a..a4bf66b2b 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean ddl generation @@ -29,14 +29,14 @@ io.ebean ebean-core-type - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided diff --git a/ebean-ddl-generator/pom.xml.releaseBackup b/ebean-ddl-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..53be2b49a --- /dev/null +++ b/ebean-ddl-generator/pom.xml.releaseBackup @@ -0,0 +1,108 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean ddl generation + DDL and DB Migration generation + ebean-ddl-generator + + + + + + io.ebean + ebean-ddl-runner + 1.0 + + + + io.ebean + ebean-migration + 12.11.0 + + + + io.ebean + ebean-core-type + 12.11.4-SNAPSHOT + provided + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + provided + + + + + io.avaje + junit + 1.0 + test + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + javax.validation + validation-api + 1.1.0.Final + test + + + + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=0 + + + testEnhance + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index e09f3c5c0..4b6908cc6 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean external mapping api diff --git a/ebean-externalmapping-api/pom.xml.releaseBackup b/ebean-externalmapping-api/pom.xml.releaseBackup new file mode 100644 index 000000000..e09f3c5c0 --- /dev/null +++ b/ebean-externalmapping-api/pom.xml.releaseBackup @@ -0,0 +1,28 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean external mapping api + API for mapping external named queries + ebean-externalmapping-api + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 246b915d8..26d6dbad9 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.4 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.4-SNAPSHOT + 12.11.4 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean ebean-ddl-generator - 12.11.4-SNAPSHOT + 12.11.4 test diff --git a/ebean-externalmapping-xml/pom.xml.releaseBackup b/ebean-externalmapping-xml/pom.xml.releaseBackup new file mode 100644 index 000000000..246b915d8 --- /dev/null +++ b/ebean-externalmapping-xml/pom.xml.releaseBackup @@ -0,0 +1,110 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + + + + + + + scm:git:git@github.com:ebean-orm/ebean.git + ebean-parent-12.8.0 + + + ebean external mapping xml + XML implementation for mapping external named queries + ebean-externalmapping-xml + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.ebean + ebean-externalmapping-api + 12.11.4-SNAPSHOT + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + io.avaje + classpath-scanner + 6.0 + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + test + + + + io.ebean + ebean-ddl-generator + 12.11.4-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + + io.ebean.tile:enhancement:12.11.3 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 91035b7d9..a45515fe7 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.4-SNAPSHOT + 12.11.4 test diff --git a/ebean-postgis/pom.xml.releaseBackup b/ebean-postgis/pom.xml.releaseBackup new file mode 100644 index 000000000..91035b7d9 --- /dev/null +++ b/ebean-postgis/pom.xml.releaseBackup @@ -0,0 +1,117 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean postgis + ebean postgis module + https://ebean.io/ + + ebean-postgis + + + 2.2.1 + + + + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + net.postgis + postgis-jdbc + [${postgis.jdbc.version}] + + + + + org.postgresql + postgresql + 42.2.8 + provided + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + + org.geolatte + geolatte-geom + 1.0.6 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-test + 12.11.4-SNAPSHOT + test + + + + org.avaje.composite + logback + 1.1 + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + + + + + + + + + diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a1e4f6fc9..62cf72399 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean querybean-generator - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean ebean-test - 12.11.4-SNAPSHOT + 12.11.4 test diff --git a/ebean-querybean/pom.xml.releaseBackup b/ebean-querybean/pom.xml.releaseBackup new file mode 100644 index 000000000..a1e4f6fc9 --- /dev/null +++ b/ebean-querybean/pom.xml.releaseBackup @@ -0,0 +1,124 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean querybean + Ebean querybean support + ebean-querybean + + + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + + io.avaje + avaje-jsr305 + 1.0 + provided + + + + joda-time + joda-time + 1.6 + true + + + + javax.validation + validation-api + 1.0.0.GA + true + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-ddl-generator + 12.11.4-SNAPSHOT + test + + + + io.ebean + querybean-generator + 12.11.4-SNAPSHOT + test + + + + io.ebean + ebean-test + 12.11.4-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + org.avaje.composite + logback + 1.1 + test + + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + + diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 5a55646d0..42a2eada6 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean ebean-querybean - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean querybean-generator - 12.11.4-SNAPSHOT + 12.11.4 test io.ebean ebean-test - 12.11.4-SNAPSHOT + 12.11.4 test diff --git a/ebean-redis/pom.xml.releaseBackup b/ebean-redis/pom.xml.releaseBackup new file mode 100644 index 000000000..5a55646d0 --- /dev/null +++ b/ebean-redis/pom.xml.releaseBackup @@ -0,0 +1,92 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean-redis + ebean redis + Ebean Redis L2 Cache + + + + + redis.clients + jedis + 3.6.3 + + + + io.ebean + ebean-api + 12.11.4-SNAPSHOT + provided + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + io.ebean + ebean-querybean + 12.11.4-SNAPSHOT + test + + + + io.ebean + querybean-generator + 12.11.4-SNAPSHOT + test + + + + io.ebean + ebean-test + 12.11.4-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + org.avaje.composite + logback + 1.1 + test + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + + + + + + + + + diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 5d6dccd65..8299dcb19 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 provided io.ebean ebean-ddl-generator - 12.11.4-SNAPSHOT + 12.11.4 diff --git a/ebean-test/pom.xml.releaseBackup b/ebean-test/pom.xml.releaseBackup new file mode 100644 index 000000000..5d6dccd65 --- /dev/null +++ b/ebean-test/pom.xml.releaseBackup @@ -0,0 +1,242 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean test + Testing support for Ebean + ebean-test + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + provided + + + + io.ebean + ebean-ddl-generator + 12.11.4-SNAPSHOT + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + true + + + + io.ebean + ebean-test-docker + 4.2 + + + + org.assertj + assertj-core + 3.14.0 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + + com.h2database + h2 + 1.4.199 + + + + + + io.avaje + avaje-jsr305 + 1.0 + test + + + + io.ebean + ebean-migration + 12.4.0 + test + + + + io.avaje + mod-uuid + 1.1 + test + + + + javax.transaction + jta + 1.1 + test + + + + + javax.validation + validation-api + 1.1.0.Final + test + + + + jakarta.validation + jakarta.validation-api + 3.0.0 + test + + + + joda-time + joda-time + 2.9.7 + test + + + + javax.annotation + javax.annotation-api + 1.3.2 + test + + + commons-io + commons-io + 2.7 + test + + + + org.postgresql + postgresql + 42.2.18 + test + + + + com.microsoft.sqlserver + mssql-jdbc + 6.2.2.jre8 + test + + + + mysql + mysql-connector-java + 8.0.16 + test + + + + org.mariadb.jdbc + mariadb-java-client + 2.6.0 + test + + + + com.sap.cloud.db.jdbc + ngdbc + 2.3.48 + test + + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + + io.avaje + junit + 1.0 + test + + + + + + + db2 + + + + com.ibm.db2 + jcc + 11.5.5.0 + test + + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + + diff --git a/ebean/pom.xml b/ebean/pom.xml index 02f283b23..72e43f507 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 io.ebean ebean-querybean - 12.11.4-SNAPSHOT + 12.11.4 diff --git a/ebean/pom.xml.releaseBackup b/ebean/pom.xml.releaseBackup new file mode 100644 index 000000000..02f283b23 --- /dev/null +++ b/ebean/pom.xml.releaseBackup @@ -0,0 +1,57 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + ebean composite + Composite of common runtime dependencies + ebean + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-api + 12.11.4-SNAPSHOT + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + + + + + io.ebean + ebean-querybean + 12.11.4-SNAPSHOT + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 1747c3975..d0f2c7855 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.4-SNAPSHOT + 12.11.4 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.4-SNAPSHOT + 12.11.4 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.4-SNAPSHOT + 12.11.4 test diff --git a/kotlin-querybean-generator/pom.xml.releaseBackup b/kotlin-querybean-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..1747c3975 --- /dev/null +++ b/kotlin-querybean-generator/pom.xml.releaseBackup @@ -0,0 +1,186 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + kotlin querybean generator + Generates Kotlin querybeans + kotlin-querybean-generator + + + 1.5.30-M1 + + + + + + + + io.avaje + junit + 1.0 + test + + + + io.ebean + ebean-querybean + 12.11.4-SNAPSHOT + test + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-core + 12.11.4-SNAPSHOT + test + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + provided + + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + io.ebean + ebean-ddl-generator + 12.11.4-SNAPSHOT + test + + + + javax.validation + validation-api + 1.1.0.Final + test + + + + + + + src/test/kotlin + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + test-compile + test-compile + + test-compile + + + + test-kapt + + test-kapt + + + + src/test/kotlin + + + + io.ebean + kotlin-querybean-generator + 12.8.2 + + + + + + compile + compile + + compile + + + + src/main/java + target/generated-sources/kapt/test + target/generated-sources/kaptKotlin/test + + + + + + 1.8 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + default-testCompile + none + + + java-test-compile + test-compile + + testCompile + + + + compile + compile + + compile + + + + + 1.8 + 1.8 + + -proc:none + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=1 + + + testEnhance + + + + + + + + + diff --git a/pom.xml b/pom.xml index 68cdce53d..e428483d1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.4-SNAPSHOT + 12.11.4 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 + ebean-parent-12.11.4 diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup new file mode 100644 index 000000000..68cdce53d --- /dev/null +++ b/pom.xml.releaseBackup @@ -0,0 +1,97 @@ + + + 4.0.0 + + org.avaje + java8-oss + 3.2 + + + io.ebean + ebean-parent + 12.11.4-SNAPSHOT + pom + + ebean parent + Parent for ebean modules + https://ebean.io/ + + + scm:git:git@github.com:ebean-orm/ebean.git + ebean-parent-12.8.0 + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + rbygrave + Rob Bygrave + robin.bygrave@gmail.com + + + + + true + 2.12.1 + 1.0 + 1.1 + 12.11.0 + 4.1 + 7.2 + 12.11.2 + 12.11.2 + + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + + com.h2database + h2 + 1.4.199 + test + + + + + + ebean + ebean-api + ebean-bom + ebean-core-type + ebean-core + ebean-ddl-generator + ebean-autotune + ebean-externalmapping-api + ebean-externalmapping-xml + ebean-test + querybean-generator + kotlin-querybean-generator + ebean-querybean + ebean-postgis + ebean-redis + + + + + diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 6a9960694..bf75d6127 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4-SNAPSHOT + 12.11.4 querybean generator diff --git a/querybean-generator/pom.xml.releaseBackup b/querybean-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..6a9960694 --- /dev/null +++ b/querybean-generator/pom.xml.releaseBackup @@ -0,0 +1,41 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.11.4-SNAPSHOT + + + querybean generator + Querybean generator + querybean-generator + + + + + io.avaje + junit + 1.0 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + -proc:none + + + + + + diff --git a/release.properties b/release.properties new file mode 100644 index 000000000..293899571 --- /dev/null +++ b/release.properties @@ -0,0 +1,83 @@ +#release configuration +#Thu Sep 09 21:41:10 NZST 2021 +projectVersionPolicyId=default +project.scm.io.ebean\:ebean-core-type.tag=ebean-parent-12.8.0 +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +project.rel.io.ebean\:ebean-ddl-generator=12.11.4 +project.dev.io.ebean\:ebean-core=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean-api.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-redis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-querybean.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-api=12.11.5-SNAPSHOT +project.rel.io.ebean\:ebean=12.11.4 +project.dev.io.ebean\:ebean-core-type=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean-ddl-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +exec.activateProfiles=release +project.dev.io.ebean\:ebean-test=12.11.5-SNAPSHOT +project.scm.io.ebean\:kotlin-querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-querybean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-bom.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.rel.io.ebean\:ebean-core-type=12.11.4 +project.rel.io.ebean\:kotlin-querybean-generator=12.11.4 +project.dev.io.ebean\:querybean-generator=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.commentPrefix=[maven-release-plugin] +releaseStrategyId=default +project.rel.io.ebean\:ebean-querybean=12.11.4 +project.scm.io.ebean\:ebean-externalmapping-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:kotlin-querybean-generator=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean-core-type.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +completedPhase=generate-release-poms +project.rel.io.ebean\:ebean-redis=12.11.4 +project.scm.io.ebean\:ebean-test.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-postgis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-autotune=12.11.5-SNAPSHOT +project.rel.io.ebean\:ebean-api=12.11.4 +project.scm.io.ebean\:ebean-postgis.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:querybean-generator.tag=ebean-parent-12.8.0 +project.rel.io.ebean\:querybean-generator=12.11.4 +scm.tag=ebean-parent-12.11.4 +project.rel.io.ebean\:ebean-externalmapping-xml=12.11.4 +project.scm.io.ebean\:ebean-ddl-generator.tag=ebean-parent-12.8.0 +project.rel.io.ebean\:ebean-externalmapping-api=12.11.4 +project.scm.io.ebean\:ebean-externalmapping-xml.tag=ebean-parent-12.8.0 +preparationGoals=clean verify +exec.pomFileName=pom.xml +project.dev.io.ebean\:ebean-externalmapping-api=12.11.5-SNAPSHOT +project.dev.io.ebean\:ebean=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-parent=12.11.5-SNAPSHOT +project.dev.io.ebean\:ebean-externalmapping-xml=12.11.5-SNAPSHOT +project.rel.io.ebean\:ebean-core=12.11.4 +project.dev.io.ebean\:ebean-redis=12.11.5-SNAPSHOT +project.dev.io.ebean\:ebean-postgis=12.11.5-SNAPSHOT +project.scm.io.ebean\:ebean-redis.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-parent.tag=ebean-parent-12.8.0 +pushChanges=true +project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.rel.io.ebean\:ebean-test=12.11.4 +project.scm.io.ebean\:kotlin-querybean-generator.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-bom.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-autotune.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean.tag=ebean-parent-12.8.0 +project.scm.io.ebean\:ebean-core.tag=ebean-parent-12.8.0 +project.rel.io.ebean\:ebean-autotune=12.11.4 +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +remoteTagging=true +project.dev.io.ebean\:ebean-bom=12.11.5-SNAPSHOT +project.dev.io.ebean\:ebean-querybean=12.11.5-SNAPSHOT +project.rel.io.ebean\:ebean-bom=12.11.4 +project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.url=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.developmentCommitComment=@{prefix} prepare for next development iteration +project.scm.io.ebean\:ebean-externalmapping-api.tag=ebean-parent-12.8.0 +scm.tagNameFormat=@{project.artifactId}-@{project.version} +project.scm.io.ebean\:ebean-test.tag=ebean-parent-12.8.0 +project.dev.io.ebean\:ebean-ddl-generator=12.11.5-SNAPSHOT +exec.snapshotReleasePluginAllowed=false +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} +project.rel.io.ebean\:ebean-postgis=12.11.4 +project.rel.io.ebean\:ebean-parent=12.11.4 From 2733608a7226e5547c6a85a01c6d88b3629a1f2f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 21:57:50 +1200 Subject: [PATCH 096/102] [maven-release-plugin] prepare for next development iteration --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 4 ++-- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 8 ++++---- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 8 ++++---- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- 16 files changed, 59 insertions(+), 59 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index eac6fe0c0..57f14a27d 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index bd04fae50..c98444f78 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index ebf6e398b..a21697986 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-api - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-core-type - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-ddl-generator - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-autotune - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-querybean - 12.11.4 + 12.11.5-SNAPSHOT io.ebean querybean-generator - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean ebean-test - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean ebean-postgis - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-redis - 12.11.4 + 12.11.5-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 8192d1900..512ed0b45 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.11.4 + 12.11.5-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 33b417bf3..32b24bd01 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-core-type - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-externalmapping-api - 12.11.4 + 12.11.5-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a4bf66b2b..3a1ef6505 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean ddl generation @@ -29,14 +29,14 @@ io.ebean ebean-core-type - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 4b6908cc6..25800d648 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 26d6dbad9..6b75aeb2f 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.11.4 + 12.11.5-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean ebean-ddl-generator - 12.11.4 + 12.11.5-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index a45515fe7..42a16dbaf 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.11.4 + 12.11.5-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 62cf72399..f0275cd74 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided @@ -57,21 +57,21 @@ io.ebean ebean-ddl-generator - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean querybean-generator - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean ebean-test - 12.11.4 + 12.11.5-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 42a2eada6..0b8653312 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean ebean-querybean - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean querybean-generator - 12.11.4 + 12.11.5-SNAPSHOT test io.ebean ebean-test - 12.11.4 + 12.11.5-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 8299dcb19..ecd8ebdb6 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.11.4 + 12.11.5-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 72e43f507..5664c8f7f 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT io.ebean ebean-querybean - 12.11.4 + 12.11.5-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index d0f2c7855..5898e7456 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.11.4 + 12.11.5-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.11.4 + 12.11.5-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.11.4 + 12.11.5-SNAPSHOT test diff --git a/pom.xml b/pom.xml index e428483d1..215bf59fa 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.11.4 + 12.11.5-SNAPSHOT pom ebean parent diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index bf75d6127..59291dfdb 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.11.4 + 12.11.5-SNAPSHOT querybean generator From 9324d1cebe1e95d4c0065d09bda5500ed8848af2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 10 Sep 2021 21:47:27 +1200 Subject: [PATCH 097/102] Delete the pom.xml.releaseBackup files that somehow got added --- ebean-api/pom.xml.releaseBackup | 131 ---------- ebean-autotune/pom.xml.releaseBackup | 85 ------ ebean-bom/pom.xml.releaseBackup | 162 ------------ ebean-core-type/pom.xml.releaseBackup | 31 --- ebean-core/pom.xml.releaseBackup | 246 ------------------ ebean-ddl-generator/pom.xml.releaseBackup | 108 -------- .../pom.xml.releaseBackup | 28 -- .../pom.xml.releaseBackup | 110 -------- ebean-postgis/pom.xml.releaseBackup | 117 --------- ebean-querybean/pom.xml.releaseBackup | 124 --------- ebean-redis/pom.xml.releaseBackup | 92 ------- ebean-test/pom.xml.releaseBackup | 242 ----------------- ebean/pom.xml.releaseBackup | 57 ---- .../pom.xml.releaseBackup | 186 ------------- pom.xml.releaseBackup | 97 ------- querybean-generator/pom.xml.releaseBackup | 41 --- release.properties | 83 ------ 17 files changed, 1940 deletions(-) delete mode 100644 ebean-api/pom.xml.releaseBackup delete mode 100644 ebean-autotune/pom.xml.releaseBackup delete mode 100644 ebean-bom/pom.xml.releaseBackup delete mode 100644 ebean-core-type/pom.xml.releaseBackup delete mode 100644 ebean-core/pom.xml.releaseBackup delete mode 100644 ebean-ddl-generator/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-api/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-xml/pom.xml.releaseBackup delete mode 100644 ebean-postgis/pom.xml.releaseBackup delete mode 100644 ebean-querybean/pom.xml.releaseBackup delete mode 100644 ebean-redis/pom.xml.releaseBackup delete mode 100644 ebean-test/pom.xml.releaseBackup delete mode 100644 ebean/pom.xml.releaseBackup delete mode 100644 kotlin-querybean-generator/pom.xml.releaseBackup delete mode 100644 pom.xml.releaseBackup delete mode 100644 querybean-generator/pom.xml.releaseBackup delete mode 100644 release.properties diff --git a/ebean-api/pom.xml.releaseBackup b/ebean-api/pom.xml.releaseBackup deleted file mode 100644 index e3872012e..000000000 --- a/ebean-api/pom.xml.releaseBackup +++ /dev/null @@ -1,131 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean api - ebean api - ebean-api - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.avaje - avaje-config - 1.3 - - - - - io.avaje - avaje-jsr305 - 1.0 - provided - - - - io.ebean - persistence-api - 2.2.4 - - - - io.ebean - ebean-annotation - 7.2 - - - - io.ebean - ebean-types - 2.1 - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - com.h2database - h2 - 1.4.199 - true - - - - javax.transaction - jta - 1.1 - true - - - - javax.servlet - javax.servlet-api - 3.1.0 - true - - - - io.avaje - junit - 1.0 - test - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - diff --git a/ebean-autotune/pom.xml.releaseBackup b/ebean-autotune/pom.xml.releaseBackup deleted file mode 100644 index 6a9ea5871..000000000 --- a/ebean-autotune/pom.xml.releaseBackup +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 - - - ebean autotune - ebean automatic query tuning module - ebean-autotune - - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - - io.ebean.tile:enhancement:12.11.3 - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - diff --git a/ebean-bom/pom.xml.releaseBackup b/ebean-bom/pom.xml.releaseBackup deleted file mode 100644 index 0d6fea6c8..000000000 --- a/ebean-bom/pom.xml.releaseBackup +++ /dev/null @@ -1,162 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean bom - ebean bill of materials pom - ebean-bom - pom - - - - - - - - - io.ebean - ebean-ddl-runner - ${ebean-ddl-runner.version} - - - - io.ebean - ebean-migration-auto - ${ebean-migration-auto.version} - - - - io.ebean - ebean-migration - ${ebean-migration.version} - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-agent - ${ebean-agent.version} - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - - io.ebean - ebean-test-docker - ${ebean-test-docker.version} - - - - - - io.ebean - ebean - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-api - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-ddl-generator - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-externalmapping-xml - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-autotune - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-querybean - 12.11.4-SNAPSHOT - - - - io.ebean - querybean-generator - 12.11.4-SNAPSHOT - provided - - - - io.ebean - kotlin-querybean-generator - 12.11.4-SNAPSHOT - provided - - - - io.ebean - ebean-test - 12.11.4-SNAPSHOT - test - - - - io.ebean - ebean-postgis - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-redis - 12.11.4-SNAPSHOT - - - - - - - diff --git a/ebean-core-type/pom.xml.releaseBackup b/ebean-core-type/pom.xml.releaseBackup deleted file mode 100644 index b892e1dad..000000000 --- a/ebean-core-type/pom.xml.releaseBackup +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean-core-type - ebean core type - ebean scalar types api - - - - - io.ebean - ebean-api - 12.11.4-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - diff --git a/ebean-core/pom.xml.releaseBackup b/ebean-core/pom.xml.releaseBackup deleted file mode 100644 index e4ff17668..000000000 --- a/ebean-core/pom.xml.releaseBackup +++ /dev/null @@ -1,246 +0,0 @@ - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean-core - jar - - ebean core - ebean core module - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 - - - - - - io.ebean - ebean-ddl-runner - 1.0 - - - - io.avaje - classpath-scanner - 6.0 - - - - io.ebean - ebean-migration-auto - 1.1 - - - - io.ebean - ebean-api - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.11.4-SNAPSHOT - - - - org.antlr - antlr4-runtime - 4.8-1 - - - - - io.avaje - avaje-jsr305 - 1.0 - provided - - - - - com.h2database - h2 - 1.4.199 - provided - - - - javax.transaction - jta - 1.1 - true - - - - - javax.validation - validation-api - 1.1.0.Final - true - - - jakarta.validation - jakarta.validation-api - 3.0.0 - true - - - - joda-time - joda-time - 2.9.7 - true - - - - javax.annotation - javax.annotation-api - 1.3.2 - true - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - org.postgresql - postgresql - 42.2.20 - true - - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M4 - - false - false - false - - **/Test*.java - **/*Test.java - **/*Tests.java - - - - - datasource.default - ${datasource.default} - - - - dbClockDelta - ${dbClockDelta} - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - Ebean 12 - src/main/java/io/ebean/overview.html - io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform - true - src/main/java/com/avaje/ebean/overview.html - - - - attach-javadocs - - jar - - - - - - - - - - diff --git a/ebean-ddl-generator/pom.xml.releaseBackup b/ebean-ddl-generator/pom.xml.releaseBackup deleted file mode 100644 index 53be2b49a..000000000 --- a/ebean-ddl-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,108 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean ddl generation - DDL and DB Migration generation - ebean-ddl-generator - - - - - - io.ebean - ebean-ddl-runner - 1.0 - - - - io.ebean - ebean-migration - 12.11.0 - - - - io.ebean - ebean-core-type - 12.11.4-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - javax.validation - validation-api - 1.1.0.Final - test - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - diff --git a/ebean-externalmapping-api/pom.xml.releaseBackup b/ebean-externalmapping-api/pom.xml.releaseBackup deleted file mode 100644 index e09f3c5c0..000000000 --- a/ebean-externalmapping-api/pom.xml.releaseBackup +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean external mapping api - API for mapping external named queries - ebean-externalmapping-api - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - diff --git a/ebean-externalmapping-xml/pom.xml.releaseBackup b/ebean-externalmapping-xml/pom.xml.releaseBackup deleted file mode 100644 index 246b915d8..000000000 --- a/ebean-externalmapping-xml/pom.xml.releaseBackup +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 - - - ebean external mapping xml - XML implementation for mapping external named queries - ebean-externalmapping-xml - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-externalmapping-api - 12.11.4-SNAPSHOT - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - io.avaje - classpath-scanner - 6.0 - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - test - - - - io.ebean - ebean-ddl-generator - 12.11.4-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - - io.ebean.tile:enhancement:12.11.3 - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - diff --git a/ebean-postgis/pom.xml.releaseBackup b/ebean-postgis/pom.xml.releaseBackup deleted file mode 100644 index 91035b7d9..000000000 --- a/ebean-postgis/pom.xml.releaseBackup +++ /dev/null @@ -1,117 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean postgis - ebean postgis module - https://ebean.io/ - - ebean-postgis - - - 2.2.1 - - - - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - net.postgis - postgis-jdbc - [${postgis.jdbc.version}] - - - - - org.postgresql - postgresql - 42.2.8 - provided - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - - org.geolatte - geolatte-geom - 1.0.6 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-test - 12.11.4-SNAPSHOT - test - - - - org.avaje.composite - logback - 1.1 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - - - - - - - - - diff --git a/ebean-querybean/pom.xml.releaseBackup b/ebean-querybean/pom.xml.releaseBackup deleted file mode 100644 index a1e4f6fc9..000000000 --- a/ebean-querybean/pom.xml.releaseBackup +++ /dev/null @@ -1,124 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean querybean - Ebean querybean support - ebean-querybean - - - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - - io.avaje - avaje-jsr305 - 1.0 - provided - - - - joda-time - joda-time - 1.6 - true - - - - javax.validation - validation-api - 1.0.0.GA - true - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-ddl-generator - 12.11.4-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.11.4-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.11.4-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - - diff --git a/ebean-redis/pom.xml.releaseBackup b/ebean-redis/pom.xml.releaseBackup deleted file mode 100644 index 5a55646d0..000000000 --- a/ebean-redis/pom.xml.releaseBackup +++ /dev/null @@ -1,92 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean-redis - ebean redis - Ebean Redis L2 Cache - - - - - redis.clients - jedis - 3.6.3 - - - - io.ebean - ebean-api - 12.11.4-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - io.ebean - ebean-querybean - 12.11.4-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.11.4-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.11.4-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - - - - - - - - - diff --git a/ebean-test/pom.xml.releaseBackup b/ebean-test/pom.xml.releaseBackup deleted file mode 100644 index 5d6dccd65..000000000 --- a/ebean-test/pom.xml.releaseBackup +++ /dev/null @@ -1,242 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean test - Testing support for Ebean - ebean-test - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - provided - - - - io.ebean - ebean-ddl-generator - 12.11.4-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - true - - - - io.ebean - ebean-test-docker - 4.2 - - - - org.assertj - assertj-core - 3.14.0 - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - - com.h2database - h2 - 1.4.199 - - - - - - io.avaje - avaje-jsr305 - 1.0 - test - - - - io.ebean - ebean-migration - 12.4.0 - test - - - - io.avaje - mod-uuid - 1.1 - test - - - - javax.transaction - jta - 1.1 - test - - - - - javax.validation - validation-api - 1.1.0.Final - test - - - - jakarta.validation - jakarta.validation-api - 3.0.0 - test - - - - joda-time - joda-time - 2.9.7 - test - - - - javax.annotation - javax.annotation-api - 1.3.2 - test - - - commons-io - commons-io - 2.7 - test - - - - org.postgresql - postgresql - 42.2.18 - test - - - - com.microsoft.sqlserver - mssql-jdbc - 6.2.2.jre8 - test - - - - mysql - mysql-connector-java - 8.0.16 - test - - - - org.mariadb.jdbc - mariadb-java-client - 2.6.0 - test - - - - com.sap.cloud.db.jdbc - ngdbc - 2.3.48 - test - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - db2 - - - - com.ibm.db2 - jcc - 11.5.5.0 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - - - diff --git a/ebean/pom.xml.releaseBackup b/ebean/pom.xml.releaseBackup deleted file mode 100644 index 02f283b23..000000000 --- a/ebean/pom.xml.releaseBackup +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - ebean composite - Composite of common runtime dependencies - ebean - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-api - 12.11.4-SNAPSHOT - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - - - - - io.ebean - ebean-querybean - 12.11.4-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - diff --git a/kotlin-querybean-generator/pom.xml.releaseBackup b/kotlin-querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index 1747c3975..000000000 --- a/kotlin-querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - kotlin querybean generator - Generates Kotlin querybeans - kotlin-querybean-generator - - - 1.5.30-M1 - - - - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-querybean - 12.11.4-SNAPSHOT - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.11.4-SNAPSHOT - test - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - provided - - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - io.ebean - ebean-ddl-generator - 12.11.4-SNAPSHOT - test - - - - javax.validation - validation-api - 1.1.0.Final - test - - - - - - - src/test/kotlin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - test-compile - test-compile - - test-compile - - - - test-kapt - - test-kapt - - - - src/test/kotlin - - - - io.ebean - kotlin-querybean-generator - 12.8.2 - - - - - - compile - compile - - compile - - - - src/main/java - target/generated-sources/kapt/test - target/generated-sources/kaptKotlin/test - - - - - - 1.8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - default-testCompile - none - - - java-test-compile - test-compile - - testCompile - - - - compile - compile - - compile - - - - - 1.8 - 1.8 - - -proc:none - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=1 - - - testEnhance - - - - - - - - - diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index 68cdce53d..000000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,97 +0,0 @@ - - - 4.0.0 - - org.avaje - java8-oss - 3.2 - - - io.ebean - ebean-parent - 12.11.4-SNAPSHOT - pom - - ebean parent - Parent for ebean modules - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.8.0 - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - rbygrave - Rob Bygrave - robin.bygrave@gmail.com - - - - - true - 2.12.1 - 1.0 - 1.1 - 12.11.0 - 4.1 - 7.2 - 12.11.2 - 12.11.2 - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - com.h2database - h2 - 1.4.199 - test - - - - - - ebean - ebean-api - ebean-bom - ebean-core-type - ebean-core - ebean-ddl-generator - ebean-autotune - ebean-externalmapping-api - ebean-externalmapping-xml - ebean-test - querybean-generator - kotlin-querybean-generator - ebean-querybean - ebean-postgis - ebean-redis - - - - - diff --git a/querybean-generator/pom.xml.releaseBackup b/querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index 6a9960694..000000000 --- a/querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.11.4-SNAPSHOT - - - querybean generator - Querybean generator - querybean-generator - - - - - io.avaje - junit - 1.0 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - -proc:none - - - - - - diff --git a/release.properties b/release.properties deleted file mode 100644 index 293899571..000000000 --- a/release.properties +++ /dev/null @@ -1,83 +0,0 @@ -#release configuration -#Thu Sep 09 21:41:10 NZST 2021 -projectVersionPolicyId=default -project.scm.io.ebean\:ebean-core-type.tag=ebean-parent-12.8.0 -scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} -project.rel.io.ebean\:ebean-ddl-generator=12.11.4 -project.dev.io.ebean\:ebean-core=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean-api.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-redis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-api=12.11.5-SNAPSHOT -project.rel.io.ebean\:ebean=12.11.4 -project.dev.io.ebean\:ebean-core-type=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean-ddl-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -exec.activateProfiles=release -project.dev.io.ebean\:ebean-test=12.11.5-SNAPSHOT -project.scm.io.ebean\:kotlin-querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-bom.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-core-type=12.11.4 -project.rel.io.ebean\:kotlin-querybean-generator=12.11.4 -project.dev.io.ebean\:querybean-generator=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.commentPrefix=[maven-release-plugin] -releaseStrategyId=default -project.rel.io.ebean\:ebean-querybean=12.11.4 -project.scm.io.ebean\:ebean-externalmapping-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:kotlin-querybean-generator=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean-core-type.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -completedPhase=generate-release-poms -project.rel.io.ebean\:ebean-redis=12.11.4 -project.scm.io.ebean\:ebean-test.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-postgis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-autotune=12.11.5-SNAPSHOT -project.rel.io.ebean\:ebean-api=12.11.4 -project.scm.io.ebean\:ebean-postgis.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:querybean-generator.tag=ebean-parent-12.8.0 -project.rel.io.ebean\:querybean-generator=12.11.4 -scm.tag=ebean-parent-12.11.4 -project.rel.io.ebean\:ebean-externalmapping-xml=12.11.4 -project.scm.io.ebean\:ebean-ddl-generator.tag=ebean-parent-12.8.0 -project.rel.io.ebean\:ebean-externalmapping-api=12.11.4 -project.scm.io.ebean\:ebean-externalmapping-xml.tag=ebean-parent-12.8.0 -preparationGoals=clean verify -exec.pomFileName=pom.xml -project.dev.io.ebean\:ebean-externalmapping-api=12.11.5-SNAPSHOT -project.dev.io.ebean\:ebean=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-parent=12.11.5-SNAPSHOT -project.dev.io.ebean\:ebean-externalmapping-xml=12.11.5-SNAPSHOT -project.rel.io.ebean\:ebean-core=12.11.4 -project.dev.io.ebean\:ebean-redis=12.11.5-SNAPSHOT -project.dev.io.ebean\:ebean-postgis=12.11.5-SNAPSHOT -project.scm.io.ebean\:ebean-redis.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-parent.tag=ebean-parent-12.8.0 -pushChanges=true -project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-test=12.11.4 -project.scm.io.ebean\:kotlin-querybean-generator.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-bom.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-autotune.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean.tag=ebean-parent-12.8.0 -project.scm.io.ebean\:ebean-core.tag=ebean-parent-12.8.0 -project.rel.io.ebean\:ebean-autotune=12.11.4 -scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -remoteTagging=true -project.dev.io.ebean\:ebean-bom=12.11.5-SNAPSHOT -project.dev.io.ebean\:ebean-querybean=12.11.5-SNAPSHOT -project.rel.io.ebean\:ebean-bom=12.11.4 -project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.url=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.developmentCommitComment=@{prefix} prepare for next development iteration -project.scm.io.ebean\:ebean-externalmapping-api.tag=ebean-parent-12.8.0 -scm.tagNameFormat=@{project.artifactId}-@{project.version} -project.scm.io.ebean\:ebean-test.tag=ebean-parent-12.8.0 -project.dev.io.ebean\:ebean-ddl-generator=12.11.5-SNAPSHOT -exec.snapshotReleasePluginAllowed=false -scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} -project.rel.io.ebean\:ebean-postgis=12.11.4 -project.rel.io.ebean\:ebean-parent=12.11.4 From 268a39ae150ba5bb1a693157c14890f4507a36d4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 10 Sep 2021 21:59:52 +1200 Subject: [PATCH 098/102] #2363 - Bump to dependencies that have module-info via mult-version jars etc --- ebean-ddl-generator/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 2 +- ebean-querybean/pom.xml | 4 ++-- kotlin-querybean-generator/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 3a1ef6505..4fabbbe9b 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -17,7 +17,7 @@ io.ebean ebean-ddl-runner - 1.0 + 1.1 diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 6b75aeb2f..602bbbc60 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -45,7 +45,7 @@ io.avaje classpath-scanner - 6.0 + 6.1 diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f0275cd74..02eb8f230 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -28,7 +28,7 @@ io.avaje avaje-jsr305 - 1.0 + 1.1 provided @@ -42,7 +42,7 @@ javax.validation validation-api - 1.0.0.GA + 2.0.1.Final true diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 5898e7456..a5aba2f05 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -71,7 +71,7 @@ javax.validation validation-api - 1.1.0.Final + 2.0.1.Final test From fece3bb0df3775ee842b4a9e6cd2118cc19ae98d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 10 Sep 2021 22:00:18 +1200 Subject: [PATCH 099/102] #2363 - Bump to dependencies that have module-info via mult-version jars etc --- ebean-api/pom.xml | 8 ++++---- ebean-core/pom.xml | 33 ++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 57f14a27d..c5621372b 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -37,26 +37,26 @@ io.avaje avaje-jsr305 - 1.0 + 1.1 provided io.ebean persistence-api - 2.2.4 + 2.2.5 io.ebean ebean-annotation - 7.2 + 7.3 io.ebean ebean-types - 2.1 + 2.2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 32b24bd01..e6ac7c932 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -23,13 +23,13 @@ io.ebean ebean-ddl-runner - 1.0 + 1.1 io.avaje classpath-scanner - 6.0 + 6.1 @@ -68,8 +68,8 @@ --> io.avaje - avaje-jsr305 - 1.0 + avaje-jsr305-x + 1.1 provided @@ -84,8 +84,15 @@ javax.transaction - jta - 1.1 + javax.transaction-api + 1.3 + true + + + + javax.naming + jndi + 1.2.1 true @@ -93,7 +100,7 @@ javax.validation validation-api - 1.1.0.Final + 2.0.1.Final true @@ -110,12 +117,12 @@ true - - javax.annotation - javax.annotation-api - 1.3.2 - true - + + + + + + From 88f75bc62fc61def0dfec6ac8aee42a59c72181b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 10 Sep 2021 22:07:10 +1200 Subject: [PATCH 100/102] #2363 - Bump to dependencies that have module-info via mult-version jars etc --- ebean-core/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e6ac7c932..b4ae7fb11 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -89,13 +89,6 @@ true - - javax.naming - jndi - 1.2.1 - true - - javax.validation From 1fbfcd393f2e3b56cf998a52343780f61d887d8d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 14 Sep 2021 19:00:55 +1200 Subject: [PATCH 101/102] #2363 - Bump to dependencies that have module-info via mult-version jars etc Bump ebean-ddl-generator and avaje-config --- ebean-api/pom.xml | 2 +- ebean-core/pom.xml | 2 +- ebean-ddl-generator/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index c5621372b..b8cd099a2 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -27,7 +27,7 @@ io.avaje avaje-config - 1.3 + 1.4