diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java index e44474cd3..bd79be5eb 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -121,8 +121,9 @@ public interface BeanType { Object beanId(Object bean); /** - * Return the id value for the given bean. + * Deprecated migrate to beanId() */ + @Deprecated Object getBeanId(T bean); /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index fae60f49d..b964d2296 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -8,6 +8,7 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.MetricVisitor; +import io.ebean.plugin.SpiServer; import io.ebeaninternal.api.SpiQuery.Type; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.core.timezone.DataTimeZone; @@ -23,7 +24,7 @@ import java.util.stream.Stream; /** * Service Provider extension to EbeanServer. */ -public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollectionLoader { +public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, BeanCollectionLoader { /** * Return true if the L2 cache has been disabled. @@ -50,16 +51,6 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect */ Object currentTenantId(); - /** - * Return the server configuration. - */ - DatabaseConfig getServerConfig(); - - /** - * Return the DatabasePlatform for this server. - */ - DatabasePlatform getDatabasePlatform(); - /** * Create an object to represent the current CallStack. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index a88f1bbe9..f11cf9f8e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -121,7 +121,7 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery { int firstRow = query.getFirstRow(); int maxRows = query.getMaxRows(); if (firstRow > 0 || maxRows > 0) { - return server.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows); + return server.databasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows); } return sql; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 0844bdd36..2b4c81f0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -26,7 +26,7 @@ final class DScriptRunner implements ScriptRunner { DScriptRunner(SpiEbeanServer server) { this.server = server; - this.platformName = this.server.getDatabasePlatform().getPlatform().base().name(); + this.platformName = this.server.platform().base().name(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 27aae1b29..c4afdf5ab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -305,7 +305,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public DatabaseConfig config() { + public DatabaseConfig getServerConfig() { return config; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index c2f3ad4c0..6d88c4fa9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -129,7 +129,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String dbLikeClause(boolean rawLikeExpression) { - return server.getDatabasePlatform().getLikeClause(rawLikeExpression); + return server.databasePlatform().getLikeClause(rawLikeExpression); } /** @@ -137,7 +137,7 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery */ @Override public String escapeLikeString(String value) { - return server.getDatabasePlatform().escapeLikeString(value); + return server.databasePlatform().escapeLikeString(value); } @Override @@ -806,6 +806,6 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery * Return true if no MaxRows or use LIMIT in SQL update. */ public boolean isInlineSqlUpdateLimit() { - return query.getMaxRows() < 1 || server.getDatabasePlatform().isInlineSqlUpdateLimit(); + return query.getMaxRows() < 1 || server.databasePlatform().isInlineSqlUpdateLimit(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 6eceddca4..06a13382c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -375,7 +375,7 @@ final class BeanDescriptorCacheHelp { for (Map.Entry entry : beanDataMap.entrySet()) { CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue(); T bean = convertToBean(entry.getKey(), false, context, cachedBeanData); - result.add(bean, desc.getBeanId(bean)); + result.add(bean, desc.beanId(bean)); } return result; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index fa877ae90..d41676f94 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -73,7 +73,7 @@ public final class DefaultPersister implements Persister { public DefaultPersister(SpiEbeanServer server, Binder binder, BeanDescriptorManager descMgr) { this.server = server; this.beanDescriptorManager = descMgr; - this.persistExecute = new DefaultPersistExecute(binder, server.getServerConfig().getPersistBatchSize()); + this.persistExecute = new DefaultPersistExecute(binder, server.config().getPersistBatchSize()); } @Override @@ -208,7 +208,7 @@ public final class DefaultPersister implements Persister { private List getBeanIds(BeanDescriptor desc, List beans) { List idList = new ArrayList<>(beans.size()); for (T liveBean : beans) { - idList.add(desc.getBeanId(liveBean)); + idList.add(desc.beanId(liveBean)); } return idList; } @@ -348,7 +348,7 @@ public final class DefaultPersister implements Persister { * Publish/restore the values from the sourceBean to the matching destination bean. */ T publishToDestinationBean(T sourceBean) { - id = desc.getBeanId(sourceBean); + id = desc.beanId(sourceBean); T destBean = destBeans.get(id); insert = (destBean == null); // apply changes from liveBean to draftBean diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 04f2ffc4c..9d5d7d613 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -167,8 +167,8 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< this.rootBeanDescriptor = desc; this.beanType = desc.getBeanType(); this.server = server; - this.orderById = server.getServerConfig().isDefaultOrderById(); - this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading(); + this.orderById = server.config().isDefaultOrderById(); + this.disableLazyLoading = server.config().isDisableLazyLoading(); this.expressionFactory = expressionFactory; this.detail = new OrmQueryDetail(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index b0706173c..12866b61c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -62,8 +62,8 @@ public final class DJsonContext implements SpiJsonContext { public DJsonContext(SpiEbeanServer server, JsonFactory jsonFactory, TypeManager typeManager) { this.server = server; this.jsonFactory = (jsonFactory != null) ? jsonFactory : new JsonFactory(); - this.defaultObjectMapper = this.server.getServerConfig().getObjectMapper(); - this.defaultInclude = this.server.getServerConfig().getJsonInclude(); + this.defaultObjectMapper = this.server.config().getObjectMapper(); + this.defaultInclude = this.server.config().getJsonInclude(); this.jsonScalar = new DJsonScalar(typeManager); } diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index e33900534..3e144debc 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -167,7 +167,7 @@ public abstract class BaseTestCase { } public boolean isPlatformCaseSensitive() { - return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation(); + return spiEbeanServer().databasePlatform().isCaseSensitiveCollation(); } /** @@ -215,7 +215,7 @@ public abstract class BaseTestCase { } public boolean isPlatformBooleanNative() { - return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType(); + return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType(); } public boolean isPlatformOrderNullsSupport() { @@ -223,11 +223,11 @@ public abstract class BaseTestCase { } public boolean isPlatformSupportsDeleteTableAlias() { - return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias(); + return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias(); } public boolean isPersistBatchOnCascade() { - return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } /** @@ -246,11 +246,11 @@ public abstract class BaseTestCase { } protected Platform platform() { - return spiEbeanServer().getDatabasePlatform().getPlatform().base(); + return spiEbeanServer().databasePlatform().getPlatform().base(); } protected IdType idType() { - return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType(); + return spiEbeanServer().databasePlatform().getDbIdentity().getIdType(); } protected SpiEbeanServer spiEbeanServer() { @@ -299,7 +299,7 @@ public abstract class BaseTestCase { } protected String concat(String property0, String separator, String property1, String suffix) { - DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform()); + DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); return dbExpressionHandler.concat(property0, separator, property1, suffix); } diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index 6557867e9..d6edb3f0c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -92,10 +92,7 @@ public class BeanTypeTest { order.setId(42); Object id1 = beanType(Order.class).beanId(order); - Object id2 = beanType(Order.class).getBeanId(order); - assertThat(id1).isEqualTo(order.getId()); - assertThat(id2).isEqualTo(order.getId()); } @Test diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index 54776a643..f94cf6059 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -43,7 +43,7 @@ public class SpiServerTest extends BaseTestCase { Customer customer = new Customer(); customer.setId(42); - assertEquals(42, beanType.getBeanId(customer)); + assertEquals(42, beanType.beanId(customer)); List> beanTypes = pluginApi.beanTypes("o_customer"); assertEquals(2, beanTypes.size()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 7dc5a0b63..ae80084f4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -1,41 +1,12 @@ package io.ebeaninternal.api; -import io.ebean.AutoTune; -import io.ebean.BackgroundExecutor; -import io.ebean.BeanState; -import io.ebean.CallableSql; -import io.ebean.DocumentStore; -import io.ebean.DtoQuery; -import io.ebean.ExpressionFactory; -import io.ebean.ExtendedServer; -import io.ebean.Filter; -import io.ebean.FutureIds; -import io.ebean.FutureList; -import io.ebean.FutureRowCount; -import io.ebean.MergeOptions; -import io.ebean.PagedList; -import io.ebean.PersistenceContextScope; -import io.ebean.Query; -import io.ebean.QueryIterator; -import io.ebean.RowConsumer; -import io.ebean.RowMapper; -import io.ebean.ScriptRunner; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; -import io.ebean.TransactionCallback; -import io.ebean.TxScope; -import io.ebean.Update; -import io.ebean.UpdateQuery; -import io.ebean.ValuePair; -import io.ebean.Version; +import io.ebean.*; import io.ebean.annotation.Platform; import io.ebean.annotation.TxIsolation; import io.ebean.bean.BeanCollection; import io.ebean.bean.CallOrigin; import io.ebean.cache.ServerCacheManager; -import io.ebean.config.ServerConfig; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; @@ -56,12 +27,7 @@ import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; import javax.sql.DataSource; import java.time.Clock; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.Callable; import java.util.function.Consumer; import java.util.function.Predicate; @@ -71,7 +37,7 @@ import java.util.stream.Stream; /** * Test double for SpiEbeanServer. */ -public class TDSpiEbeanServer implements SpiEbeanServer { +public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { String name; @@ -158,12 +124,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public ServerConfig getServerConfig() { + public DatabaseConfig config() { return null; } @Override - public DatabasePlatform getDatabasePlatform() { + public DatabasePlatform databasePlatform() { return null; } diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java new file mode 100644 index 000000000..fdb304332 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java @@ -0,0 +1,643 @@ +package io.ebeaninternal.api; + +import io.ebean.*; +import io.ebean.annotation.Platform; +import io.ebean.annotation.TxIsolation; +import io.ebean.bean.BeanLoader; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.cache.ServerCacheManager; +import io.ebean.config.DatabaseConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.meta.MetaInfoManager; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; +import io.ebean.plugin.SpiServer; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.json.JsonContext; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.persistence.OptimisticLockException; +import javax.persistence.PersistenceException; +import javax.sql.DataSource; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; + +public class TDSpiServer implements SpiServer { + @Override + public void shutdown() { + + } + + @Override + public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) { + + } + + @Override + public AutoTune autoTune() { + return null; + } + + @Override + public DataSource dataSource() { + return null; + } + + @Override + public DataSource readOnlyDataSource() { + return null; + } + + @Override + public String name() { + return null; + } + + @Override + public ExpressionFactory expressionFactory() { + return null; + } + + @Override + public MetaInfoManager metaInfo() { + return null; + } + + @Override + public Platform platform() { + return null; + } + + @Override + public SpiServer pluginApi() { + return null; + } + + @Override + public BeanState beanState(Object bean) { + return null; + } + + @Override + public Object beanId(Object bean) { + return null; + } + + @Override + public Object beanId(Object bean, Object id) { + return null; + } + + @Override + public Map diff(Object newBean, Object oldBean) { + return null; + } + + @Override + public T createEntityBean(Class type) { + return null; + } + + @Override + public CsvReader createCsvReader(Class beanType) { + return null; + } + + @Override + public UpdateQuery update(Class beanType) { + return null; + } + + @Override + public Query createNamedQuery(Class beanType, String namedQuery) { + return null; + } + + @Override + public Query createQuery(Class beanType) { + return null; + } + + @Override + public Query createQuery(Class beanType, String ormQuery) { + return null; + } + + @Override + public Query find(Class beanType) { + return null; + } + + @Override + public Query findNative(Class beanType, String nativeSql) { + return null; + } + + @Override + public Object nextId(Class beanType) { + return null; + } + + @Override + public Filter filter(Class beanType) { + return null; + } + + @Override + public void sort(List list, String sortByClause) { + + } + + @Override + public Update createUpdate(Class beanType, String ormUpdate) { + return null; + } + + @Override + public DtoQuery findDto(Class dtoType, String sql) { + return null; + } + + @Override + public DtoQuery createNamedDtoQuery(Class dtoType, String namedQuery) { + return null; + } + + @Override + public SqlQuery sqlQuery(String sql) { + return null; + } + + @Override + public SqlQuery createSqlQuery(String sql) { + return null; + } + + @Override + public SqlUpdate sqlUpdate(String sql) { + return null; + } + + @Override + public SqlUpdate createSqlUpdate(String sql) { + return null; + } + + @Override + public CallableSql createCallableSql(String callableSql) { + return null; + } + + @Override + public void register(TransactionCallback transactionCallback) throws PersistenceException { + + } + + @Override + public Transaction createTransaction() { + return null; + } + + @Override + public Transaction createTransaction(TxIsolation isolation) { + return null; + } + + @Override + public Transaction beginTransaction() { + return null; + } + + @Override + public Transaction beginTransaction(TxIsolation isolation) { + return null; + } + + @Override + public Transaction beginTransaction(TxScope scope) { + return null; + } + + @Override + public Transaction currentTransaction() { + return null; + } + + @Override + public void flush() { + + } + + @Override + public void commitTransaction() { + + } + + @Override + public void rollbackTransaction() { + + } + + @Override + public void endTransaction() { + + } + + @Override + public void refresh(Object bean) { + + } + + @Override + public void refreshMany(Object bean, String propertyName) { + + } + + @Nullable + @Override + public T find(Class beanType, Object id) { + return null; + } + + @Nonnull + @Override + public T reference(Class beanType, Object id) { + return null; + } + + @Override + public ExtendedServer extended() { + return null; + } + + @Override + public void save(Object bean) throws OptimisticLockException { + + } + + @Override + public int saveAll(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int saveAll(Object... beans) throws OptimisticLockException { + return 0; + } + + @Override + public boolean delete(Object bean) throws OptimisticLockException { + return false; + } + + @Override + public boolean delete(Object bean, Transaction transaction) throws OptimisticLockException { + return false; + } + + @Override + public boolean deletePermanent(Object bean) throws OptimisticLockException { + return false; + } + + @Override + public boolean deletePermanent(Object bean, Transaction transaction) throws OptimisticLockException { + return false; + } + + @Override + public int deleteAllPermanent(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAllPermanent(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Override + public int delete(Class beanType, Object id) { + return 0; + } + + @Override + public int delete(Class beanType, Object id, Transaction transaction) { + return 0; + } + + @Override + public int deletePermanent(Class beanType, Object id) { + return 0; + } + + @Override + public int deletePermanent(Class beanType, Object id, Transaction transaction) { + return 0; + } + + @Override + public int deleteAll(Collection beans) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAll(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Override + public int deleteAll(Class beanType, Collection ids) { + return 0; + } + + @Override + public int deleteAll(Class beanType, Collection ids, Transaction transaction) { + return 0; + } + + @Override + public int deleteAllPermanent(Class beanType, Collection ids) { + return 0; + } + + @Override + public int deleteAllPermanent(Class beanType, Collection ids, Transaction transaction) { + return 0; + } + + @Override + public int execute(SqlUpdate sqlUpdate) { + return 0; + } + + @Override + public int execute(Update update) { + return 0; + } + + @Override + public int execute(Update update, Transaction transaction) { + return 0; + } + + @Override + public int execute(CallableSql callableSql) { + return 0; + } + + @Override + public void externalModification(String tableName, boolean inserted, boolean updated, boolean deleted) { + + } + + @Override + public T find(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public void save(Object bean, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public int saveAll(Collection beans, Transaction transaction) throws OptimisticLockException { + return 0; + } + + @Nonnull + @Override + public Set checkUniqueness(Object bean) { + return null; + } + + @Nonnull + @Override + public Set checkUniqueness(Object bean, Transaction transaction) { + return null; + } + + @Override + public void markAsDirty(Object bean) { + + } + + @Override + public void update(Object bean) throws OptimisticLockException { + + } + + @Override + public void update(Object bean, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public void updateAll(Collection beans) throws OptimisticLockException { + + } + + @Override + public void updateAll(Collection beans, Transaction transaction) throws OptimisticLockException { + + } + + @Override + public void merge(Object bean) { + + } + + @Override + public void merge(Object bean, MergeOptions options) { + + } + + @Override + public void merge(Object bean, MergeOptions options, Transaction transaction) { + + } + + @Override + public void insert(Object bean) { + + } + + @Override + public void insert(Object bean, Transaction transaction) { + + } + + @Override + public void insertAll(Collection beans) { + + } + + @Override + public void insertAll(Collection beans, Transaction transaction) { + + } + + @Override + public int execute(SqlUpdate updSql, Transaction transaction) { + return 0; + } + + @Override + public int execute(CallableSql callableSql, Transaction transaction) { + return 0; + } + + @Override + public void execute(TxScope scope, Runnable runnable) { + + } + + @Override + public void execute(Runnable runnable) { + + } + + @Override + public T executeCall(TxScope scope, Callable callable) { + return null; + } + + @Override + public T executeCall(Callable callable) { + return null; + } + + @Override + public ServerCacheManager cacheManager() { + return null; + } + + @Override + public BackgroundExecutor backgroundExecutor() { + return null; + } + + @Override + public JsonContext json() { + return null; + } + + @Override + public ScriptRunner script() { + return null; + } + + @Override + public DocumentStore docStore() { + return null; + } + + @Override + public T publish(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public T publish(Class beanType, Object id) { + return null; + } + + @Override + public List publish(Query query, Transaction transaction) { + return null; + } + + @Override + public List publish(Query query) { + return null; + } + + @Override + public T draftRestore(Class beanType, Object id, Transaction transaction) { + return null; + } + + @Override + public T draftRestore(Class beanType, Object id) { + return null; + } + + @Override + public List draftRestore(Query query, Transaction transaction) { + return null; + } + + @Override + public List draftRestore(Query query) { + return null; + } + + @Override + public Set validateQuery(Query query) { + return null; + } + + @Override + public void truncate(String... tables) { + + } + + @Override + public void truncate(Class... tables) { + + } + + @Override + public DatabaseConfig getServerConfig() { + return null; + } + + @Override + public DatabasePlatform databasePlatform() { + return null; + } + + @Override + public List> beanTypes() { + return null; + } + + @Override + public BeanType beanType(Class beanClass) { + return null; + } + + @Override + public List> beanTypes(String baseTableName) { + return null; + } + + @Override + public BeanType beanTypeForQueueId(String queueId) { + return null; + } + + @Override + public BeanLoader beanLoader() { + return null; + } + + @Override + public void loadBeanRef(EntityBeanIntercept ebi) { + + } + + @Override + public void loadBeanL2(EntityBeanIntercept ebi) { + + } + + @Override + public void loadBean(EntityBeanIntercept ebi) { + + } +} diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index fb80fcabb..74eeec665 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -134,7 +134,7 @@ public class TestEncrypt extends BaseTestCase { assertEquals(EBasicEncrypt.Status.ONE, e2.getStatus()); SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); - DbEncrypt dbEncrypt = server.getDatabasePlatform().getDbEncrypt(); + DbEncrypt dbEncrypt = server.databasePlatform().getDbEncrypt(); if (dbEncrypt == null) { // can not test the where clause diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 376feef41..e6d75eef2 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -135,7 +135,7 @@ public class TestBatchInsertSimple extends BaseTestCase { Transaction transaction = Ebean.beginTransaction(); try { transaction.setBatchMode(true); - transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade())); + transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade())); transaction.setBatchSize(20); // escalate based on batchOnCascade value diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index a1a084dcb..947b904d4 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -90,7 +90,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { Transaction txn = server.beginTransaction(); try { assertThat(txn.isBatchMode()).isFalse(); - assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade())); + assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade())); failingOperation.run(); Assertions.fail("PersistenceException expected"); diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3e03fb46c..dee55eeea 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -92,6 +92,6 @@ public class TestElementCollectionBasicCache extends BaseTestCase { @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index a73e62c47..564c00b8d 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -98,6 +98,6 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { @Override public boolean isPersistBatchOnCascade() { - return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; + return ((SpiEbeanServer) Ebean.getDefaultServer()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE; } } diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 44cdee7e6..b20090a61 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -10,6 +10,7 @@ ebean ddl generation DDL and DB Migration generation ebean-ddl-generator + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index f5250827b..69a4af033 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -58,13 +58,13 @@ public class DdlGenerator implements SpiDdlGenerator { public DdlGenerator(SpiEbeanServer server) { this.server = server; - final DatabaseConfig config = server.getServerConfig(); + final DatabaseConfig config = server.config(); this.jaxbPresent = Detect.isJAXBPresent(config); this.generateDdl = config.isDdlGenerate(); this.extraDdl = config.isDdlExtra(); this.createOnly = config.isDdlCreateOnly(); this.dbSchema = config.getDbSchema(); - final DatabasePlatform databasePlatform = server.getDatabasePlatform(); + final DatabasePlatform databasePlatform = server.databasePlatform(); this.platform = databasePlatform.getPlatform(); this.platformName = platform.base().name(); if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) { @@ -150,7 +150,7 @@ public class DdlGenerator implements SpiDdlGenerator { private void createSchemaIfRequired(Connection connection) { try { for (String schema : dbSchema.split(",")) { - server.getDatabasePlatform().createSchemaIfNotExists(schema, connection); + server.databasePlatform().createSchemaIfNotExists(schema, connection); } } catch (SQLException e) { throw new PersistenceException("Failed to create DB Schema", e); @@ -231,7 +231,7 @@ public class DdlGenerator implements SpiDdlGenerator { * extra-ddl.xml should have some partition initialisation but this helps people get going. */ private void checkInitialTablePartitions(Connection connection) { - DatabasePlatform databasePlatform = server.getDatabasePlatform(); + DatabasePlatform databasePlatform = server.databasePlatform(); try { StringBuilder sb = new StringBuilder(); for (MTable table : currentModel.getPartitionedTables()) { @@ -255,11 +255,11 @@ public class DdlGenerator implements SpiDdlGenerator { } protected void runInitSql(Connection connection) throws IOException { - runResourceScript(connection, server.getServerConfig().getDdlInitSql()); + runResourceScript(connection, server.config().getDdlInitSql()); } protected void runSeedSql(Connection connection) throws IOException { - runResourceScript(connection, server.getServerConfig().getDdlSeedSql()); + runResourceScript(connection, server.config().getDdlSeedSql()); } protected void runResourceScript(Connection connection, String sqlScript) throws IOException {