diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java index 1a52b6486f26..acdaa5f698ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java @@ -12,7 +12,6 @@ import org.hibernate.AssertionFailure; import org.hibernate.PropertyNotFoundException; -import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; @@ -145,8 +144,7 @@ public static PersistentAttribute buildAttribute( false, false, property.isOptional(), - property.isGeneric(), - metadataContext + property.isGeneric() ); } @@ -188,8 +186,7 @@ public SingularPersistentAttribute buildIdAttribute( (SqmDomainType) domainType, attributeMetadata.getMember(), attributeMetadata.getAttributeClassification(), - property.isGeneric(), - context + property.isGeneric() ); } @@ -218,8 +215,7 @@ public SingularAttributeImpl buildVersionAttribute( property.getName(), attributeMetadata.getAttributeClassification(), (SqmDomainType) domainType, - attributeMetadata.getMember(), - context + attributeMetadata.getMember() ); } @@ -382,8 +378,9 @@ private static JavaType determineRelationalJavaType( DomainType metaModelType, MetadataContext context) { if ( typeContext.getValueClassification() == ValueClassification.BASIC ) { - final ConverterDescriptor descriptor = - ( (SimpleValue) typeContext.getHibernateValue() ).getJpaAttributeConverterDescriptor(); + final var descriptor = + ( (SimpleValue) typeContext.getHibernateValue() ) + .getJpaAttributeConverterDescriptor(); if ( descriptor != null ) { return context.getJavaTypeRegistry().resolveDescriptor( descriptor.getRelationalValueResolvedType().getErasedType() diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java index 5b0f294ab642..e9ae0c6c1579 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java @@ -8,7 +8,6 @@ import java.util.Collection; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.model.domain.SimpleDomainType; import org.hibernate.query.sqm.tree.domain.SqmPluralPersistentAttribute; @@ -37,9 +36,7 @@ public abstract class AbstractPluralAttribute private final CollectionClassification classification; private final SqmPathSource elementPathSource; - protected AbstractPluralAttribute( - PluralAttributeBuilder builder, - MetadataContext metadataContext) { + protected AbstractPluralAttribute(PluralAttributeBuilder builder) { super( builder.getDeclaringType(), builder.getProperty().getName(), diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java index e260ae0c0983..74108a66863d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java @@ -6,7 +6,6 @@ import java.util.Collection; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.query.hql.spi.SqmCreationState; import org.hibernate.query.sqm.tree.SqmJoinType; import org.hibernate.query.sqm.tree.domain.SqmBagJoin; @@ -21,8 +20,8 @@ public class BagAttributeImpl extends AbstractPluralAttribute, E> implements SqmBagPersistentAttribute { - public BagAttributeImpl(PluralAttributeBuilder, E, ?> xceBuilder, MetadataContext metadataContext) { - super( xceBuilder, metadataContext ); + public BagAttributeImpl(PluralAttributeBuilder, E, ?> xceBuilder) { + super( xceBuilder ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java index 32c1d464a149..c3c95b9de18a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java @@ -6,7 +6,6 @@ import java.util.List; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.hql.spi.SqmCreationState; @@ -25,8 +24,8 @@ public class ListAttributeImpl implements SqmListPersistentAttribute { private final SqmPathSource indexPathSource; - public ListAttributeImpl(PluralAttributeBuilder, E, ?> builder, MetadataContext metadataContext) { - super( builder, metadataContext ); + public ListAttributeImpl(PluralAttributeBuilder, E, ?> builder) { + super( builder ); //noinspection unchecked this.indexPathSource = (SqmPathSource) SqmMappingModelHelper.resolveSqmKeyPathSource( diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java index 7aff11b32d04..2b94f7a2fb3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java @@ -6,7 +6,6 @@ import java.util.Map; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.model.domain.SimpleDomainType; import org.hibernate.query.sqm.SqmPathSource; @@ -26,8 +25,8 @@ public class MapAttributeImpl implements SqmMapPersistentAttribute { private final SqmPathSource keyPathSource; - public MapAttributeImpl(PluralAttributeBuilder, V, K> xceBuilder, MetadataContext metadataContext) { - super( xceBuilder, metadataContext ); + public MapAttributeImpl(PluralAttributeBuilder, V, K> xceBuilder) { + super( xceBuilder ); keyPathSource = SqmMappingModelHelper.resolveSqmKeyPathSource( xceBuilder.getListIndexOrMapKeyType(), BindableType.PLURAL_ATTRIBUTE, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java index 720823320518..c920d05e358e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java @@ -64,7 +64,6 @@ public PluralAttributeBuilder( this.member = member; } - @SuppressWarnings({ "unchecked", "rawtypes" }) public static PersistentAttribute build( PluralAttributeMetadata attributeMetadata, boolean isGeneric, @@ -74,7 +73,7 @@ public static PersistentAttribute build( metadataContext.getTypeConfiguration().getJavaTypeRegistry() .getDescriptor( attributeMetadata.getJavaType() ); - final PluralAttributeBuilder builder = new PluralAttributeBuilder<>( + final var builder = new PluralAttributeBuilder<>( attributeJtd, isGeneric, attributeMetadata.getAttributeClassification(), @@ -87,35 +86,36 @@ public static PersistentAttribute build( attributeMetadata.getMember() ); - if ( Map.class.equals( attributeJtd.getJavaTypeClass() ) ) { - return new MapAttributeImpl( builder, metadataContext ); + final Class javaClass = attributeJtd.getJavaTypeClass(); + if ( Map.class.equals( javaClass ) ) { + return new MapAttributeImpl( builder ); } - else if ( Set.class.equals( attributeJtd.getJavaTypeClass() ) ) { - return new SetAttributeImpl( builder, metadataContext ); + else if ( Set.class.equals( javaClass ) ) { + return new SetAttributeImpl( builder ); } - else if ( List.class.equals( attributeJtd.getJavaTypeClass() ) ) { - return new ListAttributeImpl( builder, metadataContext ); + else if ( List.class.equals( javaClass ) ) { + return new ListAttributeImpl( builder ); } - else if ( Collection.class.equals( attributeJtd.getJavaTypeClass() ) ) { - return new BagAttributeImpl( builder, metadataContext ); + else if ( Collection.class.equals( javaClass ) ) { + return new BagAttributeImpl( builder ); } //apply loose rules - if ( attributeJtd.getJavaTypeClass().isArray() ) { - return new ListAttributeImpl( builder, metadataContext ); + if ( javaClass.isArray() ) { + return new ListAttributeImpl( builder ); } - if ( Map.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) { - return new MapAttributeImpl( builder, metadataContext ); + if ( Map.class.isAssignableFrom( javaClass ) ) { + return new MapAttributeImpl( builder ); } - else if ( Set.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) { - return new SetAttributeImpl( builder, metadataContext ); + else if ( Set.class.isAssignableFrom( javaClass ) ) { + return new SetAttributeImpl( builder ); } - else if ( List.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) { - return new ListAttributeImpl( builder, metadataContext ); + else if ( List.class.isAssignableFrom( javaClass ) ) { + return new ListAttributeImpl( builder ); } - else if ( Collection.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) { - return new BagAttributeImpl( builder, metadataContext ); + else if ( Collection.class.isAssignableFrom( javaClass ) ) { + return new BagAttributeImpl( builder ); } throw new UnsupportedMappingException( "Unknown collection: " + attributeJtd.getJavaType() ); @@ -124,13 +124,15 @@ else if ( Collection.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) private static SimpleDomainType determineListIndexOrMapKeyType( PluralAttributeMetadata attributeMetadata, MetadataContext metadataContext) { - if ( Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) { - return (SimpleDomainType) determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext ); + final Class javaType = attributeMetadata.getJavaType(); + if ( Map.class.isAssignableFrom( javaType ) ) { + return (SimpleDomainType) + determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext ); } - if ( List.class.isAssignableFrom( attributeMetadata.getJavaType() ) - || attributeMetadata.getJavaType().isArray() ) { - return metadataContext.getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( Integer.class ); + if ( List.class.isAssignableFrom( javaType ) || javaType.isArray() ) { + return metadataContext.getTypeConfiguration().getBasicTypeRegistry() + .getRegisteredType( Integer.class ); } return null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java index 46780ec2a81e..b288118ecce1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java @@ -6,7 +6,6 @@ import java.util.Set; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.query.hql.spi.SqmCreationState; import org.hibernate.query.sqm.tree.SqmJoinType; import org.hibernate.query.sqm.tree.domain.SqmSetJoin; @@ -21,8 +20,8 @@ public class SetAttributeImpl extends AbstractPluralAttribute, E> implements SqmSetPersistentAttribute { - public SetAttributeImpl(PluralAttributeBuilder, E, ?> xceBuilder, MetadataContext metadataContext) { - super( xceBuilder, metadataContext ); + public SetAttributeImpl(PluralAttributeBuilder, E, ?> xceBuilder) { + super( xceBuilder ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java index 4b5e652d98f1..9ef5d8703706 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java @@ -8,7 +8,6 @@ import java.lang.reflect.Member; import org.hibernate.metamodel.AttributeClassification; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.model.domain.AnyMappingDomainType; import org.hibernate.metamodel.model.domain.IdentifiableDomainType; @@ -63,8 +62,7 @@ public SingularAttributeImpl( boolean isIdentifier, boolean isVersion, boolean isOptional, - boolean isGeneric, - MetadataContext metadataContext) { + boolean isGeneric) { super( declaringType, name, @@ -210,8 +208,7 @@ public Identifier( SqmDomainType attributeType, Member member, AttributeClassification attributeClassification, - boolean isGeneric, - MetadataContext metadataContext) { + boolean isGeneric) { super( declaringType, name, @@ -222,8 +219,7 @@ public Identifier( true, false, false, - isGeneric, - metadataContext + isGeneric ); } @@ -260,8 +256,7 @@ public Version( String name, AttributeClassification attributeClassification, SqmDomainType attributeType, - Member member, - MetadataContext metadataContext) { + Member member) { super( declaringType, name, @@ -272,8 +267,7 @@ public Version( false, true, false, - false, - metadataContext + false ); } } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java index 54aa932cc2f1..187aedb60109 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java @@ -51,9 +51,6 @@ import org.hibernate.mapping.Property; import org.hibernate.metamodel.AttributeClassification; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.metamodel.internal.JpaMetamodelPopulationSetting; -import org.hibernate.metamodel.internal.JpaStaticMetamodelPopulationSetting; -import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.model.domain.BasicDomainType; @@ -125,6 +122,7 @@ import org.hibernate.type.descriptor.jdbc.ObjectJdbcType; import org.hibernate.type.spi.TypeConfiguration; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -160,7 +158,7 @@ public abstract class MockSessionFactory private final MappingMetamodelImpl metamodel; private final MetadataImplementor bootModel; - private final MetadataContext metadataContext; +// private final MetadataContext metadataContext; private final NodeBuilder nodeBuilder; private final SqlTranslationEngine sqlTranslationEngine; @@ -190,7 +188,7 @@ public Class classForName(String className) { true, classLoaderService, new StrategySelectorImpl( classLoaderService ), - () -> emptyList() + Collections::emptyList ), // new BootstrapServiceRegistryBuilder().applyClassLoaderService( classLoaderService ).build(), singletonList(MockJdbcServicesInitiator.INSTANCE), @@ -225,15 +223,15 @@ public Class classForName(String className) { this ); - metadataContext = new MetadataContext( - metamodel.getJpaMetamodel(), - metamodel, - bootModel, - JpaStaticMetamodelPopulationSetting.DISABLED, - JpaMetamodelPopulationSetting.DISABLED, - this, - classLoaderService - ); +// metadataContext = new MetadataContext( +// metamodel.getJpaMetamodel(), +// metamodel, +// bootModel, +// JpaStaticMetamodelPopulationSetting.DISABLED, +// JpaMetamodelPopulationSetting.DISABLED, +// this, +// classLoaderService +// ); typeConfiguration = new TypeConfiguration(); typeConfiguration.scope((MetadataBuildingContext) this); @@ -962,8 +960,7 @@ public MockEntityDomainType(JavaType javaType, String jpaEntityName) { false, true, false, - false, - metadataContext + false ); } } @@ -1077,8 +1074,7 @@ else if ( type.isEntityType() ) { false, false, true, - false, - metadataContext + false ); } else if ( type.isComponentType() ) { @@ -1093,8 +1089,7 @@ else if ( type.isComponentType() ) { false, false, true, - false, - metadataContext + false ); } else { @@ -1110,8 +1105,7 @@ else if ( type.isComponentType() ) { false, false, true, - false, - metadataContext + false ); } } @@ -1169,8 +1163,7 @@ private AbstractPluralAttribute createPluralAttribute( owner, property, null - ), - metadataContext + ) ); case BAG, ID_BAG -> new BagAttributeImpl( new PluralAttributeBuilder<>( @@ -1183,8 +1176,7 @@ private AbstractPluralAttribute createPluralAttribute( owner, property, null - ), - metadataContext + ) ); case SET, SORTED_SET, ORDERED_SET -> new SetAttributeImpl( new PluralAttributeBuilder<>( @@ -1197,8 +1189,7 @@ private AbstractPluralAttribute createPluralAttribute( owner, property, null - ), - metadataContext + ) ); case MAP, SORTED_MAP, ORDERED_MAP -> new MapAttributeImpl( new PluralAttributeBuilder<>( @@ -1211,8 +1202,7 @@ private AbstractPluralAttribute createPluralAttribute( owner, property, null - ), - metadataContext + ) ); default -> null; };