get rid of an unused parameter in constrictors of XxxxAttributeImpl

and thereby simplify the MockSessionFactory

Author: gavinking

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 <X, Y> PersistentAttribute<X, Y> buildAttribute(
 				false,
 				false,
 				property.isOptional(),
-				property.isGeneric(),
-				metadataContext
+				property.isGeneric()
 		);
 	}
 
@@ -188,8 +186,7 @@ public <X, Y> SingularPersistentAttribute<X, Y> buildIdAttribute(
 				(SqmDomainType<Y>) domainType,
 				attributeMetadata.getMember(),
 				attributeMetadata.getAttributeClassification(),
-				property.isGeneric(),
-				context
+				property.isGeneric()
 		);
 	}
 
@@ -218,8 +215,7 @@ public <X, Y> SingularAttributeImpl<X, Y> buildVersionAttribute(
 				property.getName(),
 				attributeMetadata.getAttributeClassification(),
 				(SqmDomainType<Y>) 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()

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<D, C, E>
 	private final CollectionClassification classification;
 	private final SqmPathSource<E> elementPathSource;
 
-	protected AbstractPluralAttribute(
-			PluralAttributeBuilder<D,C,E,?> builder,
-			MetadataContext metadataContext) {
+	protected AbstractPluralAttribute(PluralAttributeBuilder<D,C,E,?> builder) {
 		super(
 				builder.getDeclaringType(),
 				builder.getProperty().getName(),

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<X, E>
 		extends AbstractPluralAttribute<X, Collection<E>, E>
 		implements SqmBagPersistentAttribute<X, E> {
 
-	public BagAttributeImpl(PluralAttributeBuilder<X, Collection<E>, E, ?> xceBuilder, MetadataContext metadataContext) {
-		super( xceBuilder, metadataContext );
+	public BagAttributeImpl(PluralAttributeBuilder<X, Collection<E>, E, ?> xceBuilder) {
+		super( xceBuilder );
 	}
 
 	@Override

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<X, E>
 		implements SqmListPersistentAttribute<X, E> {
 	private final SqmPathSource<Integer> indexPathSource;
 
-	public ListAttributeImpl(PluralAttributeBuilder<X, List<E>, E, ?> builder, MetadataContext metadataContext) {
-		super( builder, metadataContext );
+	public ListAttributeImpl(PluralAttributeBuilder<X, List<E>, E, ?> builder) {
+		super( builder );
 
 		//noinspection unchecked
 		this.indexPathSource = (SqmPathSource<Integer>) SqmMappingModelHelper.resolveSqmKeyPathSource(

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<X, K, V>
 		implements SqmMapPersistentAttribute<X, K, V> {
 	private final SqmPathSource<K> keyPathSource;
 
-	public MapAttributeImpl(PluralAttributeBuilder<X, Map<K, V>, V, K> xceBuilder, MetadataContext metadataContext) {
-		super( xceBuilder, metadataContext );
+	public MapAttributeImpl(PluralAttributeBuilder<X, Map<K, V>, V, K> xceBuilder) {
+		super( xceBuilder );
 		keyPathSource = SqmMappingModelHelper.resolveSqmKeyPathSource(
 				xceBuilder.getListIndexOrMapKeyType(),
 				BindableType.PLURAL_ATTRIBUTE,

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 <Y, X> PersistentAttribute<X, Y> build(
 			PluralAttributeMetadata<?,Y,?> attributeMetadata,
 			boolean isGeneric,
@@ -74,7 +73,7 @@ public static <Y, X> PersistentAttribute<X, Y> 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 <Y, X> PersistentAttribute<X, Y> build(
 				attributeMetadata.getMember()
 		);
 
-		if ( Map.class.equals( attributeJtd.getJavaTypeClass() ) ) {
-			return new MapAttributeImpl( builder, metadataContext );
+		final Class<Y> 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;

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<X, E>
 		extends AbstractPluralAttribute<X, Set<E>, E>
 		implements SqmSetPersistentAttribute<X, E> {
 
-	public SetAttributeImpl(PluralAttributeBuilder<X, Set<E>, E, ?> xceBuilder, MetadataContext metadataContext) {
-		super( xceBuilder, metadataContext );
+	public SetAttributeImpl(PluralAttributeBuilder<X, Set<E>, E, ?> xceBuilder) {
+		super( xceBuilder );
 	}
 
 	@Override

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<J> 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<Y> attributeType,
-				Member member,
-				MetadataContext metadataContext) {
+				Member member) {
 			super(
 					declaringType,
 					name,
@@ -272,8 +267,7 @@ public Version(
 					false,
 					true,
 					false,
-					false,
-					metadataContext
+					false
 			);
 		}
 	}