Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6393 First cut of attribute overrides for embeddables

This commit is contained in:
Hardy Ferentschik 2011-08-01 18:08:49 +02:00
parent ca7a1e284f
commit e875bb6004
8 changed files with 118 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/ColumnSourceImpl.java
View File

@ -30,25 +30,30 @@ import org.hibernate.internal.util.StringHelper;
*/
public class ColumnSourceImpl extends ColumnValuesSourceImpl {
private final BasicAttribute attribute;
private final String name;
ColumnSourceImpl(BasicAttribute attribute) {
private final String name;
ColumnSourceImpl(BasicAttribute attribute, AttributeOverride attributeOverride) {
super( attribute.getColumnValues() );
if(attributeOverride != null) {
setOverrideColumnValues( attributeOverride.getColumnValues() );
}
this.attribute = attribute;
this.name = resolveColumnName();
this.name = resolveColumnName();
}
protected String resolveColumnName() {
if ( StringHelper.isEmpty( super.getName() ) ) {
//no @Column defined.
return attribute.getContext().getNamingStrategy().propertyToColumnName( attribute.getName() );
}
else {
return super.getName();
}
}
protected String resolveColumnName() {
if ( StringHelper.isEmpty( super.getName() ) ) {
//no @Column defined.
return attribute.getContext().getNamingStrategy().propertyToColumnName( attribute.getName() );
}
else {
return super.getName();
}
}
@Override
public String getName() {
return name;
return name;
}
@Override

6
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/ColumnValuesSourceImpl.java
View File

@ -31,12 +31,16 @@ import org.hibernate.metamodel.source.binder.ColumnSource;
* @author Steve Ebersole
*/
public class ColumnValuesSourceImpl implements ColumnSource {
private final ColumnValues columnValues;
private ColumnValues columnValues;
public ColumnValuesSourceImpl(ColumnValues columnValues) {
this.columnValues = columnValues;
}
void setOverrideColumnValues(ColumnValues columnValues) {
this.columnValues = columnValues;
}
@Override
public String getName() {
return columnValues.getName();

6
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleIdentifierSourceImpl.java
View File

@ -23,6 +23,8 @@
*/
package org.hibernate.metamodel.source.annotations.attribute;
import java.util.Map;
import org.hibernate.AssertionFailure;
import org.hibernate.metamodel.binding.IdGenerator;
import org.hibernate.metamodel.source.binder.SimpleIdentifierSource;
@ -33,8 +35,9 @@ import org.hibernate.metamodel.source.binder.SingularAttributeSource;
*/
public class SimpleIdentifierSourceImpl implements SimpleIdentifierSource {
private final BasicAttribute attribute;
private final Map<String, AttributeOverride> attributeOverrideMap;
public SimpleIdentifierSourceImpl(BasicAttribute attribute) {
public SimpleIdentifierSourceImpl(BasicAttribute attribute, Map<String, AttributeOverride> attributeOverrideMap) {
if ( !attribute.isId() ) {
throw new AssertionFailure(
String.format(
@ -44,6 +47,7 @@ public class SimpleIdentifierSourceImpl implements SimpleIdentifierSource {
);
}
this.attribute = attribute;
this.attributeOverrideMap = attributeOverrideMap;
}
@Override

9
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SingularAttributeSourceImpl.java
View File

@ -26,7 +26,6 @@ package org.hibernate.metamodel.source.annotations.attribute;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.hibernate.mapping.PropertyGeneration;
import org.hibernate.metamodel.source.binder.ExplicitHibernateTypeSource;
@ -40,9 +39,15 @@ import org.hibernate.metamodel.source.binder.SingularAttributeSource;
*/
public class SingularAttributeSourceImpl implements SingularAttributeSource {
private final BasicAttribute attribute;
private final AttributeOverride attributeOverride;
public SingularAttributeSourceImpl(BasicAttribute attribute) {
this(attribute, null);
}
public SingularAttributeSourceImpl(BasicAttribute attribute, AttributeOverride attributeOverride) {
this.attribute = attribute;
this.attributeOverride = attributeOverride;
}
@Override
@ -88,7 +93,7 @@ public class SingularAttributeSourceImpl implements SingularAttributeSource {
@Override
public List<RelationalValueSource> relationalValueSources() {
List<RelationalValueSource> valueSources = new ArrayList<RelationalValueSource>();
valueSources.add( new ColumnSourceImpl( attribute ) );
valueSources.add( new ColumnSourceImpl( attribute, attributeOverride ) );
return valueSources;
}

20
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ComponentAttributeSourceImpl.java
View File

@ -26,6 +26,7 @@ package org.hibernate.metamodel.source.annotations.entity;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.jboss.jandex.AnnotationInstance;
@ -34,6 +35,7 @@ import org.hibernate.mapping.PropertyGeneration;
import org.hibernate.metamodel.source.LocalBindingContext;
import org.hibernate.metamodel.source.annotations.JandexHelper;
import org.hibernate.metamodel.source.annotations.attribute.AssociationAttribute;
import org.hibernate.metamodel.source.annotations.attribute.AttributeOverride;
import org.hibernate.metamodel.source.annotations.attribute.BasicAttribute;
import org.hibernate.metamodel.source.annotations.attribute.SingularAttributeSourceImpl;
import org.hibernate.metamodel.source.annotations.attribute.ToOneAttributeSourceImpl;
@ -53,11 +55,13 @@ import org.hibernate.metamodel.source.binder.SingularAttributeNature;
public class ComponentAttributeSourceImpl implements ComponentAttributeSource {
private final EmbeddableClass embeddableClass;
private final Value<Class<?>> classReference;
private final Map<String, AttributeOverride> attributeOverrides;
private final String path;
public ComponentAttributeSourceImpl(EmbeddableClass embeddableClass) {
public ComponentAttributeSourceImpl(EmbeddableClass embeddableClass, Map<String, AttributeOverride> attributeOverrides) {
this.embeddableClass = embeddableClass;
this.classReference = new Value<Class<?>>( embeddableClass.getClass() );
this.attributeOverrides = attributeOverrides;
String tmpPath = embeddableClass.getEmbeddedAttributeName();
ConfiguredClass parent = embeddableClass.getParent();
while ( parent != null && parent instanceof EmbeddableClass ) {
@ -120,10 +124,20 @@ public class ComponentAttributeSourceImpl implements ComponentAttributeSource {
public Iterable<AttributeSource> attributeSources() {
List<AttributeSource> attributeList = new ArrayList<AttributeSource>();
for ( BasicAttribute attribute : embeddableClass.getSimpleAttributes() ) {
attributeList.add( new SingularAttributeSourceImpl( attribute ) );
AttributeOverride attributeOverride = null;
String tmp = getPath() + "." + attribute.getName();
if ( attributeOverrides.containsKey( tmp ) ) {
attributeOverride = attributeOverrides.get( tmp );
}
attributeList.add( new SingularAttributeSourceImpl( attribute, attributeOverride ) );
}
for ( EmbeddableClass component : embeddableClass.getEmbeddedClasses().values() ) {
attributeList.add( new ComponentAttributeSourceImpl( component ) );
attributeList.add(
new ComponentAttributeSourceImpl(
component,
embeddableClass.getAttributeOverrideMap()
)
);
}
for ( AssociationAttribute associationAttribute : embeddableClass.getAssociationAttributes() ) {
attributeList.add( new ToOneAttributeSourceImpl( associationAttribute ) );

2
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntitySourceImpl.java
View File

@ -176,7 +176,7 @@ public class EntitySourceImpl implements EntitySource {
attributeList.add( new SingularAttributeSourceImpl( attribute ) );
}
for ( EmbeddableClass component : entityClass.getEmbeddedClasses().values() ) {
attributeList.add( new ComponentAttributeSourceImpl( component ) );
attributeList.add( new ComponentAttributeSourceImpl( component, entityClass.getAttributeOverrideMap() ) );
}
for ( AssociationAttribute associationAttribute : entityClass.getAssociationAttributes() ) {
attributeList.add( new ToOneAttributeSourceImpl( associationAttribute ) );

7
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/RootEntitySourceImpl.java
View File

@ -50,7 +50,7 @@ public class RootEntitySourceImpl extends EntitySourceImpl implements RootEntity
switch ( idType ) {
case SIMPLE: {
BasicAttribute attribute = getEntityClass().getIdAttributes().iterator().next();
return new SimpleIdentifierSourceImpl( attribute );
return new SimpleIdentifierSourceImpl( attribute, getEntityClass().getAttributeOverrideMap() );
}
case COMPOSED: {
break;
@ -69,8 +69,9 @@ public class RootEntitySourceImpl extends EntitySourceImpl implements RootEntity
@Override
public SingularAttributeSource getVersioningAttributeSource() {
SingularAttributeSource attributeSource = null;
if ( getEntityClass().getVersionAttribute() != null ) {
attributeSource = new SingularAttributeSourceImpl( getEntityClass().getVersionAttribute() );
EntityClass entityClass = getEntityClass();
if ( entityClass.getVersionAttribute() != null ) {
attributeSource = new SingularAttributeSourceImpl( entityClass.getVersionAttribute() );
}
return attributeSource;
}

84
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTest.java
View File

@ -23,6 +23,8 @@
*/
package org.hibernate.metamodel.source.annotations.entity;
import javax.persistence.AttributeOverride;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@ -30,6 +32,7 @@ import javax.persistence.Id;
import org.junit.Test;
import org.hibernate.metamodel.binding.BasicAttributeBinding;
import org.hibernate.metamodel.binding.ComponentAttributeBinding;
import org.hibernate.metamodel.binding.EntityBinding;
@ -43,29 +46,6 @@ import static junit.framework.Assert.assertTrue;
* @author Hardy Ferentschik
*/
public class EmbeddableBindingTest extends BaseAnnotationBindingTestCase {
@Test
@Resources(annotatedClasses = { User.class, Address.class })
public void testEmbeddable() {
EntityBinding binding = getEntityBinding( User.class );
assertNotNull( binding.locateAttributeBinding( "address" ) );
assertTrue( binding.locateAttributeBinding( "address" ) instanceof ComponentAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding(
"address"
);
// todo - is this really correct? Does the path start w/ the class name
assertEquals(
"Wrong path",
"org.hibernate.metamodel.source.annotations.entity.EmbeddableBindingTest$User.address",
componentBinding.getPathBase()
);
assertNotNull( componentBinding.locateAttributeBinding( "street" ) );
assertNotNull( componentBinding.locateAttributeBinding( "city" ) );
assertNotNull( componentBinding.locateAttributeBinding( "postCode" ) );
}
@Entity
class User {
@Id
@ -81,6 +61,64 @@ public class EmbeddableBindingTest extends BaseAnnotationBindingTestCase {
String city;
String postCode;
}
@Test
@Resources(annotatedClasses = { User.class, Address.class })
public void testEmbeddable() {
EntityBinding binding = getEntityBinding( User.class );
final String componentName = "address";
assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding(
componentName
);
// todo - is this really correct? Does the path start w/ the class name
assertEquals(
"Wrong path",
"org.hibernate.metamodel.source.annotations.entity.EmbeddableBindingTest$User.address",
componentBinding.getPathBase()
);
assertNotNull( componentBinding.locateAttributeBinding( "street" ) );
assertNotNull( componentBinding.locateAttributeBinding( "city" ) );
assertNotNull( componentBinding.locateAttributeBinding( "postCode" ) );
}
@Entity
@AttributeOverride(name = "embedded.name", column = @Column(name = "FUBAR", length = 42))
class BaseEntity {
@Id
private int id;
@Embedded
private EmbeddedEntity embedded;
}
@Embeddable
class EmbeddedEntity {
String name;
}
@Test
@Resources(annotatedClasses = { BaseEntity.class, EmbeddedEntity.class })
public void testEmbeddableWithAttributeOverride() {
EntityBinding binding = getEntityBinding( BaseEntity.class );
final String componentName = "embedded";
assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding(
componentName
);
assertNotNull( componentBinding.locateAttributeBinding( "name" ) );
BasicAttributeBinding nameAttribute = (BasicAttributeBinding) componentBinding.locateAttributeBinding( "name" );
org.hibernate.metamodel.relational.Column column = (org.hibernate.metamodel.relational.Column) nameAttribute.getValue();
assertEquals( "Attribute override specifies a custom column name", "FUBAR", column.getColumnName().getName() );
assertEquals( "Attribute override specifies a custom size", 42, column.getSize().getLength() );
}
}