From d16d92db5460d2a0b0291a058dc8d831c4a54184 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 27 Apr 2014 00:57:29 +1200 Subject: [PATCH] Test case and Fix for #67 - Bug - @AttributeOverrides annotation for attribute definition in entity does not work for embedded primary keys --- .../deploy/parse/AnnotationAssocOnes.java | 18 +------ .../server/deploy/parse/AnnotationFields.java | 8 +++ .../server/deploy/parse/AnnotationParser.java | 26 ++++++++++ .../server/persist/dml/UpdateHandler.java | 1 - .../persist/dmlbind/BindableIdEmbedded.java | 2 +- ...aoCompositeKeyWithAnnotationOverrides.java | 26 ++++++++++ .../avaje/tests/compositekeys/db/CaoBean.java | 49 +++++++++++++++++++ .../avaje/tests/compositekeys/db/CaoKey.java | 44 +++++++++++++++++ 8 files changed, 155 insertions(+), 19 deletions(-) create mode 100644 src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java create mode 100644 src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java create mode 100644 src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 734bf3da8..d4ad022b3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -1,11 +1,8 @@ package com.avaje.ebeaninternal.server.deploy.parse; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.EmbeddedId; @@ -210,20 +207,7 @@ public class AnnotationAssocOnes extends AnnotationParser { prop.getDeployEmbedded().putAll(propMap); } - AttributeOverrides attrOverrides = get(prop, AttributeOverrides.class); - if (attrOverrides != null) { - HashMap propMap = new HashMap(); - AttributeOverride[] aoArray = attrOverrides.value(); - for (int i = 0; i < aoArray.length; i++) { - String propName = aoArray[i].name(); - String columnName = aoArray[i].column().name(); - - propMap.put(propName, columnName); - } - - prop.getDeployEmbedded().putAll(propMap); - } - + readEmbeddedAttributeOverrides(prop); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java index e35533d64..9da0b4f3d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -22,6 +22,7 @@ import javax.persistence.Transient; import javax.persistence.Version; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + import com.avaje.ebean.annotation.CreatedTimestamp; import com.avaje.ebean.annotation.EmbeddedColumns; import com.avaje.ebean.annotation.Encrypted; @@ -37,6 +38,7 @@ import com.avaje.ebean.config.dbplatform.IdType; import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; +import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyCompound; import com.avaje.ebeaninternal.server.idgen.UuidIdGenerator; import com.avaje.ebeaninternal.server.lib.util.StringHelper; @@ -102,6 +104,12 @@ public class AnnotationFields extends AnnotationParser { prop.setEmbedded(true); } + if (prop instanceof DeployBeanPropertyAssocOne) { + if (prop.isId() && !prop.isEmbedded()) { + prop.setEmbedded(true); + } + readEmbeddedAttributeOverrides((DeployBeanPropertyAssocOne)prop); + } } private void readField(DeployBeanProperty prop) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java index f4afdcedf..2fce1d3a6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -1,9 +1,14 @@ package com.avaje.ebeaninternal.server.deploy.parse; +import java.util.HashMap; + +import javax.persistence.AttributeOverride; +import javax.persistence.AttributeOverrides; import javax.persistence.CascadeType; import com.avaje.ebeaninternal.server.deploy.BeanCascadeInfo; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; /** * Base class for reading deployment annotations. @@ -48,4 +53,25 @@ public abstract class AnnotationParser extends AnnotationBase { } } + /** + * Read an AttributeOverrides if they exist for this embedded bean. + */ + protected void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne prop) { + + AttributeOverrides attrOverrides = get(prop, AttributeOverrides.class); + if (attrOverrides != null) { + HashMap propMap = new HashMap(); + AttributeOverride[] aoArray = attrOverrides.value(); + for (int i = 0; i < aoArray.length; i++) { + String propName = aoArray[i].name(); + String columnName = aoArray[i].column().name(); + + propMap.put(propName, columnName); + } + + prop.getDeployEmbedded().putAll(propMap); + } + + } + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java index 133dc19e0..247340a5f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.persist.dml; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.util.Set; import javax.persistence.OptimisticLockException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index fa83a53e0..d816852cf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -26,7 +26,7 @@ public final class BindableIdEmbedded implements BindableId { public BindableIdEmbedded(BeanPropertyAssocOne embId, BeanDescriptor desc) { this.embId = embId; - this.props = embId.getTargetDescriptor().propertiesBaseScalar(); + this.props = embId.getProperties(); matches = MatchedImportedProperty.build(props, desc); } diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java new file mode 100644 index 000000000..6b9c46f48 --- /dev/null +++ b/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -0,0 +1,26 @@ +package com.avaje.tests.compositekeys; + +import org.junit.Test; + +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.compositekeys.db.CaoBean; +import com.avaje.tests.compositekeys.db.CaoKey; + +public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { + + @Test + public void test() { + + CaoKey key = new CaoKey(); + key.setCustomer(123); + key.setType(1); + + CaoBean bean = new CaoBean(); + bean.setKey(key); + bean.setDescription("some desc"); + + Ebean.save(bean); + } + +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java new file mode 100644 index 000000000..d07df74fc --- /dev/null +++ b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java @@ -0,0 +1,49 @@ +package com.avaje.tests.compositekeys.db; + +import javax.persistence.AttributeOverride; +import javax.persistence.AttributeOverrides; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Version; + +@Entity +public class CaoBean { + + @Id + @AttributeOverrides({ + @AttributeOverride(name = "customer", column = @Column(name = "x_cust_id")) , + @AttributeOverride(name = "type", column = @Column(name = "x_type_id")) + }) + private CaoKey key; + + private String description; + + @Version + private Long version; + + public CaoKey getKey() { + return key; + } + + public void setKey(CaoKey key) { + this.key = key; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + +} \ No newline at end of file diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java b/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java new file mode 100644 index 000000000..2bb97b72e --- /dev/null +++ b/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java @@ -0,0 +1,44 @@ +package com.avaje.tests.compositekeys.db; + +import javax.persistence.Embeddable; + +@Embeddable +public class CaoKey +{ + private int customer; + + private int type; + + public int getCustomer() { + return customer; + } + + public void setCustomer(int customer) { + this.customer = customer; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public int hashCode() { + int hc = 31 * 7 + customer; + hc = 31 * hc + type; + return hc; + } + + public boolean equals(Object o){ + if (this == o){ + return true; + } + if (o instanceof CaoKey){ + CaoKey k = (CaoKey)o; + return k.customer == customer && k.type == type; + } + return false; + } +} \ No newline at end of file