From cf825f7ac40ea1b1a88a8a1b03ddac0ba24ce3f3 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 7 Mar 2016 19:15:08 +1300 Subject: [PATCH] #589 - ElasticSearch, Transaction - rename DocStoreMode and batch size methods --- .../java/com/avaje/ebean/Transaction.java | 4 ++-- .../avaje/ebean/config/DocStoreConfig.java | 2 +- .../ebeaninternal/api/ScopedTransaction.java | 16 +++++++-------- .../ebeaninternal/api/SpiTransaction.java | 4 ++-- .../server/core/PersistRequestBean.java | 4 ++-- .../server/transaction/JdbcTransaction.java | 20 +++++++++---------- .../transaction/PostCommitProcessing.java | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Transaction.java b/src/main/java/com/avaje/ebean/Transaction.java index 968f8a9e0..8be8ee2bf 100644 --- a/src/main/java/com/avaje/ebean/Transaction.java +++ b/src/main/java/com/avaje/ebean/Transaction.java @@ -92,7 +92,7 @@ public interface Transaction extends Closeable { * to control how that is sent to the document store. *

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

*/ - void setDocStoreUpdateBatchSize(int batchSize); + void setDocStoreBatchSize(int batchSize); /** * Explicitly turn off or on the cascading nature of save() and delete(). This diff --git a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java index a9e4b9b2a..36a7f7b05 100644 --- a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java +++ b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java @@ -110,7 +110,7 @@ public class DocStoreConfig { /** * Set the default batch size to use for calls to the Bulk API. *

- * The batch size can be set on a transaction via {@link com.avaje.ebean.Transaction#setDocStoreUpdateBatchSize(int)}. + * The batch size can be set on a transaction via {@link com.avaje.ebean.Transaction#setDocStoreBatchSize(int)}. *

*/ public void setBulkBatchSize(int bulkBatchSize) { diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java index 5a897be39..176227b7b 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java @@ -61,23 +61,23 @@ public class ScopedTransaction implements SpiTransaction { } @Override - public DocStoreMode getDocStoreUpdateMode() { - return transaction.getDocStoreUpdateMode(); + public DocStoreMode getDocStoreMode() { + return transaction.getDocStoreMode(); } @Override - public void setDocStoreUpdateMode(DocStoreMode mode) { - transaction.setDocStoreUpdateMode(mode); + public void setDocStoreMode(DocStoreMode mode) { + transaction.setDocStoreMode(mode); } @Override - public int getDocStoreBulkBatchSize() { - return transaction.getDocStoreBulkBatchSize(); + public int getDocStoreBatchSize() { + return transaction.getDocStoreBatchSize(); } @Override - public void setDocStoreUpdateBatchSize(int batchSize) { - transaction.setDocStoreUpdateBatchSize(batchSize); + public void setDocStoreBatchSize(int batchSize) { + transaction.setDocStoreBatchSize(batchSize); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java index 88d7d6567..cb8ccc1d2 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java @@ -109,13 +109,13 @@ public interface SpiTransaction extends Transaction { * Returning 0 implies to use the system wide default batch size. *

*/ - DocStoreMode getDocStoreUpdateMode(); + DocStoreMode getDocStoreMode(); /** * Return the batch size to us for ElasticSearch Bulk API calls * as a result of this transaction. */ - int getDocStoreBulkBatchSize(); + int getDocStoreBatchSize(); /** * Return the batchSize specifically set for this transaction or 0. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java index fa345cf40..11a16db0b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java @@ -176,8 +176,8 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * don't want to send to the doc store. */ private DocStoreMode calcDocStoreEvent(SpiTransaction txn, Type type) { - DocStoreMode docStoreMode = (txn == null) ? null : txn.getDocStoreUpdateMode(); - return beanDescriptor.getDocStoreMode(type, docStoreMode); + DocStoreMode txnMode = (txn == null) ? null : txn.getDocStoreMode(); + return beanDescriptor.getDocStoreMode(type, txnMode); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java index 68905e532..8f6676a46 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java @@ -147,9 +147,9 @@ public class JdbcTransaction implements SpiTransaction { * The mode for updating doc store indexes for this transaction. * Only set when you want to override the default behavior. */ - protected DocStoreMode docStoreUpdateMode; + protected DocStoreMode docStoreMode; - protected int docStoreBulkBatchSize; + protected int docStoreBatchSize; /** * Create a new JdbcTransaction. @@ -282,22 +282,22 @@ public class JdbcTransaction implements SpiTransaction { } @Override - public int getDocStoreBulkBatchSize() { - return docStoreBulkBatchSize; + public int getDocStoreBatchSize() { + return docStoreBatchSize; } @Override - public void setDocStoreUpdateBatchSize(int docStoreBulkBatchSize) { - this.docStoreBulkBatchSize = docStoreBulkBatchSize; + public void setDocStoreBatchSize(int docStoreBatchSize) { + this.docStoreBatchSize = docStoreBatchSize; } - public DocStoreMode getDocStoreUpdateMode() { - return docStoreUpdateMode; + public DocStoreMode getDocStoreMode() { + return docStoreMode; } @Override - public void setDocStoreUpdateMode(DocStoreMode docStoreUpdateMode) { - this.docStoreUpdateMode = docStoreUpdateMode; + public void setDocStoreMode(DocStoreMode docStoreMode) { + this.docStoreMode = docStoreMode; } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java index a9819d0fb..be337e85f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java @@ -69,8 +69,8 @@ public final class PostCommitProcessing { this.clusterManager = clusterManager; this.manager = manager; this.serverName = manager.getServerName(); - this.txnDocStoreMode = transaction.getDocStoreUpdateMode(); - this.txnDocStoreBatchSize = transaction.getDocStoreBulkBatchSize(); + this.txnDocStoreMode = transaction.getDocStoreMode(); + this.txnDocStoreBatchSize = transaction.getDocStoreBatchSize(); this.event = transaction.getEvent(); this.deleteByIdMap = event.getDeleteByIdMap(); this.persistBeanRequests = event.getPersistRequestBeans();