diff --git a/src/main/java/com/avaje/ebean/Transaction.java b/src/main/java/com/avaje/ebean/Transaction.java index 549271cbe..968f8a9e0 100644 --- a/src/main/java/com/avaje/ebean/Transaction.java +++ b/src/main/java/com/avaje/ebean/Transaction.java @@ -1,6 +1,6 @@ package com.avaje.ebean; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.config.DocStoreConfig; import com.avaje.ebean.config.PersistBatch; @@ -92,7 +92,7 @@ public interface Transaction extends Closeable { * to control how that is sent to the document store. *
*/ - void setDocStoreUpdateMode(DocStoreEvent updateMode); + void setDocStoreUpdateMode(DocStoreMode updateMode); /** * Set the batch size to use for sending messages to the document store. diff --git a/src/main/java/com/avaje/ebean/annotation/DocStore.java b/src/main/java/com/avaje/ebean/annotation/DocStore.java index 503abfe67..be116b799 100644 --- a/src/main/java/com/avaje/ebean/annotation/DocStore.java +++ b/src/main/java/com/avaje/ebean/annotation/DocStore.java @@ -45,22 +45,22 @@ public @interface DocStore { /** * Specify the behavior when bean Insert, Update, Delete events occur. */ - DocStoreEvent persist() default DocStoreEvent.DEFAULT; + DocStoreMode persist() default DocStoreMode.DEFAULT; /** * Specify the behavior when bean Insert occurs. */ - DocStoreEvent insert() default DocStoreEvent.DEFAULT; + DocStoreMode insert() default DocStoreMode.DEFAULT; /** * Specify the behavior when bean Update occurs. */ - DocStoreEvent update() default DocStoreEvent.DEFAULT; + DocStoreMode update() default DocStoreMode.DEFAULT; /** * Specify the behavior when bean Delete occurs. */ - DocStoreEvent delete() default DocStoreEvent.DEFAULT; + DocStoreMode delete() default DocStoreMode.DEFAULT; /** * Specify to include only some properties in the doc store document. diff --git a/src/main/java/com/avaje/ebean/annotation/DocStoreEvent.java b/src/main/java/com/avaje/ebean/annotation/DocStoreMode.java similarity index 97% rename from src/main/java/com/avaje/ebean/annotation/DocStoreEvent.java rename to src/main/java/com/avaje/ebean/annotation/DocStoreMode.java index dcf8a72c0..b4805ee75 100644 --- a/src/main/java/com/avaje/ebean/annotation/DocStoreEvent.java +++ b/src/main/java/com/avaje/ebean/annotation/DocStoreMode.java @@ -8,7 +8,7 @@ package com.avaje.ebean.annotation; * for later processing rather than look to update ElasticSearch at that time. * */ -public enum DocStoreEvent { +public enum DocStoreMode { /** * Add the event to the queue for processing later (delaying the update to the document store). diff --git a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java index ec23cb2d8..a9e4b9b2a 100644 --- a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java +++ b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java @@ -1,6 +1,6 @@ package com.avaje.ebean.config; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; /** * Configuration for the Document store integration (e.g. ElasticSearch). @@ -25,7 +25,7 @@ public class DocStoreConfig { /** * The default mode used by indexes. */ - protected DocStoreEvent persist = DocStoreEvent.UPDATE; + protected DocStoreMode persist = DocStoreMode.UPDATE; /** * The default batch size to use for the Bulk API calls. @@ -163,7 +163,7 @@ public class DocStoreConfig { * Return the default behavior for when Insert, Update and Delete events occur on beans that have an associated * Document store. */ - public DocStoreEvent getPersist() { + public DocStoreMode getPersist() { return persist; } @@ -185,7 +185,7 @@ public class DocStoreConfig { * you don't want Ebean to do anything when the data changes. * */ - public void setPersist(DocStoreEvent persist) { + public void setPersist(DocStoreMode persist) { this.persist = persist; } @@ -196,7 +196,7 @@ public class DocStoreConfig { active = properties.getBoolean("docstore.active", active); url = properties.get("docstore.url", url); - persist = properties.getEnum(DocStoreEvent.class, "docstore.persist", persist); + persist = properties.getEnum(DocStoreMode.class, "docstore.persist", persist); bulkBatchSize = properties.getInt("docstore.bulkBatchSize", bulkBatchSize); dropCreate = properties.getBoolean("docstore.dropCreate", dropCreate); mappingPath = properties.get("docstore.mappingPath", mappingPath); diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java index cd97cbaf4..5a897be39 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.api; import com.avaje.ebean.TransactionCallback; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.bean.PersistenceContext; import com.avaje.ebean.config.PersistBatch; import com.avaje.ebean.event.changelog.BeanChange; @@ -61,13 +61,13 @@ public class ScopedTransaction implements SpiTransaction { } @Override - public DocStoreEvent getDocStoreUpdateMode() { + public DocStoreMode getDocStoreUpdateMode() { return transaction.getDocStoreUpdateMode(); } @Override - public void setDocStoreUpdateMode(DocStoreEvent indexUpdateMode) { - transaction.setDocStoreUpdateMode(indexUpdateMode); + public void setDocStoreUpdateMode(DocStoreMode mode) { + transaction.setDocStoreUpdateMode(mode); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java index 5be5af0a1..88d7d6567 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java @@ -4,7 +4,7 @@ import java.sql.Connection; import java.util.List; import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.bean.PersistenceContext; import com.avaje.ebean.event.changelog.BeanChange; import com.avaje.ebean.event.changelog.ChangeSet; @@ -109,7 +109,7 @@ public interface SpiTransaction extends Transaction { * Returning 0 implies to use the system wide default batch size. * */ - DocStoreEvent getDocStoreUpdateMode(); + DocStoreMode getDocStoreUpdateMode(); /** * Return the batch size to us for ElasticSearch Bulk API calls 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 f0e3daa07..fa345cf40 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java @@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.core; import com.avaje.ebean.ValuePair; import com.avaje.ebean.annotation.ConcurrencyMode; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.ebean.event.BeanPersistController; @@ -69,7 +69,7 @@ public final class PersistRequestBean
* Some transactions (like bulk updates) might specifically turn off indexing for example.
*/
- DocStoreEvent getEvent(PersistRequest.Type persistType, DocStoreEvent txnMode);
+ DocStoreMode getMode(PersistRequest.Type persistType, DocStoreMode txnMode);
/**
* Return the index type for this bean type.
diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
index 076a3fc98..48de04387 100644
--- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
+++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
@@ -3,7 +3,7 @@ package com.avaje.ebeanservice.docstore.api.support;
import com.avaje.ebean.FetchPath;
import com.avaje.ebean.Query;
import com.avaje.ebean.annotation.DocStore;
-import com.avaje.ebean.annotation.DocStoreEvent;
+import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.text.PathProperties;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.ebeaninternal.server.core.PersistRequest;
@@ -69,17 +69,17 @@ public abstract class DocStoreBeanBaseAdapter