#2357 - Update tests to use Database from EbeanServer

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() {

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<String> 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<String> 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();

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<String> 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();

ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java

@@ -38,7 +38,7 @@ public class EbeanServer_eqlTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.createQuery(Customer.class, "order by id limit 10");
+    Query<Customer> 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<Customer> query = Ebean.createQuery(Customer.class, "order by id limit 10 offset 3");
+    Query<Customer> 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<Customer> query = Ebean.createQuery(Customer.class, "order by name");
+    Query<Customer> 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<Customer> query = Ebean.createQuery(Customer.class, "order by name");
+    Query<Customer> 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<Customer> query = Ebean.createQuery(Customer.class);
+    Query<Customer> 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<Customer> query = Ebean.createQuery(Customer.class);
+    Query<Customer> query = DB.createQuery(Customer.class);
     query.setMaxRows(10);
     query.findList();
 

ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java

@@ -21,7 +21,7 @@ public class EbeanServer_refresh {
     Map<String, String> 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

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<String> 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<EBasicVer> someBeans = beans(3);
-    EbeanServer server = Ebean.getDefaultServer();
+    Database server = DB.getDefault();
 
     // act
     LoggedSqlCollector.start();

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<Customer> 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());

ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java

@@ -15,9 +15,9 @@ public class TestFilterWithEnum extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<Order> allOrders = Ebean.find(Order.class).findList();
+    List<Order> allOrders = DB.find(Order.class).findList();
 
-    Filter<Order> filter = Ebean.filter(Order.class);
+    Filter<Order> filter = DB.filter(Order.class);
     List<Order> newOrders = filter.eq("status", Order.Status.NEW).filter(allOrders);
 
     assertNotNull(newOrders);

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

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

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<Customer> update = server.update(Customer.class);
     Query<Customer> 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<Customer> update = server.update(Customer.class);
     Query<Customer> 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<Customer> 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<Customer> 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<Customer> 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<Customer> 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<Customer> 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();
   }

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();
 
   <T> BeanType<T> beanType(Class<T> cls) {
     return server.pluginApi().beanType(cls);

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();
 
   <T> BeanType<T> beanType(Class<T> cls) {
     return server.pluginApi().beanType(cls);

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<Customer> beanType = pluginApi.beanType(Customer.class);

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() {

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<Customer> customers = Ebean.find(Customer.class)
+    List<Customer> customers = DB.find(Customer.class)
       .order().asc("id")
       .setMaxRows(1).findList();
 

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;

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

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;

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<Order> query1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query1 = (DefaultOrmQuery<Order>) DB.find(Order.class)
       .select("status, shipDate")
       .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name");
 
 
-    DefaultOrmQuery<Order> query2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query2 = (DefaultOrmQuery<Order>) 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> query = DB.find(Order.class)
       .fetchQuery("details")
       .fetch("details.product")
       .fetch("customer")

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

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 <T> OrmQueryRequest<T> create(EbeanServer server, SpiQuery.Type type, Query<T> query, Transaction t) {
-
+  public static <T> OrmQueryRequest<T> create(Database server, SpiQuery.Type type, Query<T> query, Transaction t) {
     DefaultServer defaultServer = (DefaultServer) server;
     return (OrmQueryRequest<T>)defaultServer.createQueryRequest(type, query, t);
   }

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.

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<Order> 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));

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<EMain> 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;
   }
 

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<Animal> animalDesc = spiEbeanServer().getBeanDescriptor(Animal.class);
 

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<Customer> desc = server.getBeanDescriptor(Customer.class);
 

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

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<Customer> custDesc = server.getBeanDescriptor(Customer.class);
 
     Customer customer = new Customer();

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<Order> orderDesc;
+  private final BeanDescriptor<Order> 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));

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<EMain> emainDesc;
+  private final BeanDescriptor<EMain> 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;
   }
 

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<String> loadedProps = beanState.getLoadedProps();
 
     assertEquals(1, loadedProps.size());

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;

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<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> 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<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().isNotEmpty("contacts")
       .query();
@@ -72,7 +72,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Contact> query = Ebean.find(Contact.class)
+    Query<Contact> query = DB.find(Contact.class)
       .select("id")
       .where().isEmpty("notes")
       .query();
@@ -86,7 +86,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Contact> query = Ebean.find(Contact.class)
+    Query<Contact> query = DB.find(Contact.class)
       .select("id")
       .where().isNotEmpty("notes")
       .query();
@@ -101,7 +101,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Contact> query = Ebean.find(Contact.class)
+    Query<Contact> query = DB.find(Contact.class)
       .select("id")
       .where().isEmpty("notes")
       .query();
@@ -115,7 +115,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().isEmpty("contacts.notes")
       .query();
@@ -134,7 +134,7 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().isNotEmpty("contacts.notes")
       .query();

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<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> 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<Cover> query = Ebean.find(Cover.class)
+    Query<Cover> 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<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().eq("name", null)
       .add(NoopExpression.INSTANCE)

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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> 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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> 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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> 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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> 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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> 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<Order> where = Ebean.find(Order.class)
+    ExpressionList<Order> where = DB.find(Order.class)
       .where()
       .gt("customer.id", 1)             // 0
       .isNotNull("shipments.shipTime")  // shipments 0

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<OrderDetail> query = Ebean.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)");
+    Query<OrderDetail> query = DB.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)");
     List<OrderDetail> details = query.findList();
 
     assertThat(details).isNotEmpty();

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<Customer> q1 = (DefaultOrmQuery<Customer>) Ebean.find(Customer.class)
+    DefaultOrmQuery<Customer> q1 = (DefaultOrmQuery<Customer>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().eq("id", 42).query();
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().idEq(42).query();
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).setId(42);
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("name", "a", "b", "c").query();
-    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("id", 2, 2, 3).query();
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).where().in("name", "a", "b", "c").query();
+    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("id", 1, 2, 3).query();
-    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("id", 2, 2, 3).query();
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).where().in("id", 1, 2, 3).query();
+    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) 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<Order> q1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("id", 1, 2, 3).query();
-    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class).where().in("id", 1, 2, 3).query();
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).where().in("id", 1, 2, 3).query();
+    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) 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<Order> query1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query1 = (DefaultOrmQuery<Order>) DB.find(Order.class)
       .setFirstRow(0)
       .setMaxRows(31);
 
-    DefaultOrmQuery<Order> query2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query2 = (DefaultOrmQuery<Order>) DB.find(Order.class)
       .setFirstRow(1)
       .setMaxRows(0);
 

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<ERawSqlAggBean> query = Ebean.find(ERawSqlAggBean.class)
+    Query<ERawSqlAggBean> query = DB.find(ERawSqlAggBean.class)
       .setRawSql(rawSql)
       .having().gt("total", 2)
       .query();

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<Customer> list = Ebean.find(Customer.class)
+    List<Customer> 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());

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<Customer> list = Ebean.find(Customer.class)
+    List<Customer> 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());

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<Customer> customers = Ebean.find(Customer.class).findList();
+    List<Customer> 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<Customer> descriptor = server.getBeanDescriptor(Customer.class);
 
     customer.setName("dirtyCustName");

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();

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() {

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

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();
 
   <T> BeanType<T> beanType(Class<T> cls) {
     return server.pluginApi().beanType(cls);

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();
 
   <T> BeanType<T> beanType(Class<T> cls) {
     return server.pluginApi().beanType(cls);

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();

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<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> 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<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> contacts = DB.find(Contact.class)
       .select("lastName, min(customer)")
       .findList();
 
@@ -73,7 +73,7 @@ public class TestAggregateFormula extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> 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<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> 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<Order> orders = Ebean.find(Order.class)
+    List<Order> orders = DB.find(Order.class)
       .select("status, sum(id)")
       .findList();
 
@@ -158,7 +158,7 @@ public class TestAggregateFormula extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Order> orders = Ebean.find(Order.class)
+    List<Order> orders = DB.find(Order.class)
       .select("status, sum(id) as id")
       .findList();
 
@@ -179,7 +179,7 @@ public class TestAggregateFormula extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> contacts = DB.find(Contact.class)
       .select("customer, min(cretime)")
       .findList();
 
@@ -196,7 +196,7 @@ public class TestAggregateFormula extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Contact> contacts = Ebean.find(Contact.class)
+    List<Contact> contacts = DB.find(Contact.class)
       .select("customer, min(cretime), max(updtime)")
       .findList();
 

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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> q2 = Ebean.find(Order.class)
+    Query<Order> q2 = DB.find(Order.class)
       .where().eq("customer.billingAddress", b)
       .query();
 

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<Order> query = Ebean.find(Order.class);
+    Query<Order> query = DB.find(Order.class);
     List<Order> 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();
 
   }
 

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<Order> list = Ebean.find(Order.class)
+//		List<Order> list = DB.find(Order.class)
 //			//.join("details")
 //			//.join("details", "+fetchquery")
 //			.findList();

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

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());

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

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

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);
   //

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

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

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

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<Order> orders = customer.getOrders();
       assertNotNull(orders);

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();

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

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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<OrderDetail> subQuery = Ebean.find(OrderDetail.class)
+    Query<OrderDetail> subQuery = DB.find(OrderDetail.class)
         .alias("sq")
         .where().raw("details.id = sq.id").query();
-    Query<Order> query = Ebean.find(Order.class)
+    Query<Order> query = DB.find(Order.class)
       .where().exists(subQuery)
       .orderBy("orderDate").query();
 

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<Order> query = Ebean.find(Order.class).where().in("id", new Object[0]).gt("id", 0)
+    Query<Order> query = DB.find(Order.class).where().in("id", new Object[0]).gt("id", 0)
       .query();
 
     List<Order> list = query.findList();
