github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1552 - Remove deprecated methods on Transaction setBatch(PersistBatch) .. migrate to setBatchMode(boolean)

Browse Source
This commit is contained in:
rob bygrave
2018-11-19 23:36:15 +13:00
parent 6bc72ae6bb
commit 83776a1eae
18 changed files with 51 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebean/Transaction.java
-39
View File
@@ -358,29 +358,6 @@ public interface Transaction extends AutoCloseable {
*/
void setBatchMode(boolean useBatch);
/**
* Deprecated - migrate to {@link #setBatchMode(boolean)}.
* <p>
* Set the JDBC batch mode to use for this transaction.
* </p>
* <p>
* If this is NONE then JDBC batch can still be used for each request - save(), insert(), update() or delete()
* and this would be useful if the request cascades to detail beans.
* </p>
*
* @param persistBatchMode the batch mode to use for this transaction
* @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
*/
@Deprecated
void setBatch(PersistBatch persistBatchMode);
/**
* Deprecated - migrate to {@link #isBatchMode()}.
* Return the batch mode at the transaction level.
*/
@Deprecated
PersistBatch getBatch();
/**
* Return the batch mode at the transaction level.
*/
@@ -405,22 +382,6 @@ public interface Transaction extends AutoCloseable {
*/
void setBatchOnCascade(boolean batchMode);
/**
* Set the batch mode when cascading.
* <p>
* Deprecated in favour of {@link #setBatchOnCascade(boolean)}
* </p>
*/
@Deprecated
void setBatchOnCascade(PersistBatch batchOnCascadeMode);
/**
* Deprecated - migrate to {@link #isBatchMode()}.
* Return the batch mode at the request level (for each save(), insert(), update() or delete()).
*/
@Deprecated
PersistBatch getBatchOnCascade();
/**
* Return the batch mode at the request level.
*/
src/main/java/io/ebean/TxScope.java
+7
View File
@@ -432,4 +432,11 @@ public final class TxScope {
return this;
}
public boolean isBatchMode() {
return PersistBatch.ALL.equals(batch);
}
public boolean isBatchOnCascade() {
return PersistBatch.ALL.equals(batchOnCascade);
}
}
src/main/java/io/ebeaninternal/api/ScopeTrans.java
+7 -8
View File
@@ -1,7 +1,6 @@
package io.ebeaninternal.api;
import io.ebean.TxScope;
import io.ebean.annotation.PersistBatch;
import java.util.ArrayList;
@@ -38,9 +37,9 @@ public class ScopeTrans {
*/
private final ArrayList<Class<? extends Throwable>> rollbackFor;
private PersistBatch restoreBatch;
private Boolean restoreBatch;
private PersistBatch restoreBatchOnCascade;
private Boolean restoreBatchOnCascade;
private int restoreBatchSize;
@@ -68,20 +67,20 @@ public class ScopeTrans {
if (transaction != null) {
if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
restoreBatch = transaction.getBatch();
restoreBatchOnCascade = transaction.getBatchOnCascade();
restoreBatch = transaction.isBatchMode();
restoreBatchOnCascade = transaction.isBatchOnCascade();
restoreBatchSize = transaction.getBatchSize();
restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
restoreBatchFlushOnQuery = transaction.isBatchFlushOnQuery();
}
if (txScope.isBatchSet()) {
transaction.setBatch(txScope.getBatch());
transaction.setBatchMode(txScope.isBatchMode());
}
if (!txScope.isFlushOnQuery()) {
transaction.setBatchFlushOnQuery(false);
}
if (txScope.isBatchOnCascadeSet()) {
transaction.setBatchOnCascade(txScope.getBatchOnCascade());
transaction.setBatchOnCascade(txScope.isBatchOnCascade());
}
if (txScope.isBatchSizeSet()) {
transaction.setBatchSize(txScope.getBatchSize());
@@ -139,7 +138,7 @@ public class ScopeTrans {
nestedCommit = true;
transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
if (restoreBatch != null) {
transaction.setBatch(restoreBatch);
transaction.setBatchMode(restoreBatch);
}
if (restoreBatchOnCascade != null) {
transaction.setBatchOnCascade(restoreBatchOnCascade);
src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
-21
View File
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
import io.ebean.ProfileLocation;
import io.ebean.TransactionCallback;
import io.ebean.annotation.DocStoreMode;
import io.ebean.annotation.PersistBatch;
import io.ebean.bean.PersistenceContext;
import io.ebean.event.changelog.BeanChange;
import io.ebean.event.changelog.ChangeSet;
@@ -254,36 +253,16 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
return transaction.isBatchMode();
}
@Override
public void setBatch(PersistBatch persistBatchMode) {
transaction.setBatch(persistBatchMode);
}
@Override
public PersistBatch getBatch() {
return transaction.getBatch();
}
@Override
public void setBatchOnCascade(boolean batchMode) {
transaction.setBatchOnCascade(batchMode);
}
@Override
public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
transaction.setBatchOnCascade(batchOnCascadeMode);
}
@Override
public boolean isBatchOnCascade() {
return transaction.isBatchOnCascade();
}
@Override
public PersistBatch getBatchOnCascade() {
return transaction.getBatchOnCascade();
}
@Override
public void setBatchSize(int batchSize) {
transaction.setBatchSize(batchSize);
src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
-20
View File
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
import io.ebean.ProfileLocation;
import io.ebean.TransactionCallback;
import io.ebean.annotation.DocStoreMode;
import io.ebean.annotation.PersistBatch;
import io.ebean.bean.PersistenceContext;
import io.ebean.event.changelog.BeanChange;
import io.ebean.event.changelog.ChangeSet;
@@ -291,11 +290,6 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
}
@Override
public void setBatch(PersistBatch batchMode) {
}
@Override
public boolean isBatchMode() {
return false;
@@ -306,24 +300,10 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
return false;
}
@Override
public PersistBatch getBatch() {
return null;
}
@Override
public void setBatchOnCascade(boolean batchMode) {
}
@Override
public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
}
@Override
public PersistBatch getBatchOnCascade() {
return null;
}
@Override
public Boolean getBatchGetGeneratedKeys() {
return null;
src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
-21
View File
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
import io.ebean.ProfileLocation;
import io.ebean.TransactionCallback;
import io.ebean.annotation.DocStoreMode;
import io.ebean.annotation.PersistBatch;
import io.ebean.bean.PersistenceContext;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
@@ -575,21 +574,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
this.batchMode = batchMode;
}
@Override
public void setBatch(PersistBatch batchMode) {
setBatchMode(PersistBatch.ALL == batchMode);
}
@Override
public boolean isBatchMode() {
return batchMode;
}
@Override
public PersistBatch getBatch() {
return batchMode ? PersistBatch.ALL : PersistBatch.NONE;
}
@Override
public void setBatchOnCascade(boolean batchMode) {
if (!isActive()) {
@@ -598,16 +587,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
this.batchOnCascadeMode = batchMode;
}
@Override
public void setBatchOnCascade(PersistBatch batchMode) {
setBatchOnCascade(PersistBatch.ALL == batchMode);
}
@Override
public PersistBatch getBatchOnCascade() {
return batchOnCascadeMode ? PersistBatch.ALL : PersistBatch.NONE;
}
@Override
public boolean isBatchOnCascade() {
return batchOnCascadeMode;
src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
-21
View File
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
import io.ebean.ProfileLocation;
import io.ebean.TransactionCallback;
import io.ebean.annotation.DocStoreMode;
import io.ebean.annotation.PersistBatch;
import io.ebean.bean.PersistenceContext;
import io.ebean.event.changelog.BeanChange;
import io.ebean.event.changelog.ChangeSet;
@@ -225,16 +224,6 @@ class NoTransaction implements SpiTransaction {
}
@Override
public void setBatch(PersistBatch persistBatchMode) {
}
@Override
public PersistBatch getBatch() {
return null;
}
@Override
public boolean isBatchMode() {
return false;
@@ -244,16 +233,6 @@ class NoTransaction implements SpiTransaction {
public void setBatchOnCascade(boolean batchMode) {
}
@Override
public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
}
@Override
public PersistBatch getBatchOnCascade() {
return null;
}
@Override
public boolean isBatchOnCascade() {
return false;