#878 - @AttributeOverride (not wrapped in @AttributeOverrides) is not applied

This commit is contained in:
Rob Bygrave
2016-11-15 22:48:36 +13:00
parent d2b6d06da5
commit 632cf10096
5 changed files with 141 additions and 4 deletions
@@ -0,0 +1,51 @@
package com.avaje.tests.model.embedded;
import javax.persistence.AttributeOverride;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Version;
@Entity
public class PrimaryRevision {
@EmbeddedId
// @AttributeOverrides({
// @AttributeOverride(name="primaryId", column = @Column(name="id"))
// })
@AttributeOverride(name="primaryId", column = @Column(name="id"))
private RevisionId revisionId;
String name;
@Version
long version;
public PrimaryRevision(long someId) {
this.revisionId = new RevisionId(someId, 1);
}
public RevisionId getRevisionId() {
return revisionId;
}
public void setRevisionId(RevisionId revisionId) {
this.revisionId = revisionId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public long getVersion() {
return version;
}
public void setVersion(long version) {
this.version = version;
}
}
@@ -0,0 +1,53 @@
package com.avaje.tests.model.embedded;
import javax.persistence.Column;
import javax.persistence.Embeddable;
@Embeddable
public class RevisionId {
Long primaryId;
Integer revision;
public RevisionId() {
}
public RevisionId(Long primaryId, Integer revision) {
this.revision = revision;
this.primaryId = primaryId;
}
@Column(name = "revision")
public Integer getRevision() {
return revision;
}
public void setRevision(Integer revision) {
this.revision = revision;
}
public Long getPrimaryId() {
return primaryId;
}
public void setPrimaryId(Long primaryId) {
this.primaryId = primaryId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
RevisionId that = (RevisionId) o;
if (!primaryId.equals(that.primaryId)) return false;
return revision.equals(that.revision);
}
@Override
public int hashCode() {
int result = primaryId.hashCode();
result = 31 * result + revision.hashCode();
return result;
}
}
@@ -0,0 +1,27 @@
package com.avaje.tests.model.embedded;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import org.avaje.ebeantest.LoggedSqlCollector;
import org.junit.Test;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
public class TestEmbeddedAttrOverride extends BaseTestCase {
@Test
public void insert() {
PrimaryRevision bean = new PrimaryRevision(100);
bean.setName("hello");
LoggedSqlCollector.start();
Ebean.save(bean);
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("insert into primary_revision (id, revision, name, version) values (?,?,?,?)");
}
}