From 19fbf18908860d82bab50cd018190a01be92d019 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 20 Apr 2021 07:33:14 -0500 Subject: [PATCH] minor renaming and `#toString` fixups --- .../mapping/EmbeddableMappingType.java | 11 ++++------ .../mapping/EntityVersionMapping.java | 4 ++-- ...apping.java => BasicAttributeMapping.java} | 13 ++++++++---- .../internal/BasicValuedCollectionPart.java | 5 +++++ ...criminatedAssociationAttributeMapping.java | 5 +++++ .../internal/DiscriminatedCollectionPart.java | 5 +++++ .../internal/EmbeddedAttributeMapping.java | 2 +- .../internal/EmbeddedCollectionPart.java | 5 +++++ .../internal/EntityCollectionPart.java | 2 +- .../internal/EntityVersionMappingImpl.java | 4 ++-- .../internal/MappingModelCreationHelper.java | 6 +++--- .../internal/SimpleForeignKeyDescriptor.java | 2 +- .../internal/ToOneAttributeMapping.java | 2 +- .../DynamicResultBuilderAttribute.java | 8 ++++---- ...namicCompositeIdManyToOneBindingTests.java | 6 +++--- .../orm/test/mapping/SmokeTests.java | 20 +++++++++---------- .../readwrite/AbstractReadWriteTests.java | 4 ++-- .../sql/NativeQueryResultBuilderTests.java | 6 +++--- 18 files changed, 66 insertions(+), 44 deletions(-) rename hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/{BasicValuedSingularAttributeMapping.java => BasicAttributeMapping.java} (97%) diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java index 45033c76d3..8a294a5d35 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java @@ -19,8 +19,6 @@ import org.hibernate.SharedSessionContract; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.FetchStrategy; -import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; @@ -37,12 +35,11 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Table; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.metamodel.mapping.internal.DiscriminatedAssociationAttributeMapping; import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper; import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.mapping.internal.SelectableMappingsImpl; -import org.hibernate.metamodel.mapping.internal.SimpleForeignKeyDescriptor; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy; @@ -190,10 +187,10 @@ private EmbeddableMappingType( int currentIndex = 0; // We copy the attributes from the inverse mappings and replace the selection mappings for ( AttributeMapping attributeMapping : inverseMappingType.attributeMappings ) { - if ( attributeMapping instanceof BasicValuedSingularAttributeMapping ) { - final BasicValuedSingularAttributeMapping original = (BasicValuedSingularAttributeMapping) attributeMapping; + if ( attributeMapping instanceof BasicAttributeMapping ) { + final BasicAttributeMapping original = (BasicAttributeMapping) attributeMapping; final SelectableMapping selectableMapping = selectableMappings.getSelectable( currentIndex ); - attributeMapping = BasicValuedSingularAttributeMapping.withSelectableMapping( original, selectableMapping ); + attributeMapping = BasicAttributeMapping.withSelectableMapping( original, selectableMapping ); currentIndex++; } else if ( attributeMapping instanceof ToOneAttributeMapping ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java index 354692d04f..82dfeaa0e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java @@ -6,11 +6,11 @@ */ package org.hibernate.metamodel.mapping; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; /** * @author Steve Ebersole */ public interface EntityVersionMapping extends BasicValuedModelPart { - BasicValuedSingularAttributeMapping getVersionAttribute(); + BasicAttributeMapping getVersionAttribute(); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedSingularAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedSingularAttributeMapping.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java index 3590cb8c77..993f7bc0b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedSingularAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java @@ -45,7 +45,7 @@ * @author Steve Ebersole */ @SuppressWarnings("rawtypes") -public class BasicValuedSingularAttributeMapping +public class BasicAttributeMapping extends AbstractSingularAttributeMapping implements SingularAttributeMapping, BasicValuedModelPart, ConvertibleModelPart { private final NavigableRole navigableRole; @@ -62,7 +62,7 @@ public class BasicValuedSingularAttributeMapping private final JavaTypeDescriptor domainTypeDescriptor; @SuppressWarnings("WeakerAccess") - public BasicValuedSingularAttributeMapping( + public BasicAttributeMapping( String attributeName, NavigableRole navigableRole, int stateArrayPosition, @@ -102,7 +102,7 @@ public BasicValuedSingularAttributeMapping( } } - public static BasicValuedSingularAttributeMapping withSelectableMapping( + public static BasicAttributeMapping withSelectableMapping( BasicValuedModelPart original, SelectableMapping selectableMapping) { String attributeName = null; @@ -129,7 +129,7 @@ else if ( original instanceof SingularAttributeMapping ) { if ( original instanceof ConvertibleModelPart ) { valueConverter = ( (ConvertibleModelPart) original ).getValueConverter(); } - return new BasicValuedSingularAttributeMapping( + return new BasicAttributeMapping( attributeName, original.getNavigableRole(), stateArrayPosition, @@ -197,6 +197,11 @@ public NavigableRole getNavigableRole() { return navigableRole; } + @Override + public String toString() { + return "BasicAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this ); + } + @Override public DomainResult createDomainResult( NavigablePath navigablePath, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java index cf3e341c31..fda4d9d922 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java @@ -119,6 +119,11 @@ public NavigableRole getNavigableRole() { return navigableRole; } + @Override + public String toString() { + return "BasicValuedCollectionPart(" + navigableRole + ")@" + System.identityHashCode( this ); + } + @Override public DomainResult createDomainResult( NavigablePath navigablePath, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java index 95a7b6d0ed..b0ae163173 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java @@ -112,6 +112,11 @@ public Object resolveDiscriminatorForEntityType(EntityMappingType entityMappingT return discriminatorMapping.resolveDiscriminatorValueToEntityMapping( entityMappingType ); } + @Override + public String toString() { + return "DiscriminatedAssociationAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this ); + } + @Override public Fetch generateFetch( FetchParent fetchParent, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java index d5fd8ff038..81ed021c37 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java @@ -95,6 +95,11 @@ public FetchOptions getMappedFetchOptions() { return discriminatorMapping; } + @Override + public String toString() { + return "DiscriminatedCollectionPart(" + getNavigableRole() + ")@" + System.identityHashCode( this ); + } + @Override public Fetch generateFetch( FetchParent fetchParent, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java index 082b6ec6e6..12356df8d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java @@ -307,6 +307,6 @@ public int getNumberOfFetchables() { @Override public String toString() { - return "EmbeddedAttributeMapping {" + navigableRole + "}"; + return "EmbeddedAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java index 2219f22d7d..5996f301c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java @@ -140,6 +140,11 @@ public FetchOptions getMappedFetchOptions() { return this; } + @Override + public String toString() { + return "EmbeddedCollectionPart(" + getNavigableRole() + ")@" + System.identityHashCode( this ); + } + @Override public Fetch generateFetch( FetchParent fetchParent, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java index dde59aa63b..919ff716f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java @@ -322,7 +322,7 @@ public String getMappedBy() { @Override public String toString() { - return "EntityCollectionPart {" + navigableRole + "}"; + return "EntityCollectionPart(" + navigableRole + ")@" + System.identityHashCode( this ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java index 50f573671e..41f7573bc6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java @@ -62,8 +62,8 @@ public EntityVersionMappingImpl( } @Override - public BasicValuedSingularAttributeMapping getVersionAttribute() { - return (BasicValuedSingularAttributeMapping) declaringType.findAttributeMapping( attributeName ); + public BasicAttributeMapping getVersionAttribute() { + return (BasicAttributeMapping) declaringType.findAttributeMapping( attributeName ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java index aaa6d5618d..a80a98692a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java @@ -277,7 +277,7 @@ else if ( idSubPropertyType instanceof EntityType ) { // Non-identifier attributes @SuppressWarnings("rawtypes") - public static BasicValuedSingularAttributeMapping buildBasicAttributeMapping( + public static BasicAttributeMapping buildBasicAttributeMapping( String attrName, NavigableRole navigableRole, int stateArrayPosition, @@ -373,7 +373,7 @@ public CascadeStyle getCascadeStyle() { ); - return new BasicValuedSingularAttributeMapping( + return new BasicAttributeMapping( attrName, navigableRole, stateArrayPosition, @@ -391,7 +391,7 @@ public CascadeStyle getCascadeStyle() { ); } else { - return new BasicValuedSingularAttributeMapping( + return new BasicAttributeMapping( attrName, navigableRole, stateArrayPosition, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java index 8cbf9fe9e9..e13a3f7708 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java @@ -72,7 +72,7 @@ public SimpleForeignKeyDescriptor( assert targetModelPart != null; assert disassemblyValueExtractor != null; - this.keySide = BasicValuedSingularAttributeMapping.withSelectableMapping( targetModelPart, keySelectableMapping ); + this.keySide = BasicAttributeMapping.withSelectableMapping( targetModelPart, keySelectableMapping ); this.targetSide = targetModelPart; this.disassemblyValueExtractor = disassemblyValueExtractor; this.refersToPrimaryKey = refersToPrimaryKey; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java index 2ea6cc0c62..a0f9b9b979 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java @@ -876,7 +876,7 @@ public ModelPart getKeyTargetMatchPart() { @Override public String toString() { - return "SingularAssociationAttributeMapping {" + navigableRole + "}"; + return "ToOneAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java index 15035227b4..3f9e33640e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java @@ -10,7 +10,7 @@ import java.util.function.BiFunction; import org.hibernate.metamodel.mapping.SingularAttributeMapping; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.query.results.SqlSelectionImpl; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.results.graph.DomainResult; @@ -24,7 +24,7 @@ * @author Steve Ebersole */ public class DynamicResultBuilderAttribute implements DynamicResultBuilder { - private final BasicValuedSingularAttributeMapping attributeMapping; + private final BasicAttributeMapping attributeMapping; private final String columnAlias; private final String entityName; private final String attributePath; @@ -34,7 +34,7 @@ public DynamicResultBuilderAttribute( String columnAlias, String entityName, String attributePath) { - final boolean allowable = attributeMapping instanceof BasicValuedSingularAttributeMapping; + final boolean allowable = attributeMapping instanceof BasicAttributeMapping; if ( !allowable ) { throw new IllegalArgumentException( String.format( @@ -47,7 +47,7 @@ public DynamicResultBuilderAttribute( ); } - this.attributeMapping = (BasicValuedSingularAttributeMapping) attributeMapping; + this.attributeMapping = (BasicAttributeMapping) attributeMapping; this.columnAlias = columnAlias; this.entityName = entityName; this.attributePath = attributePath; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java index 5b8d78409c..eb25f6ed13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java @@ -11,7 +11,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.metamodel.mapping.internal.EmbeddedIdentifierMappingImpl; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.persister.entity.EntityPersister; @@ -57,7 +57,7 @@ public void testBinding(ServiceRegistryScope scope) { final AttributeMapping key1 = cid.getEmbeddableTypeDescriptor().findAttributeMapping( "key1" ); assertThat( key1, notNullValue() ); - assertThat( key1, instanceOf( BasicValuedSingularAttributeMapping.class ) ); + assertThat( key1, instanceOf( BasicAttributeMapping.class ) ); final AttributeMapping key2 = cid.getEmbeddableTypeDescriptor().findAttributeMapping( "key2" ); assertThat( key2, notNullValue() ); @@ -65,7 +65,7 @@ public void testBinding(ServiceRegistryScope scope) { final AttributeMapping attr1 = entityDescriptor.findAttributeMapping( "attr1" ); assertThat( attr1, notNullValue() ); - assertThat( attr1, instanceOf( BasicValuedSingularAttributeMapping.class ) ); + assertThat( attr1, instanceOf( BasicAttributeMapping.class ) ); } finally { sessionFactory.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java index 41a6b11171..8ee52dc40e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java @@ -22,7 +22,7 @@ import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; @@ -71,15 +71,15 @@ public void testSimpleEntity(SessionFactoryScope scope) { { final ModelPart namePart = entityDescriptor.findSubPart( "name" ); - assert namePart instanceof BasicValuedSingularAttributeMapping; - assert "mapping_simple_entity".equals( ( (BasicValuedSingularAttributeMapping) namePart ).getContainingTableExpression() ); - assert "name".equals( ( (BasicValuedSingularAttributeMapping) namePart ).getSelectionExpression() ); + assert namePart instanceof BasicAttributeMapping; + assert "mapping_simple_entity".equals( ( (BasicAttributeMapping) namePart ).getContainingTableExpression() ); + assert "name".equals( ( (BasicAttributeMapping) namePart ).getSelectionExpression() ); } { final ModelPart genderPart = entityDescriptor.findSubPart( "gender" ); - assert genderPart instanceof BasicValuedSingularAttributeMapping; - final BasicValuedSingularAttributeMapping genderAttrMapping = (BasicValuedSingularAttributeMapping) genderPart; + assert genderPart instanceof BasicAttributeMapping; + final BasicAttributeMapping genderAttrMapping = (BasicAttributeMapping) genderPart; assert "mapping_simple_entity".equals( genderAttrMapping.getContainingTableExpression() ); assert "gender".equals( genderAttrMapping.getSelectionExpression() ); @@ -95,8 +95,8 @@ public void testSimpleEntity(SessionFactoryScope scope) { { final ModelPart part = entityDescriptor.findSubPart( "gender2" ); - assert part instanceof BasicValuedSingularAttributeMapping; - final BasicValuedSingularAttributeMapping attrMapping = (BasicValuedSingularAttributeMapping) part; + assert part instanceof BasicAttributeMapping; + final BasicAttributeMapping attrMapping = (BasicAttributeMapping) part; assert "mapping_simple_entity".equals( attrMapping.getContainingTableExpression() ); assert "gender2".equals( attrMapping.getSelectionExpression() ); @@ -112,8 +112,8 @@ public void testSimpleEntity(SessionFactoryScope scope) { { final ModelPart part = entityDescriptor.findSubPart( "gender3" ); - assert part instanceof BasicValuedSingularAttributeMapping; - final BasicValuedSingularAttributeMapping attrMapping = (BasicValuedSingularAttributeMapping) part; + assert part instanceof BasicAttributeMapping; + final BasicAttributeMapping attrMapping = (BasicAttributeMapping) part; assert "mapping_simple_entity".equals( attrMapping.getContainingTableExpression() ); assert "gender3".equals( attrMapping.getSelectionExpression() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java index c56d316044..e7df9a726a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java @@ -10,7 +10,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Property; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.SessionFactory; @@ -41,7 +41,7 @@ public void test(SessionFactoryScope scope) { final EntityMappingType entityMapping = scope.getSessionFactory() .getRuntimeMetamodels() .getEntityMappingType( ReadWriteEntity.class ); - final BasicValuedSingularAttributeMapping attribute = (BasicValuedSingularAttributeMapping) entityMapping.findAttributeMapping( "value" ); + final BasicAttributeMapping attribute = (BasicAttributeMapping) entityMapping.findAttributeMapping( "value" ); attribute.forEachSelectable( (i, selectable) -> { final String readExpression = selectable.getCustomReadExpression(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java index 08d4c4fe08..a33abde6bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java @@ -18,7 +18,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.internal.BasicValuedSingularAttributeMapping; +import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; import org.hibernate.query.sql.spi.NativeQueryImplementor; @@ -283,8 +283,8 @@ public void verifyModel(SessionFactoryScope scope) { .getEntityMappingType( EntityOfBasics.class ); final ModelPart part = entityDescriptor.findSubPart( "convertedGender", null ); - assertThat( part, instanceOf( BasicValuedSingularAttributeMapping.class ) ); - final BasicValuedSingularAttributeMapping attrMapping = (BasicValuedSingularAttributeMapping) part; + assertThat( part, instanceOf( BasicAttributeMapping.class ) ); + final BasicAttributeMapping attrMapping = (BasicAttributeMapping) part; assertThat( attrMapping.getJavaTypeDescriptor().getJavaTypeClass(), equalTo( EntityOfBasics.Gender.class ) );