diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 06f6bd315..08c584231 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -440,14 +440,6 @@ public interface Transaction extends AutoCloseable { */ void setGetGeneratedKeys(boolean getGeneratedKeys); - /** - * Deprecated renamed to setGetGeneratedKeys(). - */ - @Deprecated - default void setBatchGetGeneratedKeys(boolean getGeneratedKeys) { - setGetGeneratedKeys(getGeneratedKeys); - } - /** * By default when mixing UpdateSql (or CallableSql) with Beans the batch is * automatically flushed when you change (between persisting beans and @@ -463,14 +455,6 @@ public interface Transaction extends AutoCloseable { */ void setFlushOnMixed(boolean batchFlushOnMixed); - /** - * Deprecated renamed to setFlushOnMixed(). - */ - @Deprecated - default void setBatchFlushOnMixed(boolean batchFlushOnMixed) { - setFlushOnMixed(batchFlushOnMixed); - } - /** * By default executing a query will automatically flush any batched * statements (persisted beans, executed UpdateSql etc). @@ -480,14 +464,6 @@ public interface Transaction extends AutoCloseable { */ void setFlushOnQuery(boolean batchFlushOnQuery); - /** - * Deprecated renamed to setFlushOnQuery(). - */ - @Deprecated - default void setBatchFlushOnQuery(boolean batchFlushOnQuery) { - setFlushOnQuery(batchFlushOnQuery); - } - /** * Return true if the batch (of persisted beans or executed UpdateSql etc) * should be flushed prior to executing a query. @@ -496,14 +472,6 @@ public interface Transaction extends AutoCloseable { */ boolean isFlushOnQuery(); - /** - * Deprecated renamed to isFlushOnQuery(). - */ - @Deprecated - default boolean isBatchFlushOnQuery() { - return isFlushOnQuery(); - } - /** * The batch will be flushing automatically but you can use this to explicitly * flush the batch if you like. @@ -519,14 +487,6 @@ public interface Transaction extends AutoCloseable { */ void flush() throws PersistenceException; - /** - * Deprecated - migrate to flush(). - *

- * flush() is preferred as it matches the JPA flush() method. - */ - @Deprecated - void flushBatch() throws PersistenceException; - /** * Return the underlying Connection object. *

@@ -540,14 +500,6 @@ public interface Transaction extends AutoCloseable { */ Connection connection(); - /** - * Deprecated migrate to connection(). - */ - @Deprecated - default Connection getConnection() { - return connection(); - } - /** * Add table modification information to the TransactionEvent. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index c4f81bcab..a46bf033f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -312,11 +312,6 @@ public abstract class SpiTransactionProxy implements SpiTransaction { transaction.flush(); } - @Override - public void flushBatch() throws PersistenceException { - flush(); - } - @Override public Connection connection() { return transaction.connection(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index 316e2f8b8..42f585707 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -378,19 +378,12 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve /** * Flush any queued persist requests. *

- * This is general will result in a number of batched PreparedStatements - * executing. - *

+ * This is general will result in a number of batched PreparedStatements executing. */ @Override public void flush() { } - @Override - public void flushBatch() { - flush(); - } - /** * Return the persistence context associated with this transaction. */ @@ -405,7 +398,6 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve * This could be considered similar to EJB3 Extended PersistanceContext. In * that you get the PersistanceContext from a transaction, hold onto it, and * then set it back later to a second transaction. - *

*/ @Override public void setPersistenceContext(SpiPersistenceContext context) { @@ -503,7 +495,6 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve *

* This leaves the transaction active and expects another commit * to occur later (which closes the underlying connection etc). - *

*/ @Override public void commitAndContinue() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index c85bd2c5d..4fb74db18 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -758,11 +758,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { internalBatchFlush(); } - @Override - public final void flushBatch() { - flush(); - } - /** * Flush the JDBC batch and execute derived relationship statements if necessary. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 9c043dfe9..529a7ca0a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -283,10 +283,6 @@ final class NoTransaction implements SpiTransaction { public void flush() throws PersistenceException { } - @Override - public void flushBatch() throws PersistenceException { - } - @Override public Connection connection() { return null;