Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-03-03 08:19:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor renaming and #toString fixups

Browse Source
This commit is contained in:
Steve Ebersole 2021-04-20 07:33:14 -05:00
parent 33b0087f2a
commit 19fbf18908
18 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
View File

@ -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 ) {

4
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java
View File

@ -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();
}

13
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedSingularAttributeMapping.java → hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
View File

@ -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 <T> DomainResult<T> createDomainResult(
NavigablePath navigablePath,

5
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
View File

@ -119,6 +119,11 @@ public NavigableRole getNavigableRole() {
return navigableRole;
}
@Override
public String toString() {
return "BasicValuedCollectionPart(" + navigableRole + ")@" + System.identityHashCode( this );
}
@Override
public <T> DomainResult<T> createDomainResult(
NavigablePath navigablePath,

5
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
View File

@ -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,

5
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
View File

@ -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,

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
View File

@ -307,6 +307,6 @@ public int getNumberOfFetchables() {
@Override
public String toString() {
return "EmbeddedAttributeMapping {" + navigableRole + "}";
return "EmbeddedAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this );
}
}

5
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
View File

@ -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,

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java
View File

@ -322,7 +322,7 @@ public String getMappedBy() {
@Override
public String toString() {
return "EntityCollectionPart {" + navigableRole + "}";
return "EntityCollectionPart(" + navigableRole + ")@" + System.identityHashCode( this );
}
@Override

4
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
View File

@ -62,8 +62,8 @@ public EntityVersionMappingImpl(
}
@Override
public BasicValuedSingularAttributeMapping getVersionAttribute() {
return (BasicValuedSingularAttributeMapping) declaringType.findAttributeMapping( attributeName );
public BasicAttributeMapping getVersionAttribute() {
return (BasicAttributeMapping) declaringType.findAttributeMapping( attributeName );
}
@Override

6
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
View File

@ -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,

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
View File

@ -876,7 +876,7 @@ public ModelPart getKeyTargetMatchPart() {
@Override
public String toString() {
return "SingularAssociationAttributeMapping {" + navigableRole + "}";
return "ToOneAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this );
}
@Override

8
hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java
View File

@ -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;

6
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java
View File

@ -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();

20
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java
View File

@ -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() );

4
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java
View File

@ -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();

6
hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
View File

@ -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 ) );