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 extends PersistRequest implements BeanP private final boolean publish; - private DocStoreEvent docStoreEvent; + private DocStoreMode docStoreMode; private ConcurrencyMode concurrencyMode; @@ -147,7 +147,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP this.parentBean = parentBean; this.controller = beanDescriptor.getPersistController(); this.type = type; - this.docStoreEvent = calcDocStoreEvent(transaction, type); + this.docStoreMode = calcDocStoreEvent(transaction, type); if (saveRecurse) { this.persistCascade = t.isPersistCascade(); } @@ -175,9 +175,9 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Used to check if the Transaction has set the mode to IGNORE when doing large batch inserts that we * don't want to send to the doc store. */ - private DocStoreEvent calcDocStoreEvent(SpiTransaction txn, Type type) { - DocStoreEvent docStoreEvent = (txn == null) ? null : txn.getDocStoreUpdateMode(); - return beanDescriptor.getDocStoreEvent(type, docStoreEvent); + private DocStoreMode calcDocStoreEvent(SpiTransaction txn, Type type) { + DocStoreMode docStoreMode = (txn == null) ? null : txn.getDocStoreUpdateMode(); + return beanDescriptor.getDocStoreMode(type, docStoreMode); } /** @@ -203,7 +203,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP public void initTransIfRequiredWithBatchCascade() { if (createImplicitTransIfRequired()) { - docStoreEvent = calcDocStoreEvent(transaction, type); + docStoreMode = calcDocStoreEvent(transaction, type); } if (transaction.checkBatchEscalationOnCascade(this)) { // we escalated to use batch mode so flush when done @@ -309,7 +309,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ private boolean isDocStoreNotify() { // Either queue or directly update the document store - return docStoreEvent != DocStoreEvent.IGNORE; + return docStoreMode != DocStoreMode.IGNORE; } public boolean isNotifyPersistListener() { @@ -731,7 +731,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP controllerPost(); } - if (type == Type.UPDATE && docStoreEvent == DocStoreEvent.UPDATE) { + if (type == Type.UPDATE && docStoreMode == DocStoreMode.UPDATE) { // get the dirty properties for update notification to the doc store dirtyProperties = intercept.getDirtyProperties(); } @@ -913,7 +913,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP if (type == Type.UPDATE) { beanDescriptor.docStoreUpdateEmbedded(this, docStoreUpdates); } - switch (docStoreEvent) { + switch (docStoreMode) { case UPDATE: { docStoreUpdates.addPersist(this); return; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index 7557f1d80..2aa19e6fe 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -7,7 +7,7 @@ import com.avaje.ebean.SqlUpdate; import com.avaje.ebean.Transaction; 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.BeanCollection; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; @@ -84,7 +84,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -367,7 +366,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { private final DocStoreBeanAdapter docStoreAdapter; private final String defaultSelectClause; - private final LinkedHashSet defaultSelectClauseSet; private SpiEbeanServer ebeanServer; @@ -401,8 +399,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { this.changeLogFilter = deploy.getChangeLogFilter(); this.defaultSelectClause = deploy.getDefaultSelectClause(); - this.defaultSelectClauseSet = deploy.parseDefaultSelectClause(defaultSelectClause); - this.idType = deploy.getIdType(); this.idTypePlatformDefault = deploy.isIdTypePlatformDefault(); this.idGenerator = deploy.getIdGenerator(); @@ -889,13 +885,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return defaultSelectClause; } - /** - * Return the default select clause already parsed into an ordered Set. - */ - public LinkedHashSet getDefaultSelectClauseSet() { - return defaultSelectClauseSet; - } - /** * Return true if this object is the root level object in its entity * inheritance. @@ -929,7 +918,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * Return the doc store helper for this bean type. */ @Override - public BeanDocType docStore() { + public BeanDocType docStore() { return docStoreAdapter; } @@ -956,11 +945,11 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { } /** - * Return the type of DocStoreEvent that should occur for this type of persist request + * Return the type of DocStoreMode that should occur for this type of persist request * given the transactions requested mode. */ - public DocStoreEvent getDocStoreEvent(PersistRequest.Type persistType, DocStoreEvent txnMode) { - return docStoreAdapter.getEvent(persistType, txnMode); + public DocStoreMode getDocStoreMode(PersistRequest.Type persistType, DocStoreMode txnMode) { + return docStoreAdapter.getMode(persistType, txnMode); } public void docStoreInsert(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext bulkUpdate) throws IOException { @@ -1457,6 +1446,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { } @Override + @SuppressWarnings("unchecked") public T createBean() { return (T)createEntityBean(); } @@ -1464,6 +1454,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Creates a new EntityBean. */ + @SuppressWarnings("unchecked") public EntityBean createEntityBean() { try { EntityBean bean = (EntityBean)prototypeEntityBean._ebean_newInstance(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index cbc73a4ab..af34442e8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.deploy.meta; import com.avaje.ebean.annotation.ConcurrencyMode; import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.TableName; import com.avaje.ebean.config.dbplatform.IdGenerator; @@ -34,7 +34,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -187,10 +186,10 @@ public class DeployBeanDescriptor { private String docStoreIndexType; - private DocStoreEvent docStorePersist; - private DocStoreEvent docStoreInsert; - private DocStoreEvent docStoreUpdate; - private DocStoreEvent docStoreDelete; + private DocStoreMode docStorePersist; + private DocStoreMode docStoreInsert; + private DocStoreMode docStoreUpdate; + private DocStoreMode docStoreDelete; /** * Construct the BeanDescriptor. @@ -805,29 +804,6 @@ public class DeployBeanDescriptor { return selectClause.substring(0, selectClause.length() - 1); } - /** - * Parse the include separating by comma or semicolon. - */ - public LinkedHashSet parseDefaultSelectClause(String rawList) { - - if (rawList == null) { - return null; - } - - String[] res = rawList.split(","); - - LinkedHashSet set = new LinkedHashSet(res.length + 3); - - String temp; - for (int i = 0; i < res.length; i++) { - temp = res[i].trim(); - if (temp.length() > 0) { - set.add(temp); - } - } - return set; - } - /** * Return true if the primary key is a compound key or if it's database type * is non-numeric (and hence not suitable for db identity or sequence. @@ -1008,30 +984,30 @@ public class DeployBeanDescriptor { /** * Return the DocStore index behavior for bean inserts. */ - public DocStoreEvent getDocStoreInsertEvent() { + public DocStoreMode getDocStoreInsertEvent() { return getDocStoreIndexEvent(docStoreInsert); } /** * Return the DocStore index behavior for bean updates. */ - public DocStoreEvent getDocStoreUpdateEvent() { + public DocStoreMode getDocStoreUpdateEvent() { return getDocStoreIndexEvent(docStoreUpdate); } /** * Return the DocStore index behavior for bean deletes. */ - public DocStoreEvent getDocStoreDeleteEvent() { + public DocStoreMode getDocStoreDeleteEvent() { return getDocStoreIndexEvent(docStoreDelete); } - private DocStoreEvent getDocStoreIndexEvent(DocStoreEvent mostSpecific) { + private DocStoreMode getDocStoreIndexEvent(DocStoreMode mostSpecific) { if (!docStoreMapped) { - return DocStoreEvent.IGNORE; + return DocStoreMode.IGNORE; } - if (mostSpecific != DocStoreEvent.DEFAULT) return mostSpecific; - if (docStorePersist != DocStoreEvent.DEFAULT) return docStorePersist; + if (mostSpecific != DocStoreMode.DEFAULT) return mostSpecific; + if (docStorePersist != DocStoreMode.DEFAULT) return docStorePersist; return serverConfig.getDocStoreConfig().getPersist(); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java index 1f5fe4e61..69171623f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -9,7 +9,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebeanservice.docstore.api.support.DocStoreDeleteEvent; import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; @@ -79,13 +79,13 @@ public final class DeleteByIdMap { /** * Add the deletes to the DocStoreUpdates. */ - public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates, DocStoreEvent txnIndexMode) { + public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates, DocStoreMode txnIndexMode) { for (BeanPersistIds deleteIds : beanMap.values()) { BeanDescriptor desc = deleteIds.getBeanDescriptor(); - DocStoreEvent docStoreEvent = desc.getDocStoreEvent(PersistRequest.Type.DELETE, txnIndexMode); - if (DocStoreEvent.IGNORE != docStoreEvent) { + DocStoreMode mode = desc.getDocStoreMode(PersistRequest.Type.DELETE, txnIndexMode); + if (DocStoreMode.IGNORE != mode) { // Add to queue or bulk update entries - boolean queue = (DocStoreEvent.QUEUE == docStoreEvent); + boolean queue = (DocStoreMode.QUEUE == mode); String queueId = desc.getDocStoreQueueId(); List idValues = deleteIds.getDeleteIds(); if (idValues != null) { 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 69ddf2d12..68905e532 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.transaction; 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.config.dbplatform.DatabasePlatform.OnQueryOnly; @@ -147,7 +147,7 @@ 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 DocStoreEvent docStoreUpdateMode; + protected DocStoreMode docStoreUpdateMode; protected int docStoreBulkBatchSize; @@ -291,12 +291,12 @@ public class JdbcTransaction implements SpiTransaction { this.docStoreBulkBatchSize = docStoreBulkBatchSize; } - public DocStoreEvent getDocStoreUpdateMode() { + public DocStoreMode getDocStoreUpdateMode() { return docStoreUpdateMode; } @Override - public void setDocStoreUpdateMode(DocStoreEvent docStoreUpdateMode) { + public void setDocStoreUpdateMode(DocStoreMode docStoreUpdateMode) { this.docStoreUpdateMode = docStoreUpdateMode; } 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 faa96529a..a9819d0fb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java @@ -1,6 +1,6 @@ package com.avaje.ebeaninternal.server.transaction; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebeaninternal.api.SpiTransaction; import com.avaje.ebeaninternal.api.TransactionEvent; import com.avaje.ebeaninternal.api.TransactionEventTable; @@ -40,7 +40,7 @@ public final class PostCommitProcessing { private final DeleteByIdMap deleteByIdMap; - private final DocStoreEvent txnDocStoreMode; + private final DocStoreMode txnDocStoreMode; private final int txnDocStoreBatchSize; @@ -52,7 +52,7 @@ public final class PostCommitProcessing { this.clusterManager = clusterManager; this.manager = manager; this.serverName = manager.getServerName(); - this.txnDocStoreMode = DocStoreEvent.IGNORE; + this.txnDocStoreMode = DocStoreMode.IGNORE; this.txnDocStoreBatchSize = 0; this.event = event; this.deleteByIdMap = event.getDeleteByIdMap(); @@ -126,7 +126,7 @@ public final class PostCommitProcessing { * Return true if updates to the document store occur for this transaction. */ private boolean isDocStoreUpdate() { - return manager.isDocStoreActive() && (txnDocStoreMode == null || txnDocStoreMode != DocStoreEvent.IGNORE); + return manager.isDocStoreActive() && (txnDocStoreMode == null || txnDocStoreMode != DocStoreMode.IGNORE); } public void notifyCluster() { diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java index df2d3d473..2e97058ab 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java @@ -1,7 +1,7 @@ package com.avaje.ebeanservice.docstore.api; import com.avaje.ebean.Query; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.plugin.BeanDocType; import com.avaje.ebeaninternal.server.core.PersistRequest; import com.avaje.ebeaninternal.server.core.PersistRequestBean; @@ -47,7 +47,7 @@ public interface DocStoreBeanAdapter extends BeanDocType { *

* 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 implements DocStoreBeanAdapter< /** * Behavior on insert. */ - protected final DocStoreEvent insert; + protected final DocStoreMode insert; /** * Behavior on update. */ - protected final DocStoreEvent update; + protected final DocStoreMode update; /** * Behavior on delete. */ - protected final DocStoreEvent delete; + protected final DocStoreMode delete; /** * List of embedded paths from other documents that include this document type. @@ -267,17 +267,17 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public DocStoreEvent getEvent(PersistRequest.Type persistType, DocStoreEvent txnMode) { + public DocStoreMode getMode(PersistRequest.Type persistType, DocStoreMode txnMode) { if (txnMode == null) { - return getDocStoreEvent(persistType); - } else if (txnMode == DocStoreEvent.IGNORE) { - return DocStoreEvent.IGNORE; + return getMode(persistType); + } else if (txnMode == DocStoreMode.IGNORE) { + return DocStoreMode.IGNORE; } - return mapped ? txnMode : getDocStoreEvent(persistType); + return mapped ? txnMode : getMode(persistType); } - private DocStoreEvent getDocStoreEvent(PersistRequest.Type persistType) { + private DocStoreMode getMode(PersistRequest.Type persistType) { switch (persistType) { case INSERT: return insert; @@ -286,7 +286,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< case DELETE: return delete; default: - return DocStoreEvent.IGNORE; + return DocStoreMode.IGNORE; } } diff --git a/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java b/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java index 72ff5d1b7..48ea8cbb2 100644 --- a/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java +++ b/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java @@ -1,6 +1,6 @@ package com.avaje.ebean.config; -import com.avaje.ebean.annotation.DocStoreEvent; +import com.avaje.ebean.annotation.DocStoreMode; import org.junit.Test; import java.util.Properties; @@ -26,7 +26,7 @@ public class DocStoreConfigTest { assertTrue(config.isActive()); assertEquals("http://foo:9800", config.getUrl()); - assertEquals(DocStoreEvent.IGNORE, config.getPersist()); + assertEquals(DocStoreMode.IGNORE, config.getPersist()); assertEquals(99, config.getBulkBatchSize()); }