Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-10 13:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-7075 - Use the term 'composition' to refer to components/embeddables

Browse Source
This commit is contained in:
Steve Ebersole 2012-02-16 10:46:52 -06:00
parent afac5ceeba
commit 9adb996520
10 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/Binder.java
View File

@ -55,7 +55,7 @@
import org.hibernate.metamodel.spi.binding.AttributeBindingContainer; import org.hibernate.metamodel.spi.binding.AttributeBindingContainer;
import org.hibernate.metamodel.spi.binding.BasicAttributeBinding; import org.hibernate.metamodel.spi.binding.BasicAttributeBinding;
import org.hibernate.metamodel.spi.binding.BasicPluralAttributeElementBinding; import org.hibernate.metamodel.spi.binding.BasicPluralAttributeElementBinding;
import org.hibernate.metamodel.spi.binding.ComponentAttributeBinding; import org.hibernate.metamodel.spi.binding.CompositionAttributeBinding;
import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.binding.EntityDiscriminator; import org.hibernate.metamodel.spi.binding.EntityDiscriminator;
import org.hibernate.metamodel.spi.binding.HibernateTypeDescriptor; import org.hibernate.metamodel.spi.binding.HibernateTypeDescriptor;
@ -69,7 +69,7 @@
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding; import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.metamodel.spi.binding.TypeDefinition; import org.hibernate.metamodel.spi.binding.TypeDefinition;
import org.hibernate.metamodel.spi.domain.Attribute; import org.hibernate.metamodel.spi.domain.Attribute;
import org.hibernate.metamodel.spi.domain.Component; import org.hibernate.metamodel.spi.domain.Composition;
import org.hibernate.metamodel.spi.domain.Entity; import org.hibernate.metamodel.spi.domain.Entity;
import org.hibernate.metamodel.spi.domain.PluralAttribute; import org.hibernate.metamodel.spi.domain.PluralAttribute;
import org.hibernate.metamodel.spi.domain.SingularAttribute; import org.hibernate.metamodel.spi.domain.SingularAttribute;
@ -723,8 +723,8 @@ private ForeignKey resolveForeignKey(
final SingularAttributeBinding referencedAttributeBinding = (SingularAttributeBinding) referencedEntityBinding.locateAttributeBinding( final SingularAttributeBinding referencedAttributeBinding = (SingularAttributeBinding) referencedEntityBinding.locateAttributeBinding(
attributeSource.getReferencedEntityAttributeName() attributeSource.getReferencedEntityAttributeName()
); );
if ( ComponentAttributeBinding.class.isInstance( referencedAttributeBinding ) ) { if ( CompositionAttributeBinding.class.isInstance( referencedAttributeBinding ) ) {
collectValues( (ComponentAttributeBinding) referencedAttributeBinding, targetColumns ); collectValues( (CompositionAttributeBinding) referencedAttributeBinding, targetColumns );
} }
else { else {
for ( RelationalValueBinding valueBinding :( (BasicAttributeBinding) referencedAttributeBinding ).getRelationalValueBindings() ) { for ( RelationalValueBinding valueBinding :( (BasicAttributeBinding) referencedAttributeBinding ).getRelationalValueBindings() ) {
@ -749,8 +749,8 @@ private ForeignKey resolveForeignKey(
return foreignKey; return foreignKey;
} }
private void collectValues(ComponentAttributeBinding componentAttributeBinding, List<Value> targetColumns) { private void collectValues(CompositionAttributeBinding compositionAttributeBinding, List<Value> targetColumns) {
for ( AttributeBinding attributeBinding : componentAttributeBinding.attributeBindings() ) { for ( AttributeBinding attributeBinding : compositionAttributeBinding.attributeBindings() ) {
if ( BasicAttributeBinding.class.isInstance( attributeBinding ) ) { if ( BasicAttributeBinding.class.isInstance( attributeBinding ) ) {
for ( RelationalValueBinding valueBinding :( (BasicAttributeBinding) attributeBinding ).getRelationalValueBindings() ) { for ( RelationalValueBinding valueBinding :( (BasicAttributeBinding) attributeBinding ).getRelationalValueBindings() ) {
targetColumns.add( valueBinding.getValue() ); targetColumns.add( valueBinding.getValue() );
@ -761,8 +761,8 @@ else if ( ManyToOneAttributeBinding.class.isInstance( attributeBinding ) ) {
targetColumns.add( valueBinding.getValue() ); targetColumns.add( valueBinding.getValue() );
} }
} }
else if ( ComponentAttributeBinding.class.isInstance( attributeBinding ) ) { else if ( CompositionAttributeBinding.class.isInstance( attributeBinding ) ) {
collectValues( (ComponentAttributeBinding) attributeBinding, targetColumns ); collectValues( (CompositionAttributeBinding) attributeBinding, targetColumns );
} }
} }
} }
@ -819,19 +819,19 @@ private void bindComponentAttribute(
AttributeBindingContainer container, AttributeBindingContainer container,
Deque<TableSpecification> tableStack) { Deque<TableSpecification> tableStack) {
final String attributeName = attributeSource.getName(); final String attributeName = attributeSource.getName();
SingularAttribute attribute = container.getAttributeContainer().locateComponentAttribute( attributeName ); SingularAttribute attribute = container.getAttributeContainer().locateCompositionAttribute( attributeName );
final Component component; final Composition composition;
if ( attribute == null ) { if ( attribute == null ) {
component = new Component( composition = new Composition(
attributeSource.getPath(), attributeSource.getPath(),
attributeSource.getClassName(), attributeSource.getClassName(),
attributeSource.getClassReference(), attributeSource.getClassReference(),
null // component inheritance not YET supported null // composition inheritance not YET supported
); );
attribute = container.getAttributeContainer().createComponentAttribute( attributeName, component ); attribute = container.getAttributeContainer().createCompositionAttribute( attributeName, composition );
} }
else { else {
component = (Component) attribute.getSingularAttributeType(); composition = (Composition) attribute.getSingularAttributeType();
} }
final String propertyAccessorName = Helper.getPropertyAccessorName( final String propertyAccessorName = Helper.getPropertyAccessorName(
@ -846,13 +846,13 @@ private void bindComponentAttribute(
final SingularAttribute parentReferenceAttribute; final SingularAttribute parentReferenceAttribute;
if ( StringHelper.isNotEmpty( attributeSource.getParentReferenceAttributeName() ) ) { if ( StringHelper.isNotEmpty( attributeSource.getParentReferenceAttributeName() ) ) {
parentReferenceAttribute = component.createSingularAttribute( attributeSource.getParentReferenceAttributeName() ); parentReferenceAttribute = composition.createSingularAttribute( attributeSource.getParentReferenceAttributeName() );
} }
else { else {
parentReferenceAttribute = null; parentReferenceAttribute = null;
} }
ComponentAttributeBinding componentAttributeBinding = container.makeComponentAttributeBinding( CompositionAttributeBinding compositionAttributeBinding = container.makeComponentAttributeBinding(
attribute, attribute,
parentReferenceAttribute, parentReferenceAttribute,
propertyAccessorName, propertyAccessorName,
@ -861,7 +861,7 @@ private void bindComponentAttribute(
metaAttributeContext metaAttributeContext
); );
bindAttributes( attributeSource, componentAttributeBinding, tableStack ); bindAttributes( attributeSource, compositionAttributeBinding, tableStack );
} }
private void bindPersistentCollection( private void bindPersistentCollection(
@ -1416,17 +1416,17 @@ private void pushHibernateTypeInformationDownIfNeeded(
resolvedHibernateType resolvedHibernateType
); );
} }
else if ( ComponentAttributeBinding.class.isInstance( attributeBinding ) ) { else if ( CompositionAttributeBinding.class.isInstance( attributeBinding ) ) {
pushHibernateTypeInformationDownIfNeeded( pushHibernateTypeInformationDownIfNeeded(
hibernateTypeDescriptor, hibernateTypeDescriptor,
(ComponentAttributeBinding) attributeBinding (CompositionAttributeBinding) attributeBinding
); );
} }
} }
private void pushHibernateTypeInformationDownIfNeeded( private void pushHibernateTypeInformationDownIfNeeded(
HibernateTypeDescriptor hibernateTypeDescriptor, HibernateTypeDescriptor hibernateTypeDescriptor,
ComponentAttributeBinding attributeBinding) { CompositionAttributeBinding attributeBinding) {
final SingularAttribute singularAttribute = SingularAttribute.class.cast( attributeBinding.getAttribute() ); final SingularAttribute singularAttribute = SingularAttribute.class.cast( attributeBinding.getAttribute() );
if ( ! singularAttribute.isTypeResolved() && hibernateTypeDescriptor.getJavaTypeName() != null ) { if ( ! singularAttribute.isTypeResolved() && hibernateTypeDescriptor.getJavaTypeName() != null ) {
singularAttribute.resolveType( metadata.makeJavaType( hibernateTypeDescriptor.getJavaTypeName() ) ); singularAttribute.resolveType( metadata.makeJavaType( hibernateTypeDescriptor.getJavaTypeName() ) );

5
hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/AttributeBindingContainer.java
View File

@ -30,11 +30,10 @@
import org.hibernate.metamodel.spi.domain.AttributeContainer; import org.hibernate.metamodel.spi.domain.AttributeContainer;
import org.hibernate.metamodel.spi.domain.PluralAttribute; import org.hibernate.metamodel.spi.domain.PluralAttribute;
import org.hibernate.metamodel.spi.domain.SingularAttribute; import org.hibernate.metamodel.spi.domain.SingularAttribute;
import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.source.MetaAttributeContext; import org.hibernate.metamodel.spi.source.MetaAttributeContext;
/** /**
* Common contract for {@link EntityBinding} and {@link ComponentAttributeBinding} in so far as they are both * Common contract for {@link EntityBinding} and {@link CompositionAttributeBinding} in so far as they are both
* containers for {@link AttributeBinding} descriptors * containers for {@link AttributeBinding} descriptors
* *
* @author Steve Ebersole * @author Steve Ebersole
@ -93,7 +92,7 @@ public BasicAttributeBinding makeBasicAttributeBinding(
* *
* @return The attribute binding instance. * @return The attribute binding instance.
*/ */
public ComponentAttributeBinding makeComponentAttributeBinding( public CompositionAttributeBinding makeComponentAttributeBinding(
SingularAttribute attribute, SingularAttribute attribute,
SingularAttribute parentReferenceAttribute, SingularAttribute parentReferenceAttribute,
String propertyAccessorName, String propertyAccessorName,

15
hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/ComponentAttributeBinding.java → hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/CompositionAttributeBinding.java
View File

@ -31,24 +31,23 @@
import org.hibernate.mapping.PropertyGeneration; import org.hibernate.mapping.PropertyGeneration;
import org.hibernate.metamodel.spi.domain.AttributeContainer; import org.hibernate.metamodel.spi.domain.AttributeContainer;
import org.hibernate.metamodel.spi.domain.Component; import org.hibernate.metamodel.spi.domain.Composition;
import org.hibernate.metamodel.spi.domain.PluralAttribute; import org.hibernate.metamodel.spi.domain.PluralAttribute;
import org.hibernate.metamodel.spi.domain.PluralAttributeNature; import org.hibernate.metamodel.spi.domain.PluralAttributeNature;
import org.hibernate.metamodel.spi.domain.SingularAttribute; import org.hibernate.metamodel.spi.domain.SingularAttribute;
import org.hibernate.metamodel.spi.relational.ForeignKey;
import org.hibernate.metamodel.spi.source.MetaAttributeContext; import org.hibernate.metamodel.spi.source.MetaAttributeContext;
/** /**
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public class ComponentAttributeBinding public class CompositionAttributeBinding
extends AbstractSingularAttributeBinding extends AbstractSingularAttributeBinding
implements AttributeBindingContainer { implements AttributeBindingContainer {
private final String path; private final String path;
private final SingularAttribute parentReference; private final SingularAttribute parentReference;
private Map<String, AttributeBinding> attributeBindingMap = new HashMap<String, AttributeBinding>(); private Map<String, AttributeBinding> attributeBindingMap = new HashMap<String, AttributeBinding>();
public ComponentAttributeBinding( public CompositionAttributeBinding(
AttributeBindingContainer container, AttributeBindingContainer container,
SingularAttribute attribute, SingularAttribute attribute,
String propertyAccessorName, String propertyAccessorName,
@ -99,8 +98,8 @@ public AttributeContainer getAttributeContainer() {
return getComponent(); return getComponent();
} }
public Component getComponent() { public Composition getComponent() {
return (Component) getAttribute().getSingularAttributeType(); return (Composition) getAttribute().getSingularAttributeType();
} }
@Override @Override
@ -159,14 +158,14 @@ protected void registerAttributeBinding(String name, AttributeBinding attributeB
} }
@Override @Override
public ComponentAttributeBinding makeComponentAttributeBinding( public CompositionAttributeBinding makeComponentAttributeBinding(
SingularAttribute attribute, SingularAttribute attribute,
SingularAttribute parentReferenceAttribute, SingularAttribute parentReferenceAttribute,
String propertyAccessorName, String propertyAccessorName,
boolean includedInOptimisticLocking, boolean includedInOptimisticLocking,
boolean lazy, boolean lazy,
MetaAttributeContext metaAttributeContext) { MetaAttributeContext metaAttributeContext) {
final ComponentAttributeBinding binding = new ComponentAttributeBinding( final CompositionAttributeBinding binding = new CompositionAttributeBinding(
this, this,
attribute, attribute,
propertyAccessorName, propertyAccessorName,

4
hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/EntityBinding.java
View File

@ -512,14 +512,14 @@ public BasicAttributeBinding makeBasicAttributeBinding(
} }
@Override @Override
public ComponentAttributeBinding makeComponentAttributeBinding( public CompositionAttributeBinding makeComponentAttributeBinding(
SingularAttribute attribute, SingularAttribute attribute,
SingularAttribute parentReferenceAttribute, SingularAttribute parentReferenceAttribute,
String propertyAccessorName, String propertyAccessorName,
boolean includedInOptimisticLocking, boolean includedInOptimisticLocking,
boolean lazy, boolean lazy,
MetaAttributeContext metaAttributeContext) { MetaAttributeContext metaAttributeContext) {
final ComponentAttributeBinding binding = new ComponentAttributeBinding( final CompositionAttributeBinding binding = new CompositionAttributeBinding(
this, this,
attribute, attribute,
propertyAccessorName, propertyAccessorName,

6
hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/AbstractAttributeContainer.java
View File

@ -112,14 +112,14 @@ public SingularAttribute createVirtualSingularAttribute(String name) {
} }
@Override @Override
public SingularAttribute locateComponentAttribute(String name) { public SingularAttribute locateCompositionAttribute(String name) {
return (SingularAttributeImpl) locateAttribute( name ); return (SingularAttributeImpl) locateAttribute( name );
} }
@Override @Override
public SingularAttribute createComponentAttribute(String name, Component component) { public SingularAttribute createCompositionAttribute(String name, Composition composition) {
SingularAttributeImpl attribute = new SingularAttributeImpl( name, this ); SingularAttributeImpl attribute = new SingularAttributeImpl( name, this );
attribute.resolveType( component ); attribute.resolveType( composition );
addAttribute( attribute ); addAttribute( attribute );
return attribute; return attribute;
} }

4
hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/AttributeContainer.java
View File

@ -62,8 +62,8 @@ public interface AttributeContainer extends Type {
public SingularAttribute createSingularAttribute(String name); public SingularAttribute createSingularAttribute(String name);
public SingularAttribute createVirtualSingularAttribute(String name); public SingularAttribute createVirtualSingularAttribute(String name);
public SingularAttribute locateComponentAttribute(String name); public SingularAttribute locateCompositionAttribute(String name);
public SingularAttribute createComponentAttribute(String name, Component component); public SingularAttribute createCompositionAttribute(String name, Composition composition);
public PluralAttribute locatePluralAttribute(String name); public PluralAttribute locatePluralAttribute(String name);

4
hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Component.java → hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composition.java
View File

@ -32,8 +32,8 @@
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public class Component extends AbstractAttributeContainer { public class Composition extends AbstractAttributeContainer {
public Component(String name, String className, Value<Class<?>> classReference, Hierarchical superType) { public Composition(String name, String className, Value<Class<?>> classReference, Hierarchical superType) {
super( name, className, classReference, superType ); super( name, className, classReference, superType );
} }

15
hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
View File

@ -55,6 +55,7 @@
import org.hibernate.metamodel.spi.binding.BasicAttributeBinding; import org.hibernate.metamodel.spi.binding.BasicAttributeBinding;
import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.domain.Attribute; import org.hibernate.metamodel.spi.domain.Attribute;
import org.hibernate.metamodel.spi.domain.Composition;
import org.hibernate.metamodel.spi.domain.SingularAttribute; import org.hibernate.metamodel.spi.domain.SingularAttribute;
import org.hibernate.tuple.IdentifierProperty; import org.hibernate.tuple.IdentifierProperty;
import org.hibernate.tuple.PropertyFactory; import org.hibernate.tuple.PropertyFactory;
@ -607,8 +608,8 @@ private ValueInclusion determineInsertValueGenerationType(AttributeBinding mappi
return ValueInclusion.FULL; return ValueInclusion.FULL;
} }
// TODO: fix the following when components are working (HHH-6173) // TODO: fix the following when components are working (HHH-6173)
//else if ( mappingProperty.getValue() instanceof ComponentAttributeBinding ) { //else if ( mappingProperty.getValue() instanceof CompositionAttributeBinding ) {
// if ( hasPartialInsertComponentGeneration( ( ComponentAttributeBinding ) mappingProperty.getValue() ) ) { // if ( hasPartialInsertComponentGeneration( ( CompositionAttributeBinding ) mappingProperty.getValue() ) ) {
// return ValueInclusion.PARTIAL; // return ValueInclusion.PARTIAL;
// } // }
//} //}
@ -648,8 +649,8 @@ private ValueInclusion determineUpdateValueGenerationType(AttributeBinding mappi
return ValueInclusion.FULL; return ValueInclusion.FULL;
} }
// TODO: fix the following when components are working (HHH-6173) // TODO: fix the following when components are working (HHH-6173)
//else if ( mappingProperty.getValue() instanceof ComponentAttributeBinding ) { //else if ( mappingProperty.getValue() instanceof CompositionAttributeBinding ) {
// if ( hasPartialUpdateComponentGeneration( ( ComponentAttributeBinding ) mappingProperty.getValue() ) ) { // if ( hasPartialUpdateComponentGeneration( ( CompositionAttributeBinding ) mappingProperty.getValue() ) ) {
// return ValueInclusion.PARTIAL; // return ValueInclusion.PARTIAL;
// } // }
//} //}
@ -690,9 +691,9 @@ private void mapPropertyToIndex(Attribute attribute, int i) {
propertyIndexes.put( attribute.getName(), i ); propertyIndexes.put( attribute.getName(), i );
if ( attribute.isSingular() && if ( attribute.isSingular() &&
( ( SingularAttribute ) attribute ).getSingularAttributeType().isComponent() ) { ( ( SingularAttribute ) attribute ).getSingularAttributeType().isComponent() ) {
org.hibernate.metamodel.spi.domain.Component component = Composition composition =
(org.hibernate.metamodel.spi.domain.Component) ( (SingularAttribute) attribute ).getSingularAttributeType(); (Composition) ( (SingularAttribute) attribute ).getSingularAttributeType();
for ( Attribute subAttribute : component.attributes() ) { for ( Attribute subAttribute : composition.attributes() ) {
propertyIndexes.put( propertyIndexes.put(
attribute.getName() + '.' + subAttribute.getName(), attribute.getName() + '.' + subAttribute.getName(),
i i

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

@ -34,7 +34,7 @@
import org.hibernate.annotations.Parent; import org.hibernate.annotations.Parent;
import org.hibernate.annotations.Target; import org.hibernate.annotations.Target;
import org.hibernate.metamodel.spi.binding.BasicAttributeBinding; import org.hibernate.metamodel.spi.binding.BasicAttributeBinding;
import org.hibernate.metamodel.spi.binding.ComponentAttributeBinding; import org.hibernate.metamodel.spi.binding.CompositionAttributeBinding;
import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.junit.Test; import org.junit.Test;
@ -72,8 +72,8 @@ public void testEmbeddable() {
final String componentName = "phone"; final String componentName = "phone";
assertNotNull( binding.locateAttributeBinding( componentName ) ); assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( componentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding compositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
componentName componentName
); );
@ -81,12 +81,12 @@ public void testEmbeddable() {
assertEquals( assertEquals(
"Wrong path", "Wrong path",
EmbeddableBindingTest.User.class.getName() + ".phone", EmbeddableBindingTest.User.class.getName() + ".phone",
componentBinding.getPathBase() compositionBinding.getPathBase()
); );
assertNotNull( componentBinding.locateAttributeBinding( "countryCode" ) ); assertNotNull( compositionBinding.locateAttributeBinding( "countryCode" ) );
assertNotNull( componentBinding.locateAttributeBinding( "areaCode" ) ); assertNotNull( compositionBinding.locateAttributeBinding( "areaCode" ) );
assertNotNull( componentBinding.locateAttributeBinding( "number" ) ); assertNotNull( compositionBinding.locateAttributeBinding( "number" ) );
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -113,13 +113,13 @@ public void testEmbeddableWithAttributeOverride() {
final String componentName = "embedded"; final String componentName = "embedded";
assertNotNull( binding.locateAttributeBinding( componentName ) ); assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( componentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding compositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
componentName componentName
); );
assertNotNull( componentBinding.locateAttributeBinding( "name" ) ); assertNotNull( compositionBinding.locateAttributeBinding( "name" ) );
BasicAttributeBinding nameAttribute = (BasicAttributeBinding) componentBinding.locateAttributeBinding( "name" ); BasicAttributeBinding nameAttribute = (BasicAttributeBinding) compositionBinding.locateAttributeBinding( "name" );
assertEquals( 1, nameAttribute.getRelationalValueBindings().size() ); assertEquals( 1, nameAttribute.getRelationalValueBindings().size() );
org.hibernate.metamodel.spi.relational.Column column org.hibernate.metamodel.spi.relational.Column column
= (org.hibernate.metamodel.spi.relational.Column) nameAttribute.getRelationalValueBindings().get( 0 ).getValue(); = (org.hibernate.metamodel.spi.relational.Column) nameAttribute.getRelationalValueBindings().get( 0 ).getValue();
@ -168,16 +168,16 @@ public void testNestedEmbeddable() {
final String addressComponentName = "address"; final String addressComponentName = "address";
assertNotNull( binding.locateAttributeBinding( addressComponentName ) ); assertNotNull( binding.locateAttributeBinding( addressComponentName ) );
assertTrue( binding.locateAttributeBinding( addressComponentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( addressComponentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding attributeComponentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding attributeCompositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
addressComponentName addressComponentName
); );
assertNotNull( attributeComponentBinding.locateAttributeBinding( "street" ) ); assertNotNull( attributeCompositionBinding.locateAttributeBinding( "street" ) );
assertNotNull( attributeComponentBinding.locateAttributeBinding( "city" ) ); assertNotNull( attributeCompositionBinding.locateAttributeBinding( "city" ) );
assertNotNull( attributeComponentBinding.locateAttributeBinding( "state" ) ); assertNotNull( attributeCompositionBinding.locateAttributeBinding( "state" ) );
BasicAttributeBinding stateAttribute = (BasicAttributeBinding) attributeComponentBinding.locateAttributeBinding( BasicAttributeBinding stateAttribute = (BasicAttributeBinding) attributeCompositionBinding.locateAttributeBinding(
"state" "state"
); );
assertEquals( 1, stateAttribute.getRelationalValueBindings().size() ); assertEquals( 1, stateAttribute.getRelationalValueBindings().size() );
@ -191,13 +191,13 @@ public void testNestedEmbeddable() {
final String zipComponentName = "zipcode"; final String zipComponentName = "zipcode";
assertNotNull( attributeComponentBinding.locateAttributeBinding( zipComponentName ) ); assertNotNull( attributeCompositionBinding.locateAttributeBinding( zipComponentName ) );
assertTrue( attributeComponentBinding.locateAttributeBinding( zipComponentName ) instanceof ComponentAttributeBinding ); assertTrue( attributeCompositionBinding.locateAttributeBinding( zipComponentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding zipComponentBinding = (ComponentAttributeBinding) attributeComponentBinding.locateAttributeBinding( CompositionAttributeBinding zipCompositionBinding = (CompositionAttributeBinding) attributeCompositionBinding.locateAttributeBinding(
zipComponentName zipComponentName
); );
BasicAttributeBinding nameAttribute = (BasicAttributeBinding) zipComponentBinding.locateAttributeBinding( "zip" ); BasicAttributeBinding nameAttribute = (BasicAttributeBinding) zipCompositionBinding.locateAttributeBinding( "zip" );
assertEquals( 1, nameAttribute.getRelationalValueBindings().size() ); assertEquals( 1, nameAttribute.getRelationalValueBindings().size() );
column = (org.hibernate.metamodel.spi.relational.Column) nameAttribute.getRelationalValueBindings().get( 0 ).getValue(); column = (org.hibernate.metamodel.spi.relational.Column) nameAttribute.getRelationalValueBindings().get( 0 ).getValue();
assertEquals( assertEquals(
@ -262,19 +262,19 @@ public void testAttributeOverrideInEmbeddable() {
final String aComponentName = "a"; final String aComponentName = "a";
assertNotNull( binding.locateAttributeBinding( aComponentName ) ); assertNotNull( binding.locateAttributeBinding( aComponentName ) );
assertTrue( binding.locateAttributeBinding( aComponentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( aComponentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding aComponentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding aCompositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
aComponentName aComponentName
); );
final String bComponentName = "b"; final String bComponentName = "b";
assertNotNull( aComponentBinding.locateAttributeBinding( bComponentName ) ); assertNotNull( aCompositionBinding.locateAttributeBinding( bComponentName ) );
assertTrue( aComponentBinding.locateAttributeBinding( bComponentName ) instanceof ComponentAttributeBinding ); assertTrue( aCompositionBinding.locateAttributeBinding( bComponentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding bComponentBinding = (ComponentAttributeBinding) aComponentBinding.locateAttributeBinding( CompositionAttributeBinding bCompositionBinding = (CompositionAttributeBinding) aCompositionBinding.locateAttributeBinding(
bComponentName bComponentName
); );
BasicAttributeBinding attribute = (BasicAttributeBinding) bComponentBinding.locateAttributeBinding( "foo" ); BasicAttributeBinding attribute = (BasicAttributeBinding) bCompositionBinding.locateAttributeBinding( "foo" );
assertEquals( 1, attribute.getRelationalValueBindings().size() ); assertEquals( 1, attribute.getRelationalValueBindings().size() );
org.hibernate.metamodel.spi.relational.Column column org.hibernate.metamodel.spi.relational.Column column
= (org.hibernate.metamodel.spi.relational.Column) attribute.getRelationalValueBindings().get( 0 ).getValue(); = (org.hibernate.metamodel.spi.relational.Column) attribute.getRelationalValueBindings().get( 0 ).getValue();
@ -284,7 +284,7 @@ public void testAttributeOverrideInEmbeddable() {
column.getColumnName().getName() column.getColumnName().getName()
); );
attribute = (BasicAttributeBinding) bComponentBinding.locateAttributeBinding( "fubar" ); attribute = (BasicAttributeBinding) bCompositionBinding.locateAttributeBinding( "fubar" );
assertEquals( 1, attribute.getRelationalValueBindings().size() ); assertEquals( 1, attribute.getRelationalValueBindings().size() );
column = (org.hibernate.metamodel.spi.relational.Column) attribute.getRelationalValueBindings().get( 0 ).getValue(); column = (org.hibernate.metamodel.spi.relational.Column) attribute.getRelationalValueBindings().get( 0 ).getValue();
assertEquals( assertEquals(
@ -319,12 +319,12 @@ public void testParentReferencingAttributeName() {
final String componentName = "embedded"; final String componentName = "embedded";
assertNotNull( binding.locateAttributeBinding( componentName ) ); assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( componentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding compositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
componentName componentName
); );
assertEquals( "Wrong parent reference name", "parent", componentBinding.getParentReference().getName() ); assertEquals( "Wrong parent reference name", "parent", compositionBinding.getParentReference().getName() );
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -365,12 +365,12 @@ public void testTargetAnnotationWithEmbeddable() {
final String componentName = "car"; final String componentName = "car";
assertNotNull( binding.locateAttributeBinding( componentName ) ); assertNotNull( binding.locateAttributeBinding( componentName ) );
assertTrue( binding.locateAttributeBinding( componentName ) instanceof ComponentAttributeBinding ); assertTrue( binding.locateAttributeBinding( componentName ) instanceof CompositionAttributeBinding );
ComponentAttributeBinding componentBinding = (ComponentAttributeBinding) binding.locateAttributeBinding( CompositionAttributeBinding compositionBinding = (CompositionAttributeBinding) binding.locateAttributeBinding(
componentName componentName
); );
BasicAttributeBinding attribute = (BasicAttributeBinding) componentBinding.locateAttributeBinding( "horsePower" ); BasicAttributeBinding attribute = (BasicAttributeBinding) compositionBinding.locateAttributeBinding( "horsePower" );
assertTrue( attribute.getAttribute().isTypeResolved() ); assertTrue( attribute.getAttribute().isTypeResolved() );
assertEquals( assertEquals(
"Wrong resolved type", "Wrong resolved type",

12
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
View File

@ -137,12 +137,12 @@ public void testSimpleEntityWithSimpleComponentMapping() {
assertRoot( metadata, entityBinding ); assertRoot( metadata, entityBinding );
assertIdAndSimpleProperty( entityBinding ); assertIdAndSimpleProperty( entityBinding );
ComponentAttributeBinding componentAttributeBinding = (ComponentAttributeBinding) entityBinding.locateAttributeBinding( "simpleComponent" ); CompositionAttributeBinding compositionAttributeBinding = (CompositionAttributeBinding) entityBinding.locateAttributeBinding( "simpleComponent" );
assertNotNull( componentAttributeBinding ); assertNotNull( compositionAttributeBinding );
assertSame( componentAttributeBinding.getAttribute().getSingularAttributeType(), componentAttributeBinding.getAttributeContainer() ); assertSame( compositionAttributeBinding.getAttribute().getSingularAttributeType(), compositionAttributeBinding.getAttributeContainer() );
assertEquals( SimpleEntityWithSimpleComponent.class.getName() + ".simpleComponent", componentAttributeBinding.getPathBase() ); assertEquals( SimpleEntityWithSimpleComponent.class.getName() + ".simpleComponent", compositionAttributeBinding.getPathBase() );
assertSame( entityBinding, componentAttributeBinding.seekEntityBinding() ); assertSame( entityBinding, compositionAttributeBinding.seekEntityBinding() );
assertNotNull( componentAttributeBinding.getComponent() ); assertNotNull( compositionAttributeBinding.getComponent() );
} }
public abstract void addSourcesForSimpleVersionedEntityBinding(MetadataSources sources); public abstract void addSourcesForSimpleVersionedEntityBinding(MetadataSources sources);