@@ -27,7 +27,7 @@ public class TestInEmpty extends BaseTestCase {
   @Test
   public void test_isIn_empty() {
 
-    Query<Order> query = Ebean.find(Order.class).where().isIn("id", new Object[0]).gt("id", 0)
+    Query<Order> query = DB.find(Order.class).where().isIn("id", new Object[0]).gt("id", 0)
       .query();
 
     List<Order> list = query.findList();
@@ -38,7 +38,7 @@ public class TestInEmpty extends BaseTestCase {
   @Test
   public void test_notIn_empty() {
 
-    Query<Order> query = Ebean.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0)
+    Query<Order> query = DB.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0)
       .query();
 
     query.findList();

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<Vehicle> list = Ebean.find(Vehicle.class)
+      List<Vehicle> 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();
     }
   }
 }

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<TJodaEntity> 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());
   }

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

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

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<Integer, Customer> map = Ebean.find(Customer.class)
+    Map<Integer, Customer> 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<String> loadedProps = Ebean.getBeanState(cust1).getLoadedProps();
+    Set<String> 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());
 

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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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<Order> query = Ebean.find(Order.class)
+    Query<Order> 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);

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<String, Country> map = Ebean.find(Country.class)
+    Map<String, Country> 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);
   }

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<Customer> list = Ebean.find(Customer.class).where().eq("id", "NotAnInt!!").findList();
+      List<Customer> 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);

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<MUser> query = Ebean.find(MUser.class)
+    Query<MUser> query = DB.find(MUser.class)
       .select("userid")
       .where().raw("roles.roleid in (?)", 24)
       .query();

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<MRole> 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<MRole> checkRoles2 = checkUser2.getRoles();

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<Order> list = Ebean.find(Order.class).order().asc("id").findList();
+    List<Order> 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<OrderDetail> details2 = order2.getDetails();

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();
 

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

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

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());

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

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<Order> orders = customer.getOrders();
 
     assertTrue(!orders.isEmpty());
 
-    Query<Order> q1 = Ebean.find(Order.class)
+    Query<Order> q1 = DB.find(Order.class)
       .fetch("details");
 
     q1.findList();

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<Customer> l0 = Ebean.find(Customer.class)
+    List<Customer> l0 = DB.find(Customer.class)
       .select("id, name")
       .fetch("orders", "status, totalAmount")
       .where()

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<OrderAggregate> l0 =
-      Ebean.find(OrderAggregate.class)
+      DB.find(OrderAggregate.class)
         .setRawSql(rawSql)
         .findList();
 
@@ -32,7 +32,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
       r0.toString();
     }
 
-    List<OrderAggregate> l2 = Ebean.createQuery(OrderAggregate.class)
+    List<OrderAggregate> 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<OrderAggregate> query = Ebean.find(OrderAggregate.class)
+    Query<OrderAggregate> 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<OrderAggregate> query = Ebean.find(OrderAggregate.class)
+    Query<OrderAggregate> query = DB.find(OrderAggregate.class)
       .setRawSql(rawSql);
 
     query.findList();

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

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<Order> query = Ebean.find(Order.class).setAutoTune(false).where()
+    Query<Order> 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<Order> query = Ebean.find(Order.class).setAutoTune(false)
+    Query<Order> query = DB.find(Order.class).setAutoTune(false)
       .where()
       .le("cretime", t)
       .order().asc("orderDate")

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<Country> 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<Country> query = Ebean.find(Country.class).setId("NZ").setUseCache(false);
+    Query<Country> query = DB.find(Country.class).setId("NZ").setUseCache(false);
     query.findOne();
 
     assertSql(query).isNotNull();

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)

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

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

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<OrderDetail> 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());
 
   }
 }

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<Customer> custs = Ebean.find(Customer.class).findList();
+    List<Customer> custs = DB.find(Customer.class).findList();
 
-    List<Order> orders = Ebean.find(Order.class).setMaxRows(1).findList();
+    List<Order> 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);
 
   }
 }

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

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

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<Order> orders = customer.getOrders();
 
     assertTrue(!orders.isEmpty());
 
-    Query<Customer> q1 = Ebean.find(Customer.class).setUseCache(false).fetch("orders").where()
+    Query<Customer> q1 = DB.find(Customer.class).setUseCache(false).fetch("orders").where()
       .idEq(1).query();
 
     q1.findOne();

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<Object> orderIds = Ebean.find(Order.class).where().in("customer", c0, c1).findIds();
+    List<Object> 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);
 
   }
 }

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<Order> orders = Ebean.find(Order.class).where().eq("customer", cust).findList();
+    List<Order> 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);
 
   }
 }

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<OtoUserOptional> userOptionalQuery = Ebean.find(OtoUserOptional.class);
-  private Query<OtoUser> userQuery = Ebean.find(OtoUser.class);
+  private Query<OtoUserOptional> userOptionalQuery = DB.find(OtoUserOptional.class);
+  private Query<OtoUser> 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());
   }
 }

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

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());