diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index c6bb66196..8ca823b84 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.cluster.binarymessage; import io.ebean.BaseTestCase; -import io.ebean.Database; import io.ebean.EbeanServer; import io.ebeaninternal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; @@ -26,11 +25,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class BinaryTransactionEventReadWriteTest extends BaseTestCase { - private BeanDescriptor customerBeanDescriptor = getBeanDescriptor(Customer.class); - - private TDEbeanServer mockEbeanServer = new TDEbeanServer(); - - private BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup()); + private final BeanDescriptor customerBeanDescriptor = getBeanDescriptor(Customer.class); + private final TDEbeanServer mockEbeanServer = new TDEbeanServer(); + private final BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup()); @Override protected BeanDescriptor getBeanDescriptor(Class cls) { @@ -80,7 +77,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase { @Test public void readWrite_RemoteTableMod() throws IOException { - RemoteTransactionEvent event = new RemoteTransactionEvent("db"); Set tables = new HashSet<>(); @@ -96,7 +92,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase { } class TDServerLookup implements ServerLookup { - @Override public EbeanServer getServer(String name) { return mockEbeanServer; diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java index 8137cf2fa..1f4e09106 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -17,7 +17,7 @@ public class TestM2MVanilla extends BaseTestCase { @Test public void testVanilla() { - DB.createSqlUpdate("delete from mrole_muser").execute(); + DB.sqlUpdate("delete from mrole_muser").execute(); DB.sqlUpdate("delete from mrole").execute(); DB.sqlUpdate("delete from muser").execute(); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 3265bf574..6c26ee0fe 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -24,7 +24,7 @@ public class TestEncryptBinary extends BaseTestCase { DB.save(e); - SqlRow row = DB.createSqlQuery("select * from e_basicenc_bin where id = :id") + SqlRow row = DB.sqlQuery("select * from e_basicenc_bin where id = :id") .setParameter("id", e.getId()) .findOne(); diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index f19c9ad52..5798beb57 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -30,7 +30,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { Transaction txn = server().beginTransaction(); try { EBasicWithUniqueCon v2 = createEntityWithName("conflict", "after"); - txn.flushBatch(); + txn.flush(); Savepoint sp = txn.getConnection().setSavepoint(); try { server().save(v2); // unique key violation diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index 22b535c86..d9781a5cb 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -1,6 +1,6 @@ package org.tests.model.basic.mapsuper; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.MappedSuperclass; import javax.persistence.Version; @@ -9,7 +9,7 @@ import java.sql.Timestamp; @MappedSuperclass public class MapSuperNoId { - @CreatedTimestamp + @WhenCreated Timestamp whenCreated; @Version diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index c29334653..6b553e01a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -17,11 +17,11 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { SqlUpdate delete; sql = "delete from td_child"; - delete = DB.createSqlUpdate(sql); + delete = DB.sqlUpdate(sql); delete.execute(); sql = "delete from td_parent"; - delete = DB.createSqlUpdate(sql); + delete = DB.sqlUpdate(sql); delete.execute(); EdParent parent = new EdParent(); diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java index 286ef97fb..341f0670e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -1,7 +1,7 @@ package org.tests.model.embedded; import io.ebean.Model; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.EmbeddedId; import javax.persistence.Entity; @@ -13,7 +13,7 @@ public class UserInterestLive extends Model { @EmbeddedId private final UserInterestLiveKey key; - @CreatedTimestamp + @WhenCreated private Date createdAt; public UserInterestLive(UserInterestLiveKey key) { diff --git a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java index 78ce42408..66bb6db7a 100644 --- a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java +++ b/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -1,7 +1,7 @@ package org.tests.model.joda; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; @@ -19,10 +19,10 @@ public class BasicJodaEntity { String name; - @CreatedTimestamp + @WhenCreated LocalDateTime created; - @UpdatedTimestamp + @WhenModified DateTime updated; Period period; diff --git a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java index 129f33757..b43c344a5 100644 --- a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java +++ b/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java @@ -1,6 +1,6 @@ package org.tests.model.noid; -import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.WhenCreated; import javax.persistence.Entity; import javax.persistence.Table; @@ -14,7 +14,7 @@ public class NoIdBean { String subject; - @CreatedTimestamp + @WhenCreated Timestamp whenCreated; public String getName() { diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 560f86ee9..3a3a158a4 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -50,7 +50,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { long intersectionRows = DB.sqlQuery("select count(*) as total from troop_monkey where troop_pid = ?") .setParameter(1, troop.getPid()) - .findSingleLong(); + .mapToScalar(Long.class).findOne(); assertThat(intersectionRows).isEqualTo(2L); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java index 35693707e..eea920c75 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java @@ -124,7 +124,7 @@ public class TestQueryFindNative extends BaseTestCase { List ids = DB.sqlQuery(sql) .setParameter(1, "J%") - .findSingleAttributeList(Integer.class); + .mapToScalar(Integer.class).findList(); List idsScalar = server() diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 1d7d8d057..29a0bb78f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -158,7 +158,7 @@ public abstract class BaseTestCase { } public boolean isPlatformCaseSensitive() { - return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation(); + return spiEbeanServer().databasePlatform().isCaseSensitiveCollation(); } /** @@ -206,7 +206,7 @@ public abstract class BaseTestCase { } public boolean isPlatformBooleanNative() { - return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType(); + return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType(); } public boolean isPlatformOrderNullsSupport() { @@ -214,11 +214,11 @@ public abstract class BaseTestCase { } public boolean isPlatformSupportsDeleteTableAlias() { - return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias(); + return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias(); } public boolean isPersistBatchOnCascade() { - return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } /** @@ -237,19 +237,19 @@ public abstract class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().databasePlatform().getPlatform().base(); } protected IdType idType() { - return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType(); + return spiEbeanServer().databasePlatform().getDbIdentity().getIdType(); } protected SpiEbeanServer spiEbeanServer() { return (SpiEbeanServer) DB.getDefault(); } - protected EbeanServer server() { - return Ebean.getDefaultServer(); + protected Database server() { + return DB.getDefault(); } /** @@ -283,7 +283,7 @@ public abstract class BaseTestCase { } protected String concat(String property0, String separator, String property1, String suffix) { - DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform()); + DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); return dbExpressionHandler.concat(property0, separator, property1, suffix); } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index cef125750..6065448bc 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.ddlgeneration; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.config.ServerConfig; +import io.ebean.DB; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class BaseDdlHandlerTest extends BaseTestCase { - private ServerConfig serverConfig = new ServerConfig(); + private final DatabaseConfig serverConfig = new DatabaseConfig(); private DdlHandler handler(DatabasePlatform platform) { return PlatformDdlBuilder.create(platform).createDdlHandler(serverConfig); @@ -227,7 +227,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { @Test public void generateChangeSetFromModel() throws Exception { - SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault(); ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet(); @@ -246,8 +246,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { @Disabled @Test public void generateChangeSetFromModel_given_postgresTypes() throws Exception { - - SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault(); ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index b087803db..d6af52969 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java @@ -1,18 +1,18 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.oracle.OraclePlatform; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; import io.ebeaninternal.dbmigration.ddlgeneration.Helper; +import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateTable; -import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -24,13 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class BaseTableDdlTest { - private ServerConfig serverConfig = new ServerConfig(); - - private PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform()); + private final DatabaseConfig serverConfig = new DatabaseConfig(); + private final PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform()); @Test public void testAlterColumn() throws IOException { - BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl); DdlWrite write = new DdlWrite(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 62b0f535c..a23a7ad79 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -1,14 +1,14 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; +import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.dbmigration.model.MConfiguration; import io.ebeaninternal.dbmigration.model.ModelContainer; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -19,7 +19,7 @@ public class H2HistoryDdlTest { @Test public void testRegenerateHistoryTriggers() throws Exception { - SpiEbeanServer ebeanServer = (SpiEbeanServer) Ebean.getDefaultServer(); + SpiEbeanServer ebeanServer = (SpiEbeanServer) DB.getDefault(); HistoryTableUpdate update = new HistoryTableUpdate("c_user"); update.add(HistoryTableUpdate.Change.ADD, "one"); @@ -32,7 +32,7 @@ public class H2HistoryDdlTest { H2Platform h2Platform = new H2Platform(); PlatformDdl h2Ddl = PlatformDdlBuilder.create(h2Platform); - h2Ddl.configure(ebeanServer.getServerConfig()); + h2Ddl.configure(ebeanServer.config()); h2Ddl.regenerateHistoryTriggers(write, update); assertThat(write.applyHistoryView().isEmpty()).isFalse(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java index 0139565dd..00a6e271d 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; @@ -14,12 +14,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class PlatformDdl_dropUniqueConstraintTest { - private PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform()); - private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform()); - private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform()); - private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform()); - private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform()); - private PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); + private final PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform()); + private final PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform()); + private final PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform()); + private final PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform()); + private final PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform()); + private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); @Test public void test() throws Exception { @@ -39,8 +39,8 @@ public class PlatformDdl_dropUniqueConstraintTest { sql = mysqlDdl.alterTableDropUniqueConstraint("mytab", "uq_name"); assertEquals("alter table mytab drop index uq_name", sql); - ServerConfig serverConfig = new ServerConfig(); - hanaDdl.configure(serverConfig); + DatabaseConfig config = new DatabaseConfig(); + hanaDdl.configure(config); sql = hanaDdl.alterTableDropUniqueConstraint("mytab", "uq_name"); assertEquals("delimiter $$\n" + "do\n" + diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java index 70c0d70e1..7c2e32b9d 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java @@ -34,7 +34,7 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase { ModelContainer model = new ModelContainer(); - DbConstraintNaming constraintNaming = defaultServer.getServerConfig().getConstraintNaming(); + DbConstraintNaming constraintNaming = defaultServer.config().getConstraintNaming(); constraintNaming.setMaxLength(new DefaultConstraintMaxLength(60)); ModelBuildContext ctx = new ModelBuildContext(model, new H2Platform(), constraintNaming, true); diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 46596e2a3..1fa9faf7b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import java.util.List; @@ -13,8 +13,7 @@ public class TestInheritAbstract { @Test public void testMe() { - - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); List list0 = server.find(AbstractBar.class) .findList(); diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java index 39427f5da..047c4a143 100644 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java +++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java @@ -11,7 +11,7 @@ public class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().platform().base(); } protected SpiEbeanServer spiEbeanServer() {