From ffb292dcd5507711ea8c3ded2f2498bbb8266e81 Mon Sep 17 00:00:00 2001
From: Rob Bygrave
- * 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 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;