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"); }