From f0fab77ff7c1b4e43c4bf8315782fe47bbddc483 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 28 Apr 2016 20:26:17 +1200 Subject: [PATCH] #670 - Remove @EntityConcurrencyMode ... this is now rather redundant since 4.x changes --- .../annotation/EntityConcurrencyMode.java | 19 -------------- .../api}/ConcurrencyMode.java | 2 +- .../ebeaninternal/api/SpiUpdatePlan.java | 1 - .../server/core/PersistRequestBean.java | 2 +- .../server/deploy/BeanDescriptor.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 2 +- .../deploy/meta/DeployBeanDescriptor.java | 2 +- .../server/deploy/parse/AnnotationClass.java | 26 +++++++------------ .../server/persist/dml/DeleteMeta.java | 2 +- .../server/persist/dml/UpdateMeta.java | 2 +- .../server/persist/dml/UpdatePlan.java | 2 +- 11 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 src/main/java/com/avaje/ebean/annotation/EntityConcurrencyMode.java rename src/main/java/com/avaje/{ebean/annotation => ebeaninternal/api}/ConcurrencyMode.java (84%) diff --git a/src/main/java/com/avaje/ebean/annotation/EntityConcurrencyMode.java b/src/main/java/com/avaje/ebean/annotation/EntityConcurrencyMode.java deleted file mode 100644 index e389c346a..000000000 --- a/src/main/java/com/avaje/ebean/annotation/EntityConcurrencyMode.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.avaje.ebean.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Specify explicit ConcurrencyMode for entity bean. - */ -@Target({ ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -public @interface EntityConcurrencyMode { - - /** - * The ConcurrencyMode value. - */ - ConcurrencyMode value(); -} diff --git a/src/main/java/com/avaje/ebean/annotation/ConcurrencyMode.java b/src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java similarity index 84% rename from src/main/java/com/avaje/ebean/annotation/ConcurrencyMode.java rename to src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java index 06d5cd7c5..2fc8613f7 100644 --- a/src/main/java/com/avaje/ebean/annotation/ConcurrencyMode.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.annotation; +package com.avaje.ebeaninternal.api; /** * Optimistic concurrency mode used for updates and deletes. diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java b/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java index 7fda11b34..15551602b 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java @@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.api; import java.sql.SQLException; -import com.avaje.ebean.annotation.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.persist.dml.DmlHandler; import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; 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 14969340f..7b63e68cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.core; import com.avaje.ebean.ValuePair; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; 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 056065beb..742e7088d 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.RawSql; import com.avaje.ebean.SqlUpdate; import com.avaje.ebean.Transaction; import com.avaje.ebean.ValuePair; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.bean.BeanCollection; import com.avaje.ebean.bean.EntityBean; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java index c910ba308..a739317c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -4,7 +4,7 @@ import com.avaje.ebean.BackgroundExecutor; import com.avaje.ebean.Model; import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.BeanCollection; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.cache.ServerCacheManager; 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 41da80883..fd1e69f85 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 @@ -1,6 +1,6 @@ package com.avaje.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.annotation.DocStore; import com.avaje.ebean.annotation.DocStoreMode; import com.avaje.ebean.config.ServerConfig; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java index 3c23dac04..ae2a1cd63 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -1,21 +1,11 @@ package com.avaje.ebeaninternal.server.deploy.parse; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - import com.avaje.ebean.annotation.CacheStrategy; import com.avaje.ebean.annotation.CacheTuning; -import com.avaje.ebean.annotation.DocStore; import com.avaje.ebean.annotation.DbComment; +import com.avaje.ebean.annotation.DocStore; import com.avaje.ebean.annotation.Draftable; import com.avaje.ebean.annotation.DraftableElement; -import com.avaje.ebean.annotation.EntityConcurrencyMode; import com.avaje.ebean.annotation.History; import com.avaje.ebean.annotation.Index; import com.avaje.ebean.annotation.NamedUpdate; @@ -33,6 +23,15 @@ import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.AttributeOverride; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Entity; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + /** * Read the class level deployment annotations. */ @@ -208,11 +207,6 @@ public class AnnotationClass extends AnnotationParser { if (cacheStrategy != null || cacheTuning != null) { readCacheStrategy(cacheStrategy, cacheTuning); } - - EntityConcurrencyMode entityConcurrencyMode = cls.getAnnotation(EntityConcurrencyMode.class); - if (entityConcurrencyMode != null) { - descriptor.setConcurrencyMode(entityConcurrencyMode.value()); - } } private void readCacheStrategy(CacheStrategy cacheStrategy, CacheTuning cacheTuning) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java index eafa432a1..8b6684586 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.persist.dml; import java.sql.SQLException; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java index 152b25cbb..073e23d71 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -1,6 +1,6 @@ package com.avaje.ebeaninternal.server.persist.dml; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.api.SpiUpdatePlan; import com.avaje.ebeaninternal.server.core.PersistRequestBean; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java index e2545d094..596a4a5e7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java @@ -1,6 +1,6 @@ package com.avaje.ebeaninternal.server.persist.dml; -import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.api.SpiUpdatePlan; import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable;