diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java index b629c24f9..743fcc138 100644 --- a/src/main/java/io/ebean/Transaction.java +++ b/src/main/java/io/ebean/Transaction.java @@ -57,7 +57,7 @@ public interface Transaction extends AutoCloseable { /** * Register a TransactionCallback with this transaction. */ - Transaction register(TransactionCallback callback); + void register(TransactionCallback callback); /** * Set a label on the transaction. @@ -65,7 +65,7 @@ public interface Transaction extends AutoCloseable { * This label is used to group transaction execution times for performance metrics reporting. *

*/ - Transaction setLabel(String label); + void setLabel(String label); /** * Return true if this transaction is read only. @@ -75,7 +75,7 @@ public interface Transaction extends AutoCloseable { /** * Set whether this transaction should be readOnly. */ - Transaction setReadOnly(boolean readOnly); + void setReadOnly(boolean readOnly); /** * Commits the transaction at this point with the expectation that another @@ -139,7 +139,7 @@ public interface Transaction extends AutoCloseable { /** * Mark the transaction for rollback only. */ - Transaction setRollbackOnly(); + void setRollbackOnly(); /** * Return true if the transaction is marked as rollback only. @@ -172,7 +172,7 @@ public interface Transaction extends AutoCloseable { * to control how that is sent to the document store. *

*/ - Transaction setDocStoreMode(DocStoreMode mode); + void setDocStoreMode(DocStoreMode mode); /** * Set the batch size to use for sending messages to the document store. @@ -184,7 +184,7 @@ public interface Transaction extends AutoCloseable { * Setting this overrides the default of {@link DocStoreConfig#getBulkBatchSize()} *

*/ - Transaction setDocStoreBatchSize(int batchSize); + void setDocStoreBatchSize(int batchSize); /** * Explicitly turn off or on the cascading nature of save() and delete(). This @@ -199,7 +199,7 @@ public interface Transaction extends AutoCloseable { * that do not support getGeneratedKeys. *

*/ - Transaction setPersistCascade(boolean persistCascade); + void setPersistCascade(boolean persistCascade); /** * Set to true when you want all loaded properties to be included in the update @@ -210,7 +210,7 @@ public interface Transaction extends AutoCloseable { * and hence better JDBC batch performance. *

*/ - Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties); + void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties); /** * Set if the L2 cache should be skipped for "find by id" and "find by natural key" queries. @@ -269,7 +269,7 @@ public interface Transaction extends AutoCloseable { * * @see ServerConfig#isSkipCacheAfterWrite() */ - Transaction setSkipCache(boolean skipCache); + void setSkipCache(boolean skipCache); /** * Return true if the L2 cache should be skipped. More accurately if true then find by id @@ -344,7 +344,7 @@ public interface Transaction extends AutoCloseable { * * } */ - Transaction setBatchMode(boolean useBatch); + void setBatchMode(boolean useBatch); /** * The JDBC batch mode to use for this transaction. @@ -356,7 +356,7 @@ public interface Transaction extends AutoCloseable { * @param persistBatchMode the batch mode to use for this transaction * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch) */ - Transaction setBatch(PersistBatch persistBatchMode); + void setBatch(PersistBatch persistBatchMode); /** * Return the batch mode at the transaction level. @@ -377,7 +377,7 @@ public interface Transaction extends AutoCloseable { * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete() * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch) */ - Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode); + void setBatchOnCascade(PersistBatch batchOnCascadeMode); /** * Return the batch mode at the request level (for each save(), insert(), update() or delete()). @@ -387,7 +387,7 @@ public interface Transaction extends AutoCloseable { /** * Specify the number of statements before a batch is flushed automatically. */ - Transaction setBatchSize(int batchSize); + void setBatchSize(int batchSize); /** * Return the current batch size. @@ -405,7 +405,7 @@ public interface Transaction extends AutoCloseable { * number of objects and you don't care about getting back the ids. *

*/ - Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys); + void setBatchGetGeneratedKeys(boolean getGeneratedKeys); /** * By default when mixing UpdateSql (or CallableSql) with Beans the batch is @@ -422,7 +422,7 @@ public interface Transaction extends AutoCloseable { * have a 2 step process (delayed binding). *

*/ - Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed); + void setBatchFlushOnMixed(boolean batchFlushOnMixed); /** * By default executing a query will automatically flush any batched @@ -432,7 +432,7 @@ public interface Transaction extends AutoCloseable { * execute a query and the batch will not be automatically flushed. *

*/ - Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery); + void setBatchFlushOnQuery(boolean batchFlushOnQuery); /** * Return true if the batch (of persisted beans or executed UpdateSql etc) @@ -498,14 +498,14 @@ public interface Transaction extends AutoCloseable { * caches in synch and maintain text indexes. *

*/ - Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes); + void addModification(String tableName, boolean inserts, boolean updates, boolean deletes); /** * Add an arbitrary user object to the transaction. The objects added have no * impact on any internals of ebean and are solely meant as a convenient * method push user information (although somewhat replaced by TransactionCallback). */ - Transaction putUserObject(String name, Object value); + void putUserObject(String name, Object value); /** * Get an object added with {@link #putUserObject(String, Object)}. diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 17f4fae57..9ecd6a3b7 100644 --- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -1,6 +1,5 @@ package io.ebeaninternal.api; -import io.ebean.Transaction; import io.ebeaninternal.server.transaction.TransactionScopeManager; import io.ebeaninternal.server.util.ArrayStack; @@ -94,9 +93,8 @@ public class ScopedTransaction extends SpiTransactionProxy { } @Override - public Transaction setRollbackOnly() { + public void setRollbackOnly() { current.setRollbackOnly(); - return this; } /** diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index 7c7b1e317..b9907aa3a 100644 --- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -1,7 +1,6 @@ package io.ebeaninternal.api; import io.ebean.ProfileLocation; -import io.ebean.Transaction; import io.ebean.TransactionCallback; import io.ebean.annotation.DocStoreMode; import io.ebean.annotation.PersistBatch; @@ -32,9 +31,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setLabel(String label) { + public void setLabel(String label) { transaction.setLabel(label); - return this; } @Override @@ -103,9 +101,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setDocStoreMode(DocStoreMode mode) { + public void setDocStoreMode(DocStoreMode mode) { transaction.setDocStoreMode(mode); - return this; } @Override @@ -114,9 +111,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setDocStoreBatchSize(int batchSize) { + public void setDocStoreBatchSize(int batchSize) { transaction.setDocStoreBatchSize(batchSize); - return this; } @Override @@ -145,9 +141,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setSkipCache(boolean skipCache) { + public void setSkipCache(boolean skipCache) { transaction.setSkipCache(skipCache); - return this; } @Override @@ -201,9 +196,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction register(TransactionCallback callback) { + public void register(TransactionCallback callback) { transaction.register(callback); - return this; } @Override @@ -212,9 +206,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setReadOnly(boolean readOnly) { + public void setReadOnly(boolean readOnly) { transaction.setReadOnly(readOnly); - return this; } @Override @@ -223,15 +216,13 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setPersistCascade(boolean persistCascade) { + public void setPersistCascade(boolean persistCascade) { transaction.setPersistCascade(persistCascade); - return this; } @Override - public Transaction setUpdateAllLoadedProperties(boolean updateAllLoaded) { + public void setUpdateAllLoadedProperties(boolean updateAllLoaded) { transaction.setUpdateAllLoadedProperties(updateAllLoaded); - return this; } @Override @@ -240,15 +231,13 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setBatchMode(boolean useBatch) { + public void setBatchMode(boolean useBatch) { transaction.setBatchMode(useBatch); - return this; } @Override - public Transaction setBatch(PersistBatch persistBatchMode) { + public void setBatch(PersistBatch persistBatchMode) { transaction.setBatch(persistBatchMode); - return this; } @Override @@ -257,9 +246,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) { + public void setBatchOnCascade(PersistBatch batchOnCascadeMode) { transaction.setBatchOnCascade(batchOnCascadeMode); - return this; } @Override @@ -268,9 +256,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setBatchSize(int batchSize) { + public void setBatchSize(int batchSize) { transaction.setBatchSize(batchSize); - return this; } @Override @@ -279,9 +266,8 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) { + public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) { transaction.setBatchGetGeneratedKeys(getGeneratedKeys); - return this; } @Override @@ -290,15 +276,13 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) { + public void setBatchFlushOnMixed(boolean batchFlushOnMixed) { transaction.setBatchFlushOnMixed(batchFlushOnMixed); - return this; } @Override - public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) { + public void setBatchFlushOnQuery(boolean batchFlushOnQuery) { transaction.setBatchFlushOnQuery(batchFlushOnQuery); - return this; } @Override @@ -322,15 +306,13 @@ abstract class SpiTransactionProxy implements SpiTransaction { } @Override - public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { + public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { transaction.addModification(tableName, inserts, updates, deletes); - return this; } @Override - public Transaction putUserObject(String name, Object value) { + public void putUserObject(String name, Object value) { transaction.putUserObject(name, value); - return this; } @Override diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java index dbf1ce00d..4bb23735e 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java @@ -1,7 +1,5 @@ package io.ebeaninternal.server.transaction; -import io.ebean.Transaction; - import java.sql.Connection; import java.sql.SQLException; @@ -23,9 +21,8 @@ public class DocStoreOnlyTransaction extends JdbcTransaction { } @Override - public Transaction setReadOnly(boolean readOnly) { + public void setReadOnly(boolean readOnly) { // do nothing - return this; } @Override diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index 6f39932bc..0e95880cb 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.transaction; import io.ebean.ProfileLocation; -import io.ebean.Transaction; import io.ebean.TransactionCallback; import io.ebean.annotation.DocStoreMode; import io.ebean.annotation.PersistBatch; @@ -86,9 +85,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setLabel(String label) { + public void setLabel(String label) { // do nothing - return this; } @Override @@ -132,8 +130,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setSkipCache(boolean skipCache) { - return this; + public void setSkipCache(boolean skipCache) { } @Override @@ -152,7 +149,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction register(TransactionCallback callback) { + public void register(TransactionCallback callback) { throw new IllegalStateException(notExpectedMessage); } @@ -162,7 +159,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setDocStoreBatchSize(int docStoreBatchSize) { + public void setDocStoreBatchSize(int docStoreBatchSize) { throw new IllegalStateException(notExpectedMessage); } @@ -172,7 +169,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setDocStoreMode(DocStoreMode docStoreMode) { + public void setDocStoreMode(DocStoreMode docStoreMode) { throw new IllegalStateException(notExpectedMessage); } @@ -247,21 +244,19 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setReadOnly(boolean readOnly) { + public void setReadOnly(boolean readOnly) { if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } try { connection.setReadOnly(readOnly); - return this; } catch (SQLException e) { throw new PersistenceException(e); } } @Override - public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { - return this; + public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { } @Override @@ -270,13 +265,13 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setBatchMode(boolean batchMode) { - return this; + public void setBatchMode(boolean batchMode) { + } @Override - public Transaction setBatch(PersistBatch batchMode) { - return this; + public void setBatch(PersistBatch batchMode) { + } @Override @@ -285,8 +280,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) { - return this; + public void setBatchOnCascade(PersistBatch batchOnCascadeMode) { } @Override @@ -300,13 +294,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) { - return this; + public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) { } @Override - public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) { - return this; + public void setBatchFlushOnMixed(boolean batchFlushOnMixed) { } /** @@ -321,8 +313,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setBatchSize(int batchSize) { - return this; + public void setBatchSize(int batchSize) { } @Override @@ -331,8 +322,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) { - return this; + public void setBatchFlushOnQuery(boolean batchFlushOnQuery) { } /** @@ -546,7 +536,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode * Mark the transaction as rollback only. */ @Override - public Transaction setRollbackOnly() { + public void setRollbackOnly() { // expect AutoCommit so we can't really support rollbackOnly throw new IllegalStateException(notExpectedMessage); } @@ -596,12 +586,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction setPersistCascade(boolean persistCascade) { - return this; + public void setPersistCascade(boolean persistCascade) { } @Override - public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { + public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { throw new IllegalStateException(notExpectedMessage); } @@ -611,12 +600,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode } @Override - public Transaction putUserObject(String name, Object value) { + public void putUserObject(String name, Object value) { if (userObjects == null) { userObjects = new HashMap<>(); } userObjects.put(name, value); - return this; } @Override diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index d0b60fea9..322f70725 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.transaction; import io.ebean.ProfileLocation; -import io.ebean.Transaction; import io.ebean.TransactionCallback; import io.ebean.annotation.DocStoreMode; import io.ebean.annotation.PersistBatch; @@ -218,9 +217,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setLabel(String label) { + public void setLabel(String label) { this.label = label; - return this; } @Override @@ -290,9 +288,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setSkipCache(boolean skipCache) { + public void setSkipCache(boolean skipCache) { this.skipCache = skipCache; - return this; } @Override @@ -321,12 +318,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction register(TransactionCallback callback) { + public void register(TransactionCallback callback) { if (callbackList == null) { callbackList = new ArrayList<>(4); } callbackList.add(callback); - return this; } protected void firePreRollback() { @@ -389,9 +385,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setDocStoreBatchSize(int docStoreBatchSize) { + public void setDocStoreBatchSize(int docStoreBatchSize) { this.docStoreBatchSize = docStoreBatchSize; - return this; } @Override @@ -400,9 +395,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setDocStoreMode(DocStoreMode docStoreMode) { + public void setDocStoreMode(DocStoreMode docStoreMode) { this.docStoreMode = docStoreMode; - return this; } @Override @@ -535,23 +529,21 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setReadOnly(boolean readOnly) { + public void setReadOnly(boolean readOnly) { if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } try { localReadOnly = readOnly; connection.setReadOnly(readOnly); - return this; } catch (SQLException e) { throw new PersistenceException(e); } } @Override - public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { + public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { this.updateAllLoadedProperties = updateAllLoadedProperties; - return this; } @Override @@ -560,21 +552,19 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setBatchMode(boolean batchMode) { + public void setBatchMode(boolean batchMode) { if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } this.batchMode = (batchMode) ? PersistBatch.ALL : PersistBatch.NONE; - return this; } @Override - public Transaction setBatch(PersistBatch batchMode) { + public void setBatch(PersistBatch batchMode) { if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } this.batchMode = batchMode; - return this; } @Override @@ -583,12 +573,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) { + public void setBatchOnCascade(PersistBatch batchOnCascadeMode) { if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } this.batchOnCascadeMode = batchOnCascadeMode; - return this; } @Override @@ -602,21 +591,19 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) { + public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) { this.batchGetGeneratedKeys = getGeneratedKeys; if (batchControl != null) { batchControl.setGetGeneratedKeys(getGeneratedKeys); } - return this; } @Override - public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) { + public void setBatchFlushOnMixed(boolean batchFlushOnMixed) { this.batchFlushOnMixed = batchFlushOnMixed; if (batchControl != null) { batchControl.setBatchFlushOnMixed(batchFlushOnMixed); } - return this; } /** @@ -631,12 +618,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setBatchSize(int batchSize) { + public void setBatchSize(int batchSize) { this.batchSize = batchSize; if (batchControl != null) { batchControl.setBatchSize(batchSize); } - return this; } @Override @@ -645,9 +631,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) { + public void setBatchFlushOnQuery(boolean batchFlushOnQuery) { this.batchFlushOnQuery = batchFlushOnQuery; - return this; } /** @@ -1128,9 +1113,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { * Mark the transaction as rollback only. */ @Override - public Transaction setRollbackOnly() { + public void setRollbackOnly() { this.rollbackOnly = true; - return this; } /** @@ -1198,15 +1182,13 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction setPersistCascade(boolean persistCascade) { + public void setPersistCascade(boolean persistCascade) { this.persistCascade = persistCascade; - return this; } @Override - public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { + public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { getEvent().add(tableName, inserts, updates, deletes); - return this; } @Override @@ -1219,12 +1201,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { } @Override - public Transaction putUserObject(String name, Object value) { + public void putUserObject(String name, Object value) { if (userObjects == null) { userObjects = new HashMap<>(); } userObjects.put(name, value); - return this; } @Override diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 73c6eb930..9ee156066 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.transaction; import io.ebean.ProfileLocation; -import io.ebean.Transaction; import io.ebean.TransactionCallback; import io.ebean.annotation.DocStoreMode; import io.ebean.annotation.PersistBatch; @@ -29,8 +28,8 @@ class NoTransaction implements SpiTransaction { static final NoTransaction INSTANCE = new NoTransaction(); @Override - public Transaction setLabel(String label) { - return this; + public void setLabel(String label) { + // do nothing } @Override @@ -151,8 +150,8 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction register(TransactionCallback callback) { - return this; + public void register(TransactionCallback callback) { + } @Override @@ -161,13 +160,13 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction setReadOnly(boolean readOnly) { - return this; + public void setReadOnly(boolean readOnly) { + } @Override - public Transaction setRollbackOnly() { - return this; + public void setRollbackOnly() { + } @Override @@ -177,28 +176,28 @@ class NoTransaction implements SpiTransaction { @Override - public Transaction setDocStoreMode(DocStoreMode mode) { - return this; + public void setDocStoreMode(DocStoreMode mode) { + } @Override - public Transaction setDocStoreBatchSize(int batchSize) { - return this; + public void setDocStoreBatchSize(int batchSize) { + } @Override - public Transaction setPersistCascade(boolean persistCascade) { - return this; + public void setPersistCascade(boolean persistCascade) { + } @Override - public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { - return this; + public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { + } @Override - public Transaction setSkipCache(boolean skipCache) { - return this; + public void setSkipCache(boolean skipCache) { + } @Override @@ -207,13 +206,13 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction setBatchMode(boolean useBatch) { - return this; + public void setBatchMode(boolean useBatch) { + } @Override - public Transaction setBatch(PersistBatch persistBatchMode) { - return this; + public void setBatch(PersistBatch persistBatchMode) { + } @Override @@ -222,8 +221,8 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) { - return this; + public void setBatchOnCascade(PersistBatch batchOnCascadeMode) { + } @Override @@ -232,8 +231,8 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction setBatchSize(int batchSize) { - return this; + public void setBatchSize(int batchSize) { + } @Override @@ -242,18 +241,18 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) { - return this; + public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) { + } @Override - public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) { - return this; + public void setBatchFlushOnMixed(boolean batchFlushOnMixed) { + } @Override - public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) { - return this; + public void setBatchFlushOnQuery(boolean batchFlushOnQuery) { + } @Override @@ -277,13 +276,13 @@ class NoTransaction implements SpiTransaction { } @Override - public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { - return this; + public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { + } @Override - public Transaction putUserObject(String name, Object value) { - return this; + public void putUserObject(String name, Object value) { + } @Override diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 7b5d61ce4..7046d8c64 100644 --- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -34,10 +34,10 @@ public class TestBatchInsertFlush extends BaseTestCase { Transaction transaction = server.beginTransaction(); try { - transaction.setPersistCascade(false) - .setBatchSize(10) - .setBatch(PersistBatch.ALL) - .setLabel("TestBatchInsertFlush.no_cascade"); + transaction.setPersistCascade(false); + transaction.setBatchSize(10); + transaction.setBatch(PersistBatch.ALL); + transaction.setLabel("TestBatchInsertFlush.no_cascade"); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index e73842925..0b90b4ffa 100644 --- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -130,9 +130,9 @@ public class TestBatchInsertSimple extends BaseTestCase { Transaction transaction = Ebean.beginTransaction(); try { - transaction.setBatch(PersistBatch.NONE) - .setBatchOnCascade(PersistBatch.ALL) - .setBatchSize(20); + transaction.setBatch(PersistBatch.NONE); + transaction.setBatchOnCascade(PersistBatch.ALL); + transaction.setBatchSize(20); // escalate based on batchOnCascade value Ebean.saveAll(masters); diff --git a/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/src/test/java/org/tests/transaction/TestSqlServerBatch.java index e2a716ef6..6b463236b 100644 --- a/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -24,7 +24,8 @@ public class TestSqlServerBatch extends BaseTestCase { Transaction txn = Ebean.beginTransaction(); try { - txn.setBatchMode(true).setBatchSize(3); + txn.setBatchMode(true); + txn.setBatchSize(3); for (int i = 0; i < 10; i++) { ESimple model = new ESimple();