* DB has methods like {@link #find(Class)} and {@link #save(Object)} which are
* just convenience for using the default database.
- *
*
*
{@code
*
@@ -117,39 +115,26 @@ public final class DB {
* build the WHERE and HAVING clauses. Alternatively you can use the
* ExpressionFactory directly to create expressions to add to the query where
* clause.
- *
*
* Alternatively you can use the {@link Expr} as a shortcut to the
* ExpressionFactory of the 'Default' database.
- *
*
* You generally need to the an ExpressionFactory (or {@link Expr}) to build
* an expression that uses OR like Expression e = Expr.or(..., ...);
- *
*/
public static ExpressionFactory expressionFactory() {
return getDefault().expressionFactory();
}
- /**
- * Deprecated migrate to expressionFactory().
- */
- @Deprecated
- public static ExpressionFactory getExpressionFactory() {
- return expressionFactory();
- }
-
/**
* Return the next identity value for a given bean type.
*
* This will only work when a IdGenerator is on this bean type such as a DB
* sequence or UUID.
- *
*
* For DB's supporting getGeneratedKeys and sequences such as Oracle10 you do
* not need to use this method generally. It is made available for more
* complex cases where it is useful to get an ID prior to some processing.
- *
*/
public static Object nextId(Class beanType) {
return getDefault().nextId(beanType);
@@ -159,17 +144,14 @@ public final class DB {
* Start a transaction with 'REQUIRED' semantics.
*
* With REQUIRED semantics if an active transaction already exists that transaction will be used.
- *
*
* The transaction is stored in a ThreadLocal variable and typically you only
* need to use the returned Transaction IF you wish to do things like
* use batch mode, change the transaction isolation level, use savepoints or
* log comments to the transaction log.
- *
*
- * Example of using a transaction to span multiple calls to find(), save()
- * etc.
- *
+ * Example of using a transaction to span multiple calls to find(), save() etc.
+ *
*
{@code
*
* try (Transaction transaction = DB.beginTransaction()) {
@@ -187,7 +169,6 @@ public final class DB {
* With Database we can pass the transaction to the various find(), save() and execute()
* methods. This gives us the ability to create the transactions externally from Ebean
* and use the transaction explicitly via the various methods available on Database.
- *
*/
public static Transaction beginTransaction() {
return getDefault().beginTransaction();
@@ -199,7 +180,6 @@ public final class DB {
* You will want to do this if you want multiple Transactions in a single
* thread or generally use transactions outside of the TransactionThreadLocal
* management.
- *
*/
public static Transaction createTransaction() {
return getDefault().createTransaction();
@@ -219,7 +199,6 @@ public final class DB {
*
* Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
* {@link #execute(TxScope, Runnable)}.
- *
*
*
REQUIRES_NEW example:
*
{@code
@@ -278,7 +257,7 @@ public final class DB {
/**
* Register a TransactionCallback on the currently active transaction.
- *
+ *
* If there is no currently active transaction then a PersistenceException is thrown.
*
* @param transactionCallback the transaction callback to be registered with the current transaction
@@ -307,14 +286,12 @@ public final class DB {
* rollback the transaction.
*
* It is preferable to use try with resources rather than this.
- *
*
* Useful to put in a finally block to ensure the transaction is ended, rather
* than a rollbackTransaction() in each catch block.
- *
*
* Code example:
- *
+ *
*
{@code
* DB.beginTransaction();
* try {
@@ -345,7 +322,6 @@ public final class DB {
*
* When null is passed in for b, then the 'OldValues' of a is used for the
* difference comparison.
- *
*/
public static Map diff(Object a, Object b) {
return getDefault().diff(a, b);
@@ -356,18 +332,15 @@ public final class DB {
*
* If there is no current transaction one will be created and committed for
* you automatically.
- *
*
* Save can cascade along relationships. For this to happen you need to
* specify a cascade of CascadeType.ALL or CascadeType.PERSIST on the
* OneToMany, OneToOne or ManyToMany annotation.
- *
*
* When a save cascades via a OneToMany or ManyToMany Ebean will automatically
* set the 'parent' object to the 'detail' object. In the example below in
* saving the order and cascade saving the order details the 'parent' order
* will be set against each order detail when it is saved.
- *
*/
public static void save(Object bean) throws OptimisticLockException {
getDefault().save(bean);
@@ -418,11 +391,9 @@ public final class DB {
* Stateless updates: Note that the bean does not have to be previously fetched to call
* update().You can create a new instance and set some of its properties programmatically for via
* JSON/XML marshalling etc. This is described as a 'stateless update'.
- *
*
* Optimistic Locking: Note that if the version property is not set when update() is
* called then no optimistic locking is performed (internally ConcurrencyMode.NONE is used).
- *
*
*
{@code
*
@@ -552,20 +523,16 @@ public final class DB {
* Delete the bean.
*
* This will return true if the bean was deleted successfully or JDBC batch is being used.
- *
*
* If there is no current transaction one will be created and committed for
* you automatically.
- *
*
* If the bean is configured with @SoftDelete then this will perform a soft
* delete rather than a hard/permanent delete.
- *
*
* If the Bean does not have a version property (or loaded version property) and
* the bean does not exist then this returns false indicating that nothing was
* deleted. Note that, if JDBC batch mode is used then this always returns true.
- *
*/
public static boolean delete(Object bean) throws OptimisticLockException {
return getDefault().delete(bean);
@@ -625,7 +592,6 @@ public final class DB {
*
* Note that this resets OneToMany and ManyToMany properties so that if they
* are accessed a lazy load will refresh the many property.
- *
*/
public static void refresh(Object bean) {
getDefault().refresh(bean);
@@ -633,6 +599,7 @@ public final class DB {
/**
* Refresh a 'many' property of a bean.
+ *
*
{@code
*
* Order order = ...;
@@ -653,7 +620,7 @@ public final class DB {
* Get a reference object.
*
* This is sometimes described as a proxy (with lazy loading).
- *
+ *
*
{@code
*
* Product product = DB.getReference(Product.class, 1);
@@ -674,14 +641,6 @@ public final class DB {
return getDefault().reference(beanType, id);
}
- /**
- * Deprecated migrate to beanId().
- */
- @Deprecated
- public static T getReference(Class beanType, Object id) {
- return reference(beanType, id);
- }
-
/**
* Sort the list using the sortByClause which can contain a comma delimited
* list of property names and keywords asc, desc, nullsHigh and nullsLow.
@@ -697,7 +656,7 @@ public final class DB {
*
* Note that the sorting uses a Comparator and Collections.sort(); and does
* not invoke a DB query.
- *
+ *
*
{@code
*
* // find orders and their customers
@@ -732,9 +691,8 @@ public final class DB {
*
* }
*
- * If you want more control over the query then you can use createQuery() and
- * Query.findOne();
- *
+ * If you want more control over the query then you can use createQuery() and Query.findOne();
+ *
*
{@code
*
* // ... additionally fetching customer, customer shipping address,
@@ -774,40 +732,25 @@ public final class DB {
}
/**
- * Look to execute a native sql query that does not returns beans but instead
- * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
- *
+ * Look to execute a native sql query that does not return beans but instead
+ * returns SqlRow or uses {@link RowMapper}.
*
* Refer to {@link DtoQuery} for native sql queries returning DTO beans.
- *
*
* Refer to {@link #findNative(Class, String)} for native sql queries returning entity beans.
- *
- * This is an alias for {@link #sqlQuery(String)}.
- */
- @Deprecated
- public static SqlQuery createSqlQuery(String sql) {
- return sqlQuery(sql);
- }
-
/**
* Look to execute a native sql insert update or delete statement.
*
* Use this to execute a Insert Update or Delete statement. The statement will
* be native to the database and contain database table and column names.
- *
*
*
* See {@link SqlUpdate} for example usage.
- *
*
* @return The SqlUpdate instance to set parameters and execute
*/
@@ -815,16 +758,6 @@ public final class DB {
return getDefault().sqlUpdate(sql);
}
- /**
- * Deprecated - migrate to sqlUpdate().
- *
- * This is an alias for {@link #sqlUpdate(String)}.
- */
- @Deprecated
- public static SqlUpdate createSqlUpdate(String sql) {
- return sqlUpdate(sql);
- }
-
/**
* Create a CallableSql to execute a given stored procedure.
*
@@ -841,10 +774,9 @@ public final class DB {
*
* The orm update differs from the sql update in that it you can use the bean
* name and bean property names rather than table and column names.
- *
*
* An example:
- *
+ *
*
{@code
*
* // The bean name and properties - "topic","postCount" and "id"
@@ -877,7 +809,6 @@ public final class DB {
* Create a named query.
*
* For RawSql the named query is expected to be in ebean.xml.
- *
*
* @param beanType The type of entity bean
* @param namedQuery The name of the query
@@ -893,15 +824,12 @@ public final class DB {
*
* You can use the methods on the Query object to specify fetch paths,
* predicates, order by, limits etc.
- *
*
* You then use findList(), findSet(), findMap() and findOne() to execute
* the query and return the collection or bean.
- *
*
* Note that a query executed by {@link Query#findList()} etc will execute against
* the same database from which is was created.
- *
*
* @param beanType the class of entity to be fetched
* @return A ORM Query for this beanType
@@ -953,7 +881,6 @@ public final class DB {
* This is actually the same as {@link #createQuery(Class)}. The reason it
* exists is that people used to JPA will probably be looking for a
* createQuery method (the same as entityManager).
- *
*
* @param beanType the type of entity bean to find
* @return A ORM Query object for this beanType
@@ -966,7 +893,7 @@ public final class DB {
* Create a query using native SQL.
*
* The native SQL can contain named parameters or positioned parameters.
- *
+ *
*
{@code
*
* String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
@@ -991,7 +918,6 @@ public final class DB {
*
* DTO beans are just normal bean like classes with public constructor(s) and setters.
* They do not need to be registered with Ebean before use.
- *
*
* @param dtoType The type of the DTO bean the rows will be mapped into.
* @param sql The SQL query to execute.
@@ -1028,10 +954,8 @@ public final class DB {
* going back to the database.
*
* This produces and returns a new list with the sort and filters applied.
- *
*
* Refer to {@link Filter} for an example of its use.
- *
*/
public static Filter filter(Class beanType) {
return getDefault().filter(beanType);
@@ -1042,7 +966,7 @@ public final class DB {
*
* The scope can control the transaction type, isolation and rollback
* semantics.
- *
+ *
*
{@code
*
* // set specific transactional scope settings
@@ -1066,7 +990,7 @@ public final class DB {
*
* The default scope runs with REQUIRED and by default will rollback on any
* exception (checked or runtime).
- *
+ *
*
{@code
*
* DB.execute(() -> {
@@ -1091,7 +1015,7 @@ public final class DB {
*
* The scope can control the transaction type, isolation and rollback
* semantics.
- *
+ *
*
{@code
*
* // set specific transactional scope settings
@@ -1115,11 +1039,10 @@ public final class DB {
*
* The default scope runs with REQUIRED and by default will rollback on any
* exception (checked or runtime).
- *
*
* This is basically the same as TxRunnable except that it returns an Object
* (and you specify the return type via generics).
- *
+ *
*
{@code
*
* DB.executeCall(() -> {
@@ -1148,23 +1071,19 @@ public final class DB {
*
* If you use DB.execute(UpdateSql) then the table modification information
* is automatically deduced and you do not need to call this method yourself.
- *
*
* This information is used to invalidate objects out of the cache and
* potentially text indexes. This information is also automatically broadcast
* across the cluster.
- *
*
* If there is a transaction then this information is placed into the current
* transactions event information. When the transaction is committed this
* information is registered (with the transaction manager). If this
* transaction is rolled back then none of the transaction event information
* registers including the information you put in via this method.
- *
*
* If there is NO current transaction when you call this method then this
* information is registered immediately (with the transaction manager).
- *
*
* @param tableName the name of the table that was modified
* @param inserts true if rows where inserted into the table
@@ -1179,20 +1098,11 @@ public final class DB {
* Return the BeanState for a given entity bean.
*
* This will return null if the bean is not an enhanced entity bean.
- *
*/
public static BeanState beanState(Object bean) {
return getDefault().beanState(bean);
}
- /**
- * Deprecated migrate to beanState().
- */
- @Deprecated
- public static BeanState getBeanState(Object bean) {
- return beanState(bean);
- }
-
/**
* Return the value of the Id property for a given bean.
*/
@@ -1200,14 +1110,6 @@ public final class DB {
return getDefault().beanId(bean);
}
- /**
- * Deprecated migrate to beanId().
- */
- @Deprecated
- public static Object getBeanId(Object bean) {
- return beanId(bean);
- }
-
/**
* Load and lock the bean using {@code select for update}.
*
@@ -1223,14 +1125,6 @@ public final class DB {
getDefault().lock(bean);
}
- /**
- * Deprecated migrate to cacheManager().
- */
- @Deprecated
- public static ServerCacheManager getServerCacheManager() {
- return getDefault().cacheManager();
- }
-
/**
* Return the manager of the level 2 cache ("L2" cache).
*/
@@ -1246,14 +1140,6 @@ public final class DB {
return getDefault().backgroundExecutor();
}
- /**
- * Deprecated migrate to backgroundExecutor().
- */
- @Deprecated
- public static BackgroundExecutor getBackgroundExecutor() {
- return backgroundExecutor();
- }
-
/**
* Return the JsonContext for reading/writing JSON.
*/
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 3353d1944..f58b3a028 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -123,81 +123,33 @@ public interface Database {
*/
AutoTune autoTune();
- /**
- * Deprecated migrate to autoTune().
- */
- @Deprecated
- default AutoTune getAutoTune() {
- return autoTune();
- }
-
/**
* Return the associated DataSource for this Database instance.
*/
DataSource dataSource();
- /**
- * Deprecated migrate to dataSource().
- */
- @Deprecated
- default DataSource getDataSource() {
- return dataSource();
- }
-
/**
* Return the associated read only DataSource for this Database instance (can be null).
*/
DataSource readOnlyDataSource();
- /**
- * Deprecated migrate to readOnlyDataSource().
- */
- @Deprecated
- default DataSource getReadOnlyDataSource() {
- return readOnlyDataSource();
- }
-
/**
* Return the name. This is used with {@link DB#byName(String)} to get a
* Database that was registered with the DB singleton.
*/
String name();
- /**
- * Deprecated migrate to name().
- */
- @Deprecated
- default String getName() {
- return name();
- }
-
/**
* Return the ExpressionFactory for this database.
*/
ExpressionFactory expressionFactory();
- /**
- * Deprecated migrate to expressionFactory().
- */
- @Deprecated
- default ExpressionFactory getExpressionFactory() {
- return expressionFactory();
- }
-
/**
* Return the MetaInfoManager which is used to get meta data from the Database
* such as query execution statistics.
*/
MetaInfoManager metaInfo();
- /**
- * Deprecated migrate to metaInfo().
- */
- @Deprecated
- default MetaInfoManager getMetaInfoManager() {
- return metaInfo();
- }
-
/**
* Return the platform used for this database instance.
*
@@ -217,27 +169,11 @@ public interface Database {
*/
Platform platform();
- /**
- * Deprecated migrate to platform().
- */
- @Deprecated
- default Platform getPlatform() {
- return platform();
- }
-
/**
* Return the extended API intended for use by plugins.
*/
SpiServer pluginApi();
- /**
- * Deprecated migrate to pluginApi().
- */
- @Deprecated
- default SpiServer getPluginApi() {
- return pluginApi();
- }
-
/**
* Return the BeanState for a given entity bean.
*
@@ -246,27 +182,11 @@ public interface Database {
*/
BeanState beanState(Object bean);
- /**
- * Deprecated migrate to beanState().
- */
- @Deprecated
- default BeanState getBeanState(Object bean) {
- return beanState(bean);
- }
-
/**
* Return the value of the Id property for a given bean.
*/
Object beanId(Object bean);
- /**
- * Deprecated migrate to beanId().
- */
- @Deprecated
- default Object getBeanId(Object bean) {
- return beanId(bean);
- }
-
/**
* Set the Id value onto the bean converting the type of the id value if necessary.
*
@@ -279,14 +199,6 @@ public interface Database {
*/
Object beanId(Object bean, Object id);
- /**
- * Deprecated migrate to beanId().
- */
- @Deprecated
- default Object setBeanId(Object bean, Object id) {
- return beanId(bean, id);
- }
-
/**
* Return a map of the differences between two objects of the same type.
*
- * This is an alias for {@link #sqlQuery(String)}.
- */
- @Deprecated
- SqlQuery createSqlQuery(String sql);
-
/**
* Look to execute a native sql insert update or delete statement.
*
- * This is an alias for {@link #sqlUpdate(String)}.
- */
- @Deprecated
- SqlUpdate createSqlUpdate(String sql);
-
/**
* Create a CallableSql to execute a given stored procedure.
*/
@@ -952,14 +848,6 @@ public interface Database {
*/
T reference(Class beanType, Object id);
- /**
- * Deprecated migrate to reference().
- */
- @Deprecated
- default T getReference(Class beanType, Object id) {
- return reference(beanType, id);
- }
-
/**
* Return the extended API for Database.
*
@@ -1539,28 +1427,12 @@ public interface Database {
*/
ServerCacheManager cacheManager();
- /**
- * Deprecated migrate to cacheManager().
- */
- @Deprecated
- default ServerCacheManager getServerCacheManager() {
- return cacheManager();
- }
-
/**
* Return the BackgroundExecutor service for asynchronous processing of
* queries.
*/
BackgroundExecutor backgroundExecutor();
- /**
- * Deprecated migrate to backgroundExecutor().
- */
- @Deprecated
- default BackgroundExecutor getBackgroundExecutor() {
- return backgroundExecutor();
- }
-
/**
* Return the JsonContext for reading/writing JSON.
*
diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 588f48c24..9696954f7 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
* methods on the DB singleton such as {@link DB#find(Class)} are just a
* convenient way of using the 'default/primary' Database.
*/
-public class DatabaseFactory {
+public final class DatabaseFactory {
private static final ReentrantLock lock = new ReentrantLock();
private static SpiContainer container;
diff --git a/ebean-api/src/main/java/io/ebean/DbPrimary.java b/ebean-api/src/main/java/io/ebean/DbPrimary.java
index ffec8b114..156038f8e 100644
--- a/ebean-api/src/main/java/io/ebean/DbPrimary.java
+++ b/ebean-api/src/main/java/io/ebean/DbPrimary.java
@@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock;
*
* Intended for internal use as part of bootup, construction, registration of the default database.
*/
-class DbPrimary {
+final class DbPrimary {
private static final ReentrantLock lock = new ReentrantLock();
private static String defaultServerName;
diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
index 6a764d911..c4e63efff 100644
--- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java
+++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
@@ -12,7 +12,7 @@ import java.util.Properties;
*
* @author Roland Praml, FOCONIS AG
*/
-public class EbeanVersion {
+public final class EbeanVersion {
private static final Logger log = LoggerFactory.getLogger("io.ebean");
diff --git a/ebean-api/src/main/java/io/ebean/Expr.java b/ebean-api/src/main/java/io/ebean/Expr.java
index 1316f9873..525bc3272 100644
--- a/ebean-api/src/main/java/io/ebean/Expr.java
+++ b/ebean-api/src/main/java/io/ebean/Expr.java
@@ -25,7 +25,7 @@ import java.util.Map;
*
* @see Query#where()
*/
-public class Expr {
+public final class Expr {
private Expr() {
}
diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
index 1bb21a721..0088e9c2b 100644
--- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java
+++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
@@ -112,19 +112,6 @@ public interface ExtendedServer {
*/
Stream findStream(Query query, Transaction transaction);
- /**
- * Deprecated - migrate to findStream().
- *
- * Execute the query returning the result as a Stream.
- *
- * Note that this can support very large queries iterating any number of results.
- * To do so internally it can use multiple persistence contexts.
- *
- * Note that the stream needs to be closed so use with try with resources.
- */
- @Deprecated
- Stream findLargeStream(Query query, Transaction transaction);
-
/**
* Execute the query visiting the each bean one at a time.
*
diff --git a/ebean-api/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java
index e2d4fbe35..cfb14a235 100644
--- a/ebean-api/src/main/java/io/ebean/FetchConfig.java
+++ b/ebean-api/src/main/java/io/ebean/FetchConfig.java
@@ -31,7 +31,7 @@ import java.io.Serializable;
* @author mario
* @author rbygrave
*/
-public class FetchConfig implements Serializable {
+public final class FetchConfig implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index 4ddfc9af5..0bc8939f3 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -750,29 +750,6 @@ public interface Query extends CancelableQuery {
*/
Stream findStream();
- /**
- * Deprecated - migrate to findStream.
- *
- * Execute the query returning the result as a Stream.
- *
- * Note that this uses multiple persistence contexts such that we can use
- * it with a large number of results.
- *
{@code
- *
- * .mapToScalar(Long.class)
- * .findList();
- * }
- */
- @Deprecated
- List findSingleAttributeList(Class attributeType);
-
/**
* Set one of more positioned parameters.
*
@@ -194,12 +138,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
*/
SqlQuery setParameters(Object... values);
- /**
- * Deprecated migrate to setParameters(Object... values)
- */
- @Deprecated
- SqlQuery setParams(Object... values);
-
/**
* Set the next bind parameter by position.
*
{@code
@@ -246,6 +184,16 @@ public interface SqlQuery extends Serializable, CancelableQuery {
*/
SqlQuery setParameter(Object value);
+ /**
+ * Set a null parameter by position.
+ */
+ SqlQuery setNullParameter(int position, int jdbcType);
+
+ /**
+ * Set a null parameter by name.
+ */
+ SqlQuery setNullParameter(String name, int jdbcType);
+
/**
* Bind the parameter by its index position (1 based like JDBC).
*
diff --git a/ebean-api/src/main/java/io/ebean/SqlUpdate.java b/ebean-api/src/main/java/io/ebean/SqlUpdate.java
index 9ce704922..33eedf3b2 100644
--- a/ebean-api/src/main/java/io/ebean/SqlUpdate.java
+++ b/ebean-api/src/main/java/io/ebean/SqlUpdate.java
@@ -287,12 +287,6 @@ public interface SqlUpdate {
*/
SqlUpdate setParameters(Object... values);
- /**
- * Deprecated migrate to setParameters(Object... values).
- */
- @Deprecated
- SqlUpdate setParams(Object... values);
-
/**
* Set the next bind parameter by position.
*
@@ -300,12 +294,6 @@ public interface SqlUpdate {
*/
SqlUpdate setParameter(Object value);
- /**
- * Deprecated migrate to setParameter(value).
- */
- @Deprecated
- SqlUpdate setNextParameter(Object value);
-
/**
* Set a parameter via its index position.
*/
diff --git a/ebean-api/src/main/java/io/ebean/XServiceProvider.java b/ebean-api/src/main/java/io/ebean/XServiceProvider.java
index 7f7ce9cc6..9d362571c 100644
--- a/ebean-api/src/main/java/io/ebean/XServiceProvider.java
+++ b/ebean-api/src/main/java/io/ebean/XServiceProvider.java
@@ -11,7 +11,7 @@ import java.util.ServiceLoader;
/**
* Lookup internal services.
*/
-class XServiceProvider {
+final class XServiceProvider {
private static SpiRawSqlService rawSqlService = initRawSql();
diff --git a/ebean-api/src/main/java/io/ebean/annotation/EntityImplements.java b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java
similarity index 93%
rename from ebean-api/src/main/java/io/ebean/annotation/EntityImplements.java
rename to ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java
index e7986d147..ee312bb72 100644
--- a/ebean-api/src/main/java/io/ebean/annotation/EntityImplements.java
+++ b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java
@@ -1,4 +1,4 @@
-package io.ebean.annotation;
+package io.ebean.annotation.ext;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/ebean-api/src/main/java/io/ebean/annotation/EntityOverride.java b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java
similarity index 94%
rename from ebean-api/src/main/java/io/ebean/annotation/EntityOverride.java
rename to ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java
index bbe9d2aa2..2c166812a 100644
--- a/ebean-api/src/main/java/io/ebean/annotation/EntityOverride.java
+++ b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java
@@ -1,4 +1,4 @@
-package io.ebean.annotation;
+package io.ebean.annotation.ext;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/ebean-api/src/main/java/io/ebean/annotation/package.html b/ebean-api/src/main/java/io/ebean/annotation/ext/package.html
similarity index 100%
rename from ebean-api/src/main/java/io/ebean/annotation/package.html
rename to ebean-api/src/main/java/io/ebean/annotation/ext/package.html
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
index 1476e567d..28ff22780 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
@@ -1,5 +1,6 @@
package io.ebean.cache;
+import io.avaje.lang.Nullable;
import io.ebean.meta.MetricVisitor;
import java.util.LinkedHashMap;
@@ -68,40 +69,39 @@ public interface ServerCache {
/**
* Return the number of entries in the cache.
*/
- int size();
+ default int size() {
+ return 0;
+ }
/**
* Return the hit ratio the cache is currently getting.
*/
default int hitRatio() {
- return getHitRatio();
+ return 0;
}
- /**
- * Deprecated migrate to hitRatio().
- */
- @Deprecated
- int getHitRatio();
-
/**
* Return statistics for the cache.
*
* @param reset if true the statistics are reset.
*/
+ @Nullable
default ServerCacheStatistics statistics(boolean reset) {
- return getStatistics(reset);
+ return null;
}
- /**
- * Deprecated migrate to statistics().
- */
- @Deprecated
- ServerCacheStatistics getStatistics(boolean reset);
-
/**
* Visit the metrics for the cache.
*/
default void visit(MetricVisitor visitor) {
// do nothing by default
}
+
+ /**
+ * Unwrap the underlying ServerCache.
+ */
+ @SuppressWarnings("unchecked")
+ default T unwrap(Class cls) {
+ return (T) this;
+ }
}
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java
index f5e429299..80ffe471a 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java
@@ -13,6 +13,7 @@ public class ServerCacheConfig {
private final ServerCacheOptions cacheOptions;
private final CurrentTenantProvider tenantProvider;
private final QueryCacheEntryValidate queryCacheEntryValidate;
+ private final TenantAwareKey tenantAwareKey;
public ServerCacheConfig(ServerCacheType type, String cacheKey, String shortName, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
this.type = type;
@@ -21,6 +22,14 @@ public class ServerCacheConfig {
this.cacheOptions = cacheOptions;
this.tenantProvider = tenantProvider;
this.queryCacheEntryValidate = queryCacheEntryValidate;
+ this.tenantAwareKey = (tenantProvider == null) ? null : new TenantAwareKey(tenantProvider);
+ }
+
+ /**
+ * Return the ServerCache taking into account if multi-tenant is used.
+ */
+ public ServerCache tenantAware(ServerCache cache) {
+ return tenantAwareKey == null ? cache : new TenantAwareCache(cache, tenantAwareKey);
}
/**
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
index 67156a642..0168a4d58 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
@@ -23,14 +23,6 @@ public interface ServerCacheManager {
*/
boolean localL2Caching();
- /**
- * Deprecated migrate to localL2Caching().
- */
- @Deprecated
- default boolean isLocalL2Caching() {
- return localL2Caching();
- }
-
/**
* Return all the cache regions.
*/
@@ -46,77 +38,36 @@ public interface ServerCacheManager {
*/
void enabledRegions(String regions);
- /**
- * Deprecated migrate to enabledRegions().
- */
- @Deprecated
- default void setEnabledRegions(String regions) {
- enabledRegions(regions);
- }
-
/**
* Enable or disable all the cache regions.
*/
void allRegionsEnabled(boolean enabled);
- /**
- * Deprecated migrate to allRegionsEnabled().
- */
- @Deprecated
- default void setAllRegionsEnabled(boolean enabled) {
- allRegionsEnabled(enabled);
- }
-
/**
* Return the cache region by name. Typically, to enable or disable the region.
*/
ServerCacheRegion region(String name);
- @Deprecated
- default ServerCacheRegion getRegion(String name) {
- return region(name);
- }
-
/**
* Return the cache for mapping natural keys to id values.
*/
ServerCache naturalKeyCache(Class beanType);
- @Deprecated
- default ServerCache getNaturalKeyCache(Class beanType) {
- return naturalKeyCache(beanType);
- }
-
/**
* Return the cache for beans of a particular type.
*/
ServerCache beanCache(Class beanType);
- @Deprecated
- default ServerCache getBeanCache(Class beanType) {
- return beanCache(beanType);
- }
-
/**
* Return the cache for associated many properties of a bean type.
*/
ServerCache collectionIdsCache(Class beanType, String propertyName);
- @Deprecated
- default ServerCache getCollectionIdsCache(Class beanType, String propertyName) {
- return collectionIdsCache(beanType, propertyName);
- }
-
/**
* Return the cache for query results of a particular type of bean.
*/
ServerCache queryCache(Class beanType);
- @Deprecated
- default ServerCache getQueryCache(Class beanType) {
- return queryCache(beanType);
- }
-
/**
* This clears both the bean and query cache for a given type.
*/
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
index c798b5a35..5cfd3c595 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
@@ -10,14 +10,6 @@ public interface ServerCacheRegion {
*/
String name();
- /**
- * Deprecated migrate to name().
- */
- @Deprecated
- default String getName() {
- return name();
- }
-
/**
* Return true if the cache region is enabled.
*/
diff --git a/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java b/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java
new file mode 100644
index 000000000..42e22a950
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java
@@ -0,0 +1,104 @@
+package io.ebean.cache;
+
+import io.ebean.meta.MetricVisitor;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * A ServerCache proxy that is tenant aware.
+ */
+public final class TenantAwareCache implements ServerCache {
+
+ private final ServerCache delegate;
+ private final TenantAwareKey tenantAwareKey;
+
+ /**
+ * Create given the TenantAwareKey and delegate cache to proxy to.
+ *
+ * @param delegate The cache to proxy to
+ * @param tenantAwareKey Provides tenant aware keys to use in the cache
+ */
+ public TenantAwareCache(ServerCache delegate, TenantAwareKey tenantAwareKey) {
+ this.delegate = delegate;
+ this.tenantAwareKey = tenantAwareKey;
+ }
+
+ /**
+ * Return the underlying ServerCache that is being delegated to.
+ */
+ @Override
+ public T unwrap(Class cls) {
+ return (T)delegate;
+ }
+
+ @Override
+ public void visit(MetricVisitor visitor) {
+ delegate.visit(visitor);
+ }
+
+ private Object key(Object key) {
+ return tenantAwareKey.key(key);
+ }
+
+ @Override
+ public Object get(Object id) {
+ return delegate.get(key(id));
+ }
+
+ @Override
+ public void put(Object id, Object value) {
+ delegate.put(key(id), value);
+ }
+
+ @Override
+ public void remove(Object id) {
+ delegate.remove(key(id));
+ }
+
+ @Override
+ public void clear() {
+ delegate.clear();
+ }
+
+ @Override
+ public int size() {
+ return delegate.size();
+ }
+
+ @Override
+ public int hitRatio() {
+ return delegate.hitRatio();
+ }
+
+ @Override
+ public ServerCacheStatistics statistics(boolean reset) {
+ return delegate.statistics(reset);
+ }
+
+ @Override
+ public Map getAll(Set
+
+ io.ebean
+ ebean-platform-h2
+ 13.2.1-SNAPSHOT
+ test
+
+
@@ -63,8 +70,7 @@
true
- io.ebean.tile:enhancement:12.15.0
- io.avaje.tile:moditech-module:1.0
+ io.ebean.tile:enhancement:13.1.0
diff --git a/ebean-autotune/src/main/java9/module-info.java b/ebean-autotune/src/main/java/module-info.java
similarity index 100%
rename from ebean-autotune/src/main/java9/module-info.java
rename to ebean-autotune/src/main/java/module-info.java
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 936959daa..f5c522577 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -28,19 +28,4 @@
-
-
-
- io.repaint.maven
- tiles-maven-plugin
- 2.24
- true
-
-
- io.avaje.tile:moditech-module:1.0
-
-
-
-
-
diff --git a/ebean-core-type/src/main/java9/module-info.java b/ebean-core-type/src/main/java/module-info.java
similarity index 100%
rename from ebean-core-type/src/main/java9/module-info.java
rename to ebean-core-type/src/main/java/module-info.java
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index a0c289b5e..8ad75d84e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -135,6 +135,26 @@
+
+ io.ebean
+ ebean-platform-h2
+ 13.2.1-SNAPSHOT
+ test
+
+
+
+ io.ebean
+ ebean-platform-postgres
+ 13.2.1-SNAPSHOT
+ test
+
+
+
+ io.ebean
+ ebean-platform-sqlserver
+ 13.2.1-SNAPSHOT
+ test
+ io.ebean
@@ -222,18 +242,6 @@
-
- io.repaint.maven
- tiles-maven-plugin
- 2.24
- true
-
-
- io.avaje.tile:moditech-module:1.0
-
-
-
-
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index ec3b6ed05..1c6d43719 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -167,7 +167,7 @@ public final class BindParams implements Serializable {
*/
@SuppressWarnings("rawtypes")
public void setParameter(int position, Object value) {
- assert value != null : "use setNullParameter";
+ //TODO: Review - assert value != null : "use setNullParameter";
Param p = getParam(position);
if (value instanceof Collection) {
// use of postgres ANY with positioned parameter
@@ -219,7 +219,7 @@ public final class BindParams implements Serializable {
* Set a named In parameter that is not null.
*/
public Param setParameter(String name, Object value) {
- assert value != null : "use setNullParameter";
+ // TODO: Review - assert value != null : "use setNullParameter";
Param p = getParam(name);
p.setInValue(value);
return p;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 298b856df..31fa0e19b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -2,14 +2,7 @@ package io.ebeaninternal.server.cache;
import io.ebeaninternal.server.deploy.BeanDescriptor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* List of changes to be applied to L2 cache.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 6d632acc3..ad3faa749 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -3,12 +3,7 @@ package io.ebeaninternal.server.cache;
import io.ebean.annotation.Cache;
import io.ebean.annotation.CacheBeanTuning;
import io.ebean.annotation.CacheQueryTuning;
-import io.ebean.cache.QueryCacheEntryValidate;
-import io.ebean.cache.ServerCache;
-import io.ebean.cache.ServerCacheConfig;
-import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheOptions;
-import io.ebean.cache.ServerCacheType;
+import io.ebean.cache.*;
import io.ebean.config.CurrentTenantProvider;
import io.ebean.meta.MetricVisitor;
import io.ebean.util.AnnotationUtil;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index ebd086117..ae3a297b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.cache;
import io.ebean.BackgroundExecutor;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics;
-import io.ebean.cache.TenantAwareKey;
import io.ebean.meta.MetricVisitor;
import io.ebean.metric.CountMetric;
import io.ebean.metric.MetricFactory;
@@ -12,11 +11,7 @@ import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -52,14 +47,12 @@ public class DefaultServerCache implements ServerCache {
private final int trimFrequency;
private final int maxIdleSecs;
private final int maxSecsToLive;
- private final TenantAwareKey tenantAwareKey;
public DefaultServerCache(DefaultServerCacheConfig config) {
this.name = config.getName();
this.shortName = config.getShortName();
this.map = config.getMap();
this.maxSize = config.getMaxSize();
- this.tenantAwareKey = new TenantAwareKey(config.getTenantProvider());
this.maxIdleSecs = config.getMaxIdleSecs();
this.maxSecsToLive = config.getMaxSecsToLive();
this.trimFrequency = config.determineTrimFrequency();
@@ -92,7 +85,7 @@ public class DefaultServerCache implements ServerCache {
}
@Override
- public ServerCacheStatistics getStatistics(boolean reset) {
+ public ServerCacheStatistics statistics(boolean reset) {
ServerCacheStatistics cacheStats = new ServerCacheStatistics();
cacheStats.setCacheName(name);
cacheStats.setMaxSize(maxSize);
@@ -121,7 +114,7 @@ public class DefaultServerCache implements ServerCache {
}
@Override
- public int getHitRatio() {
+ public int hitRatio() {
long mc = missCount.get(false);
long hc = hitCount.get(false);
long totalCount = hc + mc;
@@ -152,19 +145,12 @@ public class DefaultServerCache implements ServerCache {
map.clear();
}
- /**
- * Return the tenant aware key.
- */
- protected Object key(Object id) {
- return tenantAwareKey.key(id);
- }
-
/**
* Return a value from the cache.
*/
@Override
- public Object get(Object id) {
- CacheEntry entry = getCacheEntry(id);
+ public Object get(Object key) {
+ CacheEntry entry = getCacheEntry(key);
if (entry == null) {
missCount.increment();
return null;
@@ -184,8 +170,8 @@ public class DefaultServerCache implements ServerCache {
/**
* Get the cache entry - override for query cache to validate dependent tables.
*/
- protected CacheEntry getCacheEntry(Object id) {
- final SoftReference ref = map.get(key(id));
+ protected CacheEntry getCacheEntry(Object key) {
+ final SoftReference ref = map.get(key);
return ref != null ? ref.get() : null;
}
@@ -198,8 +184,7 @@ public class DefaultServerCache implements ServerCache {
* Put a value into the cache.
*/
@Override
- public void put(Object id, Object value) {
- Object key = key(id);
+ public void put(Object key, Object value) {
map.put(key, new SoftReference<>(new CacheEntry(key, value)));
putCount.increment();
}
@@ -208,8 +193,8 @@ public class DefaultServerCache implements ServerCache {
* Remove an entry from the cache.
*/
@Override
- public void remove(Object id) {
- SoftReference entry = map.remove(key(id));
+ public void remove(Object key) {
+ SoftReference entry = map.remove(key);
if (entry != null && entry.get() != null) {
removeCount.increment();
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
index 2c329a62a..2e5c5dbcd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.cache;
import io.ebean.cache.QueryCacheEntryValidate;
import io.ebean.cache.ServerCacheConfig;
import io.ebean.cache.ServerCacheOptions;
-import io.ebean.config.CurrentTenantProvider;
import io.ebeaninternal.server.cache.DefaultServerCache.CacheEntry;
import java.lang.ref.SoftReference;
@@ -34,10 +33,6 @@ public final class DefaultServerCacheConfig {
this.maxSize = options.getMaxSize();
}
- public CurrentTenantProvider getTenantProvider() {
- return config.getTenantProvider();
- }
-
public QueryCacheEntryValidate getQueryCacheEntryValidate() {
return config.getQueryCacheEntryValidate();
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
index eab615ed1..a847aa8e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
@@ -1,11 +1,7 @@
package io.ebeaninternal.server.cache;
import io.ebean.BackgroundExecutor;
-import io.ebean.cache.ServerCache;
-import io.ebean.cache.ServerCacheConfig;
-import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheNotification;
-import io.ebean.cache.ServerCacheNotify;
+import io.ebean.cache.*;
/**
@@ -41,7 +37,7 @@ final class DefaultServerCacheFactory implements ServerCacheFactory {
if (executor != null) {
cache.periodicTrim(executor);
}
- return cache;
+ return config.tenantAware(cache);
}
@Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index d3a652437..00f551da8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -10,11 +10,7 @@ import io.ebeaninternal.server.deploy.DCacheRegion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Manages the bean and query caches.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
index 4f437eafc..942ffbb82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
@@ -27,8 +27,7 @@ public class DefaultServerQueryCache extends DefaultServerCache {
}
@Override
- protected CacheEntry getCacheEntry(Object id) {
- Object key = key(id);
+ protected CacheEntry getCacheEntry(Object key) {
final SoftReference ref = map.get(key);
CacheEntry entry = ref != null ? ref.get() : null;
if (entry == null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 5b49d5292..3f010e3c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -2,36 +2,18 @@ package io.ebeaninternal.server.core;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
-import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
-import io.ebean.config.dbplatform.db2.DB2ForIPlatform;
-import io.ebean.config.dbplatform.db2.DB2LegacyPlatform;
-import io.ebean.config.dbplatform.db2.DB2LuwPlatform;
-import io.ebean.config.dbplatform.db2.DB2ZosPlatform;
-import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.config.dbplatform.hana.HanaPlatform;
-import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
-import io.ebean.config.dbplatform.mariadb.MariaDbPlatform;
-import io.ebean.config.dbplatform.mysql.MySql55Platform;
-import io.ebean.config.dbplatform.mysql.MySqlPlatform;
-import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
-import io.ebean.config.dbplatform.oracle.Oracle11Platform;
-import io.ebean.config.dbplatform.oracle.Oracle12Platform;
-import io.ebean.config.dbplatform.oracle.OraclePlatform;
-import io.ebean.config.dbplatform.postgres.Postgres9Platform;
-import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
-import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
-import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
-import io.ebean.config.dbplatform.yugabyte.YugabytePlaform;
+import io.ebean.config.dbplatform.DatabasePlatformProvider;
import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.DbOffline;
import javax.persistence.PersistenceException;
import javax.sql.DataSource;
-import java.sql.*;
-import java.util.Locale;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
/**
* Create a DatabasePlatform from the configuration.
@@ -41,6 +23,14 @@ import java.util.Locale;
*/
public class DatabasePlatformFactory {
+ private final List providers = new ArrayList<>();
+
+ public DatabasePlatformFactory() {
+ for (DatabasePlatformProvider platformProvider : ServiceLoader.load(DatabasePlatformProvider.class)) {
+ providers.add(platformProvider);
+ }
+ }
+
/**
* Create the appropriate database specific platform.
*/
@@ -71,68 +61,10 @@ public class DatabasePlatformFactory {
*/
private DatabasePlatform byDatabaseName(String dbName) {
dbName = dbName.toLowerCase();
- if (dbName.equals("h2")) {
- return new H2Platform();
- }
- if (dbName.equals("mariadb")) {
- return new MariaDbPlatform();
- }
- if (dbName.equals("mysql")) {
- return new MySqlPlatform();
- }
- if (dbName.equals("mysql55")) {
- return new MySql55Platform();
- }
- if (dbName.equals("postgres") || dbName.equals("postgres9")) {
- return new PostgresPlatform();
- }
- if (dbName.equals("oracle11") || dbName.equals("oracle10") || dbName.equals("oracle9")) {
- return new Oracle11Platform();
- }
- if (dbName.equals("oracle12")) {
- return new Oracle12Platform();
- }
- if (dbName.equals("oracle")) {
- return new OraclePlatform();
- }
- if (dbName.equals("sqlserver16")) {
- return new SqlServer16Platform();
- }
- if (dbName.equals("sqlserver17")) {
- return new SqlServer17Platform();
- }
- if (dbName.equals("sqlserver")) {
- throw new IllegalArgumentException("Please choose the more specific sqlserver16 or sqlserver17 platform. Refer to issue #1340 for details");
- }
- if (dbName.equals("sqlanywhere")) {
- return new SqlAnywherePlatform();
- }
- if (dbName.equals("db2")) {
- throw new IllegalArgumentException("Please choose the more specific db2luw/db2zos/db2fori platform. Refer to issue #2514 for details");
- }
- if (dbName.equals("db2legacy")) {
- return new DB2LegacyPlatform();
- }
- if (dbName.equals("db2zos")) {
- return new DB2ZosPlatform();
- }
- if (dbName.equals("db2fori")) {
- return new DB2ForIPlatform();
- }
- if (dbName.equals("db2luw")) {
- return new DB2LuwPlatform();
- }
- if (dbName.equals("clickhouse")) {
- return new ClickHousePlatform();
- }
- if (dbName.equals("nuodb")) {
- return new NuoDbPlatform();
- }
- if (dbName.equals("sqlite")) {
- return new SQLitePlatform();
- }
- if (dbName.equals("hana")) {
- return new HanaPlatform();
+ for (DatabasePlatformProvider provider : providers) {
+ if (provider.match(dbName)) {
+ return provider.create(dbName);
+ }
}
throw new RuntimeException("database platform " + dbName + " is not known?");
}
@@ -156,79 +88,15 @@ public class DatabasePlatformFactory {
final int majorVersion = metaData.getDatabaseMajorVersion();
final int minorVersion = metaData.getDatabaseMinorVersion();
CoreLog.log.debug("platform for productName[{}] version[{}.{}]", dbProductName, majorVersion, minorVersion);
-
- if (dbProductName.contains("oracle")) {
- return oracleVersion(majorVersion);
- } else if (dbProductName.contains("microsoft")) {
- throw new IllegalArgumentException("For SqlServer please explicitly choose either sqlserver16 or sqlserver17 as the platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for more details");
- } else if (dbProductName.contains("h2")) {
- return new H2Platform();
- } else if (dbProductName.contains("hsql database engine")) {
- return new HsqldbPlatform();
- } else if (dbProductName.contains("postgres")) {
- String productVersion = metaData.getDatabaseProductVersion().toLowerCase(Locale.ENGLISH);
- return readPostgres(connection, majorVersion, productVersion);
- } else if (dbProductName.contains("mariadb")) {
- return new MariaDbPlatform();
- } else if (dbProductName.contains("mysql")) {
- return mysqlVersion(majorVersion, minorVersion);
- } else if (dbProductName.contains("nuo")) {
- return new NuoDbPlatform();
- } else if (dbProductName.contains("sqlite")) {
- return new SQLitePlatform();
- } else if (dbProductName.contains("db2")) {
- throw new IllegalArgumentException("For DB2 please explicitly choose either db2legacy/db2luw/db2zos/db2fori platform. Refer to issue #2514 for details");
- } else if (dbProductName.contains("sql anywhere")) {
- return new SqlAnywherePlatform();
- } else if (dbProductName.contains("hdb")) {
- return new HanaPlatform();
- } else if (dbProductName.contains("clickhouse")) {
- return new ClickHousePlatform();
- }
-
- // use the standard one
- return new DatabasePlatform();
- }
-
- private DatabasePlatform oracleVersion(int majorVersion) {
- if (majorVersion < 12) {
- return new Oracle11Platform();
- }
- if (majorVersion < 13) {
- return new Oracle12Platform();
- }
- return new OraclePlatform();
- }
-
- private DatabasePlatform mysqlVersion(int majorVersion, int minorVersion) {
- if (majorVersion <= 5 && minorVersion <= 5) {
- return new MySql55Platform();
- }
- return new MySqlPlatform();
- }
-
- /**
- * Use a select version() query as it could be Postgres or CockroachDB.
- */
- private static DatabasePlatform readPostgres(Connection connection, int majorVersion, String productVersion) {
- if (productVersion.contains("-yb-")) {
- return new YugabytePlaform();
- }
- try (PreparedStatement statement = connection.prepareStatement("select version() as \"version\"")) {
- try (ResultSet resultSet = statement.executeQuery()) {
- if (resultSet.next()) {
- productVersion = resultSet.getString("version").toLowerCase();
- if (productVersion.contains("cockroach")) {
- return new CockroachPlatform();
- }
- }
+ for (DatabasePlatformProvider provider : providers) {
+ if (provider.matchByProductName(dbProductName)) {
+ return provider.create(majorVersion, minorVersion, metaData, connection);
}
- } catch (SQLException e) {
- CoreLog.log.warn("Error running detection query on Postgres", e);
}
- if (majorVersion <= 9) {
- return new Postgres9Platform();
- }
- return new PostgresPlatform();
+ throw new IllegalStateException("Unable to determine the appropriate ebean platform given database product name [" + dbProductName
+ + "] and ebean platform providers " + providers + ". With ebean 13+ we now have separate platforms (ebean-postgres, ebean-mysql etc)"
+ + " and should use database specific platform dependency like ebean-postgres. Note that we can use ebean-platform-all to include"
+ + " all the platforms.");
}
+
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 2001b043c..bde0e1ce4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -10,7 +10,6 @@ import io.ebean.config.ServerConfigProvider;
import io.ebean.config.TenantMode;
import io.ebean.config.UnderscoreNamingConvention;
import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.event.ShutdownManager;
import io.ebean.service.SpiContainer;
import io.ebeaninternal.api.CoreLog;
@@ -24,6 +23,7 @@ import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
import org.slf4j.Logger;
import javax.persistence.PersistenceException;
+import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@@ -86,7 +86,7 @@ public final class DefaultContainer implements SpiContainer {
boolean online = true;
if (config.isDocStoreOnly()) {
- config.setDatabasePlatform(new H2Platform());
+ config.setDatabasePlatform(new DatabasePlatform());
} else {
TenantMode tenantMode = config.getTenantMode();
if (TenantMode.DB != tenantMode) {
@@ -141,9 +141,21 @@ public final class DefaultContainer implements SpiContainer {
}
if (config.isAutoLoadModuleInfo()) {
// auto register entity classes
+ boolean found = false;
for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
+ found = true;
}
+ if (!found) {
+ checkMissingModulePathProvides();
+ }
+ }
+ }
+
+ private void checkMissingModulePathProvides() {
+ URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.ModuleInfoLoader");
+ if (servicesFile != null) {
+ log.error("module-info.java is probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause. ModuleInfoLoader exists but was not service loaded.");
}
}
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 6d396d77f..d188f9539 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
@@ -974,21 +974,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
return new DefaultRelationalQuery(this, sql.trim());
}
- @Override
- public SqlQuery createSqlQuery(String sql) {
- return sqlQuery(sql);
- }
-
@Override
public SqlUpdate sqlUpdate(String sql) {
return new DefaultSqlUpdate(this, sql.trim());
}
- @Override
- public SqlUpdate createSqlUpdate(String sql) {
- return sqlUpdate(sql);
- }
-
@Override
public CallableSql createCallableSql(String sql) {
return new DefaultCallableSql(this, sql.trim());
@@ -1372,11 +1362,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
}
- @Override
- public Stream findLargeStream(Query query, Transaction transaction) {
- return findStream(query, transaction);
- }
-
@Override
public Stream findStream(Query query, Transaction transaction) {
return toStream(findIterate(query, transaction));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 756c5665f..d9023b356 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -261,16 +261,6 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
return this;
}
- @Override
- public SqlUpdate setParams(Object... values) {
- return setParameters(values);
- }
-
- @Override
- public SqlUpdate setNextParameter(Object value) {
- return setParameter(value);
- }
-
@Override
public SqlUpdate setParameters(Object... values) {
for (Object value : values) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
index abe20b1ca..386d4c383 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
@@ -17,12 +17,14 @@ import java.util.logging.Logger;
*/
final class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
+ private final CurrentTenantProvider tenantProvider;
private final DataSource dataSource;
private final DataSource readOnlyDataSource;
private final CatalogDataSource catalogDataSource;
private final CatalogDataSource readOnly;
MultiTenantDbCatalogSupplier(CurrentTenantProvider tenantProvider, DataSource dataSource, DataSource readOnlyDataSource, TenantCatalogProvider catalogProvider) {
+ this.tenantProvider = tenantProvider;
this.dataSource = dataSource;
this.readOnlyDataSource = readOnlyDataSource;
this.catalogDataSource = new CatalogDataSource(dataSource, tenantProvider, catalogProvider);
@@ -33,6 +35,11 @@ final class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
}
}
+ @Override
+ public Object currentTenantId() {
+ return tenantProvider.currentId();
+ }
+
@Override
public DataSource getDataSource() {
return catalogDataSource;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
index 2a1af6016..eca06a893 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
@@ -17,12 +17,14 @@ import java.util.logging.Logger;
*/
final class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
+ private final CurrentTenantProvider tenantProvider;
private final DataSource dataSource;
private final DataSource readOnlyDataSource;
private final SchemaDataSource schemaDataSource;
private final SchemaDataSource readOnly;
MultiTenantDbSchemaSupplier(CurrentTenantProvider tenantProvider, DataSource dataSource, DataSource readOnlyDataSource, TenantSchemaProvider schemaProvider) {
+ this.tenantProvider = tenantProvider;
this.dataSource = dataSource;
this.readOnlyDataSource = readOnlyDataSource;
this.schemaDataSource = new SchemaDataSource(dataSource, schemaProvider, tenantProvider);
@@ -33,6 +35,11 @@ final class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
}
}
+ @Override
+ public Object currentTenantId() {
+ return tenantProvider.currentId();
+ }
+
@Override
public DataSource getDataSource() {
return schemaDataSource;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
index e6237abfa..c0e810eff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
@@ -21,6 +21,11 @@ final class MultiTenantDbSupplier implements DataSourceSupplier {
this.dataSourceProvider = dataSourceProvider;
}
+ @Override
+ public Object currentTenantId() {
+ return tenantProvider.currentId();
+ }
+
@Override
public DataSource getReadOnlyDataSource() {
// read only datasource not supported with DB per tenant at this stage
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
index 7680dd086..03640dc90 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
@@ -20,6 +20,11 @@ final class SimpleDataSourceProvider implements DataSourceSupplier {
this.readOnlyDataSource = readOnlyDataSource;
}
+ @Override
+ public Object currentTenantId() {
+ return null; // not required here
+ }
+
@Override
public DataSource getDataSource() {
return dataSource;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index d7a5f5ff5..4974f221c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2106,10 +2106,10 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType {
return getId((EntityBean) bean);
}
- @Override
- public Object getBeanId(T bean) {
- return getId((EntityBean) bean);
- }
+// @Override
+// public Object beanId(T bean) {
+// return getId((EntityBean) bean);
+// }
/**
* Return the Id value for the bean with embeddedId beans converted into maps.
@@ -2673,7 +2673,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType {
public PartitionMeta partitionMeta() {
return partitionMeta;
}
-
+
/**
* Return the tablespace details of the bean.
*/
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
index 4c01a3bde..664e40da9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -58,13 +58,13 @@ class BeanDescriptorElementEmbeddedMap extends BeanDescriptorElementEmbedded<
}
if (stringKey) {
parser.nextToken();
- Object val = readJsonElement(readJson, null, null); // FIXME
+ Object val = readJsonElement(readJson, null, null); // CHECKME: Update existing map entry here?
add.addKeyValue(fieldName, val);
} else {
parser.nextFieldName();
Object key = scalarTypeKey.jsonRead(parser);
parser.nextFieldName();
- Object val = readJsonElement(readJson, null, null); // FIXME
+ Object val = readJsonElement(readJson, null, null); // CHECKME: Update existing map entry here?
add.addKeyValue(key, val);
}
} while (true);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index fbf53fd14..f20db7315 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -102,7 +102,7 @@ final class BeanDescriptorJsonHelp {
String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?";
throw new JsonParseException(newParser, msg, parser.getCurrentLocation());
}
-
+
BeanDescriptor inheritDesc = (BeanDescriptor) inheritInfo.readType(discNode.asText()).desc();
return inheritDesc.jsonReadObject(newReader, path, target);
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 6a5c66888..1cd5c6b52 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -575,7 +575,29 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
@SuppressWarnings("unchecked")
public BeanManager beanManager(Class entityType) {
- return (BeanManager) beanManager(entityType.getName());
+ BeanManager mgr = (BeanManager) beanManager(entityType.getName());
+ if (mgr == null) {
+ errorBeanNotRegistered(entityType);
+ }
+ return mgr;
+ }
+
+ private void errorBeanNotRegistered(Class entityType) {
+ if (beanManagerMap.isEmpty()) {
+ throw new PersistenceException(errNothingRegistered());
+ } else {
+ throw new PersistenceException(errNotRegistered(entityType));
+ }
+ }
+
+ private String errNothingRegistered() {
+ return "There are no registered entities. If using query beans, that generates _Ebean$ModuleInfo.java into " +
+ "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause.";
+ }
+
+ private String errNotRegistered(Class beanClass) {
+ return "The type [" + beanClass + "] is not a registered entity?"
+ + " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
}
private BeanManager beanManager(String beanClassName) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index f512f35f9..4e6f2d577 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -1016,7 +1016,8 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST
BeanCollection collection = createEmpty(parentBean);
BeanCollectionAdd add = beanCollectionAdd(collection);
do {
- EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name, null); // FIXME
+ // CHECKME: Update existing list entry here?
+ EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name, null);
if (detailBean == null) {
// read the entire array
break;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 38bd5aaac..bed7e2351 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.meta;
import io.ebean.annotation.Cache;
import io.ebean.annotation.DocStore;
import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.EntityOverride;
+import io.ebean.annotation.ext.EntityOverride;
import io.ebean.annotation.Identity;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.TableName;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 7c15443e7..954182f7a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1,6 +1,5 @@
package io.ebeaninternal.server.deploy.meta;
-import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.DocCode;
import io.ebean.annotation.DocProperty;
import io.ebean.annotation.DocSortable;
@@ -8,7 +7,6 @@ import io.ebean.annotation.Formula;
import io.ebean.annotation.MutationDetection;
import io.ebean.annotation.Platform;
import io.ebean.annotation.SoftDelete;
-import io.ebean.annotation.UpdatedTimestamp;
import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified;
import io.ebean.annotation.Where;
@@ -233,9 +231,7 @@ public class DeployBeanProperty implements DeployBeanPropertyMeta {
return (AnnotationUtil.has(field, WhenCreated.class)
|| AnnotationUtil.has(field, WhenModified.class)
|| AnnotationUtil.has(field, WhoModified.class)
- || AnnotationUtil.has(field, WhoCreated.class)
- || AnnotationUtil.has(field, UpdatedTimestamp.class)
- || AnnotationUtil.has(field, CreatedTimestamp.class));
+ || AnnotationUtil.has(field, WhoCreated.class));
}
public String getFullBeanName() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 1ce197f61..8d976a032 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -6,8 +6,8 @@ import io.ebean.annotation.DbPartition;
import io.ebean.annotation.DocStore;
import io.ebean.annotation.Draftable;
import io.ebean.annotation.DraftableElement;
-import io.ebean.annotation.EntityImplements;
-import io.ebean.annotation.EntityOverride;
+import io.ebean.annotation.ext.EntityImplements;
+import io.ebean.annotation.ext.EntityOverride;
import io.ebean.annotation.History;
import io.ebean.annotation.Identity;
import io.ebean.annotation.Index;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 571e1d3ca..f93fbf028 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -1,38 +1,7 @@
package io.ebeaninternal.server.deploy.parse;
-import io.ebean.annotation.Aggregation;
-import io.ebean.annotation.CreatedTimestamp;
-import io.ebean.annotation.DbArray;
-import io.ebean.annotation.DbComment;
-import io.ebean.annotation.DbDefault;
-import io.ebean.annotation.DbJson;
-import io.ebean.annotation.DbJsonB;
-import io.ebean.annotation.DbMap;
-import io.ebean.annotation.DbMigration;
-import io.ebean.annotation.DocCode;
-import io.ebean.annotation.DocEmbedded;
-import io.ebean.annotation.DocProperty;
-import io.ebean.annotation.DocSortable;
-import io.ebean.annotation.Draft;
-import io.ebean.annotation.DraftDirty;
-import io.ebean.annotation.DraftOnly;
-import io.ebean.annotation.DraftReset;
-import io.ebean.annotation.Encrypted;
-import io.ebean.annotation.Expose;
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.HistoryExclude;
-import io.ebean.annotation.Identity;
import io.ebean.annotation.Index;
-import io.ebean.annotation.JsonIgnore;
-import io.ebean.annotation.Length;
-import io.ebean.annotation.SoftDelete;
-import io.ebean.annotation.TenantId;
-import io.ebean.annotation.UnmappedJson;
-import io.ebean.annotation.UpdatedTimestamp;
-import io.ebean.annotation.WhenCreated;
-import io.ebean.annotation.WhenModified;
-import io.ebean.annotation.WhoCreated;
-import io.ebean.annotation.WhoModified;
+import io.ebean.annotation.*;
import io.ebean.config.EncryptDeploy;
import io.ebean.config.EncryptDeploy.Mode;
import io.ebean.config.dbplatform.DbEncrypt;
@@ -51,24 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesBase;
import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted;
import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.PersistenceException;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import javax.persistence.*;
import java.sql.Types;
import java.util.Set;
import java.util.UUID;
@@ -339,10 +291,10 @@ final class AnnotationFields extends AnnotationParser {
}
private void initWhen(DeployBeanProperty prop) {
- if (has(prop, WhenCreated.class) || has(prop, CreatedTimestamp.class)) {
+ if (has(prop, WhenCreated.class)) {
generatedPropFactory.setInsertTimestamp(prop);
}
- if (has(prop, WhenModified.class) || has(prop, UpdatedTimestamp.class)) {
+ if (has(prop, WhenModified.class)) {
generatedPropFactory.setUpdateTimestamp(prop);
}
}
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 4e4fc1039..1f6b18df5 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
@@ -1196,11 +1196,6 @@ public final class DefaultPersister implements Persister {
return request;
}
- private String errNotRegistered(Class beanClass) {
- return "The type [" + beanClass + "] is not a registered entity?"
- + " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
- }
-
/**
* Return the BeanDescriptor for a bean that is being persisted.
*
@@ -1210,10 +1205,6 @@ public final class DefaultPersister implements Persister {
*/
@SuppressWarnings("unchecked")
private BeanManager beanManager(Class cls) {
- BeanManager mgr = (BeanManager) beanDescriptorManager.beanManager(cls);
- if (mgr == null) {
- throw new PersistenceException(errNotRegistered(cls));
- }
- return mgr;
+ return (BeanManager) beanDescriptorManager.beanManager(cls);
}
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
index ba74a5e65..962c6ce22 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
@@ -48,7 +48,6 @@ final class DCountMetric implements CountMetric {
@Override
public void visit(MetricVisitor visitor) {
-
long val = visitor.reset() ? count.sumThenReset() : count.sum();
if (val > 0) {
visitor.visitCount(new DCountMetricStats(name, val));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 8011cc1b5..da8caf0b1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -251,11 +251,6 @@ final class DefaultFetchGroupQuery implements SpiFetchGroupQuery, SpiQuery
throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
}
- @Override
- public Stream findLargeStream() {
- throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
- }
-
@Override
public void findEach(Consumer consumer) {
throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
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 307b2713c..6aa0f9a6a 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
@@ -1456,11 +1456,6 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery<
return server.findStream(this, transaction);
}
- @Override
- public Stream findLargeStream() {
- return server.findLargeStream(this, transaction);
- }
-
@Override
public List> findVersions() {
this.temporalMode = TemporalMode.VERSIONS;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index 69c8dbb7a..a68bb5d2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -10,7 +10,6 @@ import io.ebeaninternal.api.BindParams;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.api.SpiSqlQuery;
-import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
@@ -56,36 +55,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
return server.findList(this, null);
}
- @Override
- public BigDecimal findSingleDecimal() {
- return server.findSingleAttribute(this, BigDecimal.class);
- }
-
- @Override
- public Long findSingleLong() {
- return server.findSingleAttribute(this, Long.class);
- }
-
- @Override
- public T findSingleAttribute(Class cls) {
- return server.findSingleAttribute(this, cls);
- }
-
- @Override
- public List findSingleAttributeList(Class cls) {
- return server.findSingleAttributeList(this, cls);
- }
-
- @Override
- public T findOne(RowMapper mapper) {
- return server.findOneMapper(this, mapper);
- }
-
- @Override
- public List findList(RowMapper mapper) {
- return server.findListMapper(this, mapper);
- }
-
@Override
public void findEachRow(RowConsumer consumer) {
server.findEachRow(this, consumer);
@@ -101,12 +70,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
return Optional.ofNullable(findOne());
}
- @Override
- @Deprecated
- public DefaultRelationalQuery setParams(Object... values) {
- return setParameters(values);
- }
-
@Override
public DefaultRelationalQuery setParameters(Object... values) {
bindParams.setNextParameters(values);
@@ -119,6 +82,18 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
return this;
}
+ @Override
+ public SqlQuery setNullParameter(int position, int jdbcType) {
+ bindParams.setNullParameter(position, jdbcType);
+ return this;
+ }
+
+ @Override
+ public SqlQuery setNullParameter(String name, int jdbcType) {
+ bindParams.setNullParameter(name, jdbcType);
+ return this;
+ }
+
@Override
public DefaultRelationalQuery setParameter(int position, Object value) {
bindParams.setParameter(position, value);
@@ -225,6 +200,14 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
return new Mapper(mapper);
}
+ private T findSingleAttribute(Class cls) {
+ return server.findSingleAttribute(this, cls);
+ }
+
+ private List findSingleAttributeList(Class cls) {
+ return server.findSingleAttributeList(this, cls);
+ }
+
private class Scalar implements SqlQuery.TypeQuery {
private final Class type;
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 aac9075e7..83b04cb6d 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
@@ -224,7 +224,8 @@ public final class DJsonContext implements SpiJsonContext {
List list = new ArrayList<>();
do {
- T bean = desc.jsonRead(readJson, null, null); // FIXME: Should we update the list
+ // CHECKME: Should we update the list
+ T bean = desc.jsonRead(readJson, null, null);
if (bean == null) {
break;
} else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java
index b95f035e1..da100b546 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java
@@ -16,7 +16,6 @@ public interface DataSourceSupplier {
* Return the DataSource to use for the current request.
*
* This should take into account multi-tenancy and the current tenantId.
- *
* This can return null meaning that no read only DataSource (with autoCommit)
* is available for use so normal transactions with explicit commit should be used.
- *