fix some typecasts

gavinking · gavinking · commit 044ad2ced3fb · 2024-12-31T17:47:18.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
@@ -402,8 +402,8 @@ else if ( value instanceof Component component ) {
 				component.setTypeName( typeName );
 			}
 		}
-		else if ( value instanceof SimpleValue ) {
-			( (SimpleValue) value ).setTypeName( typeName );
+		else if ( value instanceof SimpleValue simpleValue ) {
+			simpleValue.setTypeName( typeName );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -2419,8 +2419,8 @@ private static void handleGenerationTiming(
 			GenerationTiming timing) {
 		if ( timing != null ) {
 			if ( (timing == GenerationTiming.INSERT || timing == GenerationTiming.UPDATE)
-					&& property.getValue() instanceof SimpleValue
-					&& ((SimpleValue) property.getValue()).isVersion() ) {
+					&& property.getValue() instanceof SimpleValue simpleValue
+					&& simpleValue.isVersion() ) {
 				// this is enforced by DTD, but just make sure
 				throw new MappingException(
 						"'generated' attribute cannot be 'insert' or 'update' for version/timestamp property",
@@ -2685,8 +2685,8 @@ private static void bindSimpleValueType(
 
 		if ( CollectionHelper.isNotEmpty( typeResolution.parameters ) ) {
 			simpleValue.setTypeParameters( typeResolution.parameters );
-			if ( simpleValue instanceof BasicValue ) {
-				( (BasicValue) simpleValue ).setExplicitTypeParams( typeResolution.parameters );
+			if ( simpleValue instanceof BasicValue basicValue ) {
+				basicValue.setExplicitTypeParams( typeResolution.parameters );
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java
@@ -185,18 +185,12 @@ protected MappingModelExpressible<?> getMappingModelExpressible(
 								.getSortExpression()
 								.accept( walker );
 				final JdbcMappingContainer expressionType = expression.getExpressionType();
-				if ( expressionType instanceof BasicValuedMapping ) {
-					return (BasicValuedMapping) expressionType;
+				if ( expressionType instanceof BasicValuedMapping basicValuedMapping ) {
+					return basicValuedMapping;
 				}
 				try {
-					return walker.getCreationContext()
-							.getSessionFactory()
-							.getRuntimeMetamodels()
-							.getMappingMetamodel()
-							.resolveMappingExpressible(
-									getNodeType(),
-									walker.getFromClauseAccess()::getTableGroup
-							);
+					return walker.getCreationContext().getSessionFactory().getMappingMetamodel()
+							.resolveMappingExpressible( getNodeType(), walker.getFromClauseAccess()::getTableGroup );
 				}
 				catch (Exception e) {
 					return null; // this works at least approximately
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java
@@ -48,8 +48,8 @@ public ReturnableType<?> resolveFunctionReturnType(
 			if ( inferredType instanceof ReturnableType<?> ) {
 				return (ReturnableType<?>) inferredType;
 			}
-			else if ( inferredType instanceof BasicValuedMapping ) {
-				return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();
+			else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {
+				return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();
 			}
 		}
 		if ( impliedType != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java
@@ -52,8 +52,8 @@ public ReturnableType<?> resolveFunctionReturnType(
 			if ( inferredType instanceof ReturnableType<?> ) {
 				return (ReturnableType<?>) inferredType;
 			}
-			else if ( inferredType instanceof BasicValuedMapping ) {
-				return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();
+			else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {
+				return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();
 			}
 		}
 		if ( impliedType != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java
@@ -9,7 +9,6 @@
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver;
@@ -41,26 +40,23 @@ public ReturnableType<?> resolveFunctionReturnType(
 			@Nullable SqmToSqlAstConverter converter,
 			List<? extends SqmTypedNode<?>> arguments,
 			TypeConfiguration typeConfiguration) {
-		final MappingModelExpressible<?> inferredType = converter == null
-				? null
-				: converter.resolveFunctionImpliedReturnType();
+		final MappingModelExpressible<?> inferredType =
+				converter == null ? null : converter.resolveFunctionImpliedReturnType();
 		if ( inferredType != null ) {
-			if ( inferredType instanceof ReturnableType<?> ) {
-				return (ReturnableType<?>) inferredType;
+			if ( inferredType instanceof ReturnableType<?> returnableType ) {
+				return returnableType;
 			}
-			else if ( inferredType instanceof BasicValuedMapping ) {
-				return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();
+			else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {
+				return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();
 			}
 		}
 		if ( impliedType != null ) {
 			return impliedType;
 		}
 		final SqmExpressible<?> expressible = arguments.get( arrayIndex ).getExpressible();
-		final DomainType<?> type;
-		if ( expressible != null && ( type = expressible.getSqmType() ) instanceof BasicPluralType<?, ?> ) {
-			return ( (BasicPluralType<?, ?>) type ).getElementType();
-		}
-		return null;
+		return expressible != null && expressible.getSqmType() instanceof BasicPluralType<?, ?> type
+				? type.getElementType()
+				: null;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.DomainType;
@@ -52,11 +51,11 @@ public ReturnableType<?> resolveFunctionReturnType(
 			}
 			final MappingModelExpressible<?> inferredType = converter.resolveFunctionImpliedReturnType();
 			if ( inferredType != null ) {
-				if ( inferredType instanceof ReturnableType<?> ) {
-					return (ReturnableType<?>) inferredType;
+				if ( inferredType instanceof ReturnableType<?> returnableType ) {
+					return returnableType;
 				}
-				else if ( inferredType instanceof BasicValuedMapping ) {
-					return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();
+				else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {
+					return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();
 				}
 			}
 		}
@@ -79,25 +78,25 @@ public BasicValuedMapping resolveFunctionReturnType(
 		return null;
 	}
 
-	@SuppressWarnings("unchecked")
-	public static BasicType<?> resolveJsonArrayType(DomainType<?> elementType, TypeConfiguration typeConfiguration) {
-		@SuppressWarnings("unchecked") final BasicPluralJavaType<Object> arrayJavaType = (BasicPluralJavaType<Object>) typeConfiguration.getJavaTypeRegistry()
-				.getDescriptor(
-						Array.newInstance( elementType.getBindableJavaType(), 0 ).getClass()
-				);
-		final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-		final JdbcTypeIndicators jdbcTypeIndicators = new DelegatingJdbcTypeIndicators( typeConfiguration.getCurrentBaseSqlTypeIndicators() ) {
-			@Override
-			public Integer getExplicitJdbcTypeCode() {
-				return SqlTypes.JSON;
-			}
-		};
+	public static <T> BasicType<?> resolveJsonArrayType(DomainType<T> elementType, TypeConfiguration typeConfiguration) {
+		final Class<?> arrayClass = Array.newInstance( elementType.getBindableJavaType(), 0 ).getClass();
+		@SuppressWarnings("unchecked")
+		final BasicPluralJavaType<T> arrayJavaType =
+				(BasicPluralJavaType<T>)
+						typeConfiguration.getJavaTypeRegistry()
+								.getDescriptor( arrayClass );
+		final JdbcTypeIndicators currentBaseSqlTypeIndicators = typeConfiguration.getCurrentBaseSqlTypeIndicators();
 		return arrayJavaType.resolveType(
 				typeConfiguration,
-				dialect,
-				(BasicType<Object>) elementType,
+				currentBaseSqlTypeIndicators.getDialect(),
+				(BasicType<T>) elementType,
 				null,
-				jdbcTypeIndicators
+				new DelegatingJdbcTypeIndicators( currentBaseSqlTypeIndicators ) {
+					@Override
+					public Integer getExplicitJdbcTypeCode() {
+						return SqlTypes.JSON;
+					}
+				}
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java
@@ -91,8 +91,8 @@ public boolean resolve(MetadataBuildingContext buildingContext) {
 
 	@Override
 	public BasicValue.Resolution<?> resolve() {
-		if ( wrappedValue instanceof BasicValue ) {
-			return ( (BasicValue) wrappedValue ).resolve();
+		if ( wrappedValue instanceof BasicValue basicValue ) {
+			return basicValue.resolve();
 		}
 		// not sure it is ever possible
 		throw new UnsupportedOperationException("Trying to resolve the wrapped value but it is non a BasicValue");
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
@@ -920,7 +920,7 @@ public boolean hasPartitionedSelectionMapping() {
 		}
 		for ( Property property : getProperties() ) {
 			final Value value = property.getValue();
-			if ( value instanceof BasicValue && ( (BasicValue) value ).isPartitionKey() ) {
+			if ( value instanceof BasicValue basicValue && basicValue.isPartitionKey() ) {
 				return true;
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
@@ -286,7 +286,7 @@ public boolean isValid(Mapping mapping) throws MappingException {
 
 	public boolean isValid(MappingContext mappingContext) throws MappingException {
 		final Value value = getValue();
-		if ( value instanceof BasicValue && ( (BasicValue) value ).isDisallowedWrapperArray() ) {
+		if ( value instanceof BasicValue basicValue && basicValue.isDisallowedWrapperArray() ) {
 			throw new MappingException(
 					"The property " + persistentClass.getEntityName() + "#" + name +
 							" uses a wrapper type Byte[]/Character[] which indicates an issue in your domain model. " +
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
@@ -816,7 +816,8 @@ public void copyTypeFrom( SimpleValue sourceValue ) {
 
 	@Override
 	public boolean isSame(Value other) {
-		return this == other || other instanceof SimpleValue && isSame( (SimpleValue) other );
+		return this == other
+			|| other instanceof SimpleValue simpleValue && isSame( simpleValue );
 	}
 
 	protected static boolean isSame(Value v1, Value v2) {
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
@@ -164,8 +164,7 @@ default SelectableMapping getJdbcValueSelectable(int columnIndex) {
 				}
 				count++;
 			}
-			else if ( attributeMapping instanceof ToOneAttributeMapping ) {
-				final ToOneAttributeMapping toOneAttributeMapping = (ToOneAttributeMapping) attributeMapping;
+			else if ( attributeMapping instanceof ToOneAttributeMapping toOneAttributeMapping ) {
 				if ( toOneAttributeMapping.getSideNature() == ForeignKeyDescriptor.Nature.KEY ) {
 					final ValuedModelPart keyPart = toOneAttributeMapping.getForeignKeyDescriptor().getKeyPart();
 					if ( keyPart instanceof BasicValuedMapping ) {
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
@@ -1322,8 +1322,7 @@ private static CollectionPart interpretMapKey(
 		final IndexedCollection indexedCollection = (IndexedCollection) bootValueMapping;
 		final Value bootMapKeyDescriptor = indexedCollection.getIndex();
 
-		if ( bootMapKeyDescriptor instanceof BasicValue ) {
-			final BasicValue basicValue = (BasicValue) bootMapKeyDescriptor;
+		if ( bootMapKeyDescriptor instanceof BasicValue basicValue ) {
 			final boolean insertable;
 			final boolean updatable;
 			if ( indexedCollection instanceof org.hibernate.mapping.Map
@@ -1431,8 +1430,7 @@ private static CollectionPart interpretElement(
 			MappingModelCreationProcess creationProcess) {
 		final Value element = bootDescriptor.getElement();
 
-		if ( element instanceof BasicValue ) {
-			final BasicValue basicElement = (BasicValue) element;
+		if ( element instanceof BasicValue basicElement ) {
 			final SelectableMapping selectableMapping = SelectableMappingImpl.from(
 					tableExpression,
 					basicElement.getSelectables().get(0),
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java
@@ -177,8 +177,8 @@ public SimpleDomainType<?> getIdType() {
 			if ( idClassAttributes.size() == 1 ) {
 				return idClassAttributes.iterator().next().getType();
 			}
-			else if ( idClassType instanceof SimpleDomainType<?> ) {
-				return (SimpleDomainType<?>) idClassType;
+			else if ( idClassType instanceof SimpleDomainType<?> simpleDomainType ) {
+				return simpleDomainType;
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -348,8 +348,8 @@ public boolean setType(MappingModelExpressible<T> type) {
 				bindType = (BindableType<T>) type;
 				return changed;
 			}
-			else if ( type instanceof BasicValuedMapping ) {
-				final JdbcMapping jdbcMapping = ( (BasicValuedMapping) type ).getJdbcMapping();
+			else if ( type instanceof BasicValuedMapping basicValuedMapping ) {
+				final JdbcMapping jdbcMapping = basicValuedMapping.getJdbcMapping();
 				if ( jdbcMapping instanceof BindableType<?> ) {
 					final boolean changed = bindType != null && jdbcMapping != bindType;
 					bindType = (BindableType<T>) jdbcMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java
@@ -49,8 +49,7 @@ public class InPredicateRestrictionProducer implements MatchingIdRestrictionProd
 	public List<Expression> produceIdExpressionList(List<Object> idsAndFks, EntityMappingType entityDescriptor) {
 		final List<Expression> inListExpressions = new ArrayList<>( idsAndFks.size() );
 		final EntityIdentifierMapping identifierMapping = entityDescriptor.getIdentifierMapping();
-		if ( identifierMapping instanceof BasicValuedModelPart ) {
-			final BasicValuedModelPart basicValuedModelPart = (BasicValuedModelPart) identifierMapping;
+		if ( identifierMapping instanceof BasicValuedModelPart basicValuedModelPart ) {
 			for ( int i = 0; i < idsAndFks.size(); i++ ) {
 				inListExpressions.add( new QueryLiteral<>( idsAndFks.get( i ), basicValuedModelPart ) );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java

Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,8 @@ else if ( value instanceof Component component ) {`
`402`	`402`	`component.setTypeName( typeName );`
`403`	`403`	`}`
`404`	`404`	`}`
`405`		`- else if ( value instanceof SimpleValue ) {`
`406`		`- ( (SimpleValue) value ).setTypeName( typeName );`
	`405`	`+ else if ( value instanceof SimpleValue simpleValue ) {`
	`406`	`+ simpleValue.setTypeName( typeName );`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public ReturnableType<?> resolveFunctionReturnType(`
`48`	`48`	`if ( inferredType instanceof ReturnableType<?> ) {`
`49`	`49`	`return (ReturnableType<?>) inferredType;`
`50`	`50`	`}`
`51`		`- else if ( inferredType instanceof BasicValuedMapping ) {`
`52`		`- return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();`
	`51`	`+ else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {`
	`52`	`+ return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`if ( impliedType != null ) {`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ public ReturnableType<?> resolveFunctionReturnType(`
`52`	`52`	`if ( inferredType instanceof ReturnableType<?> ) {`
`53`	`53`	`return (ReturnableType<?>) inferredType;`
`54`	`54`	`}`
`55`		`- else if ( inferredType instanceof BasicValuedMapping ) {`
`56`		`- return (ReturnableType<?>) ( (BasicValuedMapping) inferredType ).getJdbcMapping();`
	`55`	`+ else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {`
	`56`	`+ return (ReturnableType<?>) basicValuedMapping.getJdbcMapping();`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`if ( impliedType != null ) {`
Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ public boolean hasPartitionedSelectionMapping() {`
`920`	`920`	`}`
`921`	`921`	`for ( Property property : getProperties() ) {`
`922`	`922`	`final Value value = property.getValue();`
`923`		`- if ( value instanceof BasicValue && ( (BasicValue) value ).isPartitionKey() ) {`
	`923`	`+ if ( value instanceof BasicValue basicValue && basicValue.isPartitionKey() ) {`
`924`	`924`	`return true;`
`925`	`925`	`}`
`926`	`926`	`}`