eliminate more unchecked casts and an obsolete method

Author: gavinking

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java

@@ -178,8 +178,7 @@ private BindableType<T> getBindableType(QueryParameterBinding<T> binding) {
 return type;
 }
 else if ( binding != null ) {
-//noinspection unchecked
-return (BindableType<T>) binding.getBindType();
+return binding.getBindType();
 }
 else {
 return null;

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java

@@ -65,8 +65,8 @@ private QueryParameterBindingsImpl(
 ParameterMetadataImplementor parameterMetadata) {
 this.parameterMetadata = parameterMetadata;
 final var queryParameters = parameterMetadata.getRegistrations();
-this.parameterBindingMap = linkedMapOfSize( queryParameters.size() );
-this.parameterBindingMapByNameOrPosition = mapOfSize( queryParameters.size() );
+parameterBindingMap = linkedMapOfSize( queryParameters.size() );
+parameterBindingMapByNameOrPosition = mapOfSize( queryParameters.size() );
 for ( var queryParameter : queryParameters ) {
 parameterBindingMap.put( queryParameter,
 createBinding( sessionFactory, parameterMetadata, queryParameter ) );
@@ -84,28 +84,30 @@ else if ( queryParameter.isOrdinal() ) {
 }
 
 private static <T> QueryParameterBindingImpl<T> createBinding(
-SessionFactoryImplementor factory, ParameterMetadataImplementor parameterMetadata, QueryParameter<T> parameter) {
+SessionFactoryImplementor factory,
+ParameterMetadataImplementor parameterMetadata,
+QueryParameter<T> parameter) {
 return new QueryParameterBindingImpl<>( parameter, factory,
 parameterMetadata.getInferredParameterType( parameter ) );
 }
 
-private QueryParameterBindingsImpl(QueryParameterBindingsImpl original, SessionFactoryImplementor sessionFactory) {
+private QueryParameterBindingsImpl(
+QueryParameterBindingsImpl original,
+SessionFactoryImplementor sessionFactory) {
 this.parameterMetadata = original.parameterMetadata;
 this.parameterBindingMap = linkedMapOfSize( original.parameterBindingMap.size() );
-this.parameterBindingMapByNameOrPosition = mapOfSize( original.parameterBindingMapByNameOrPosition.size() );
-for ( var entry : original.parameterBindingMap.entrySet() ) {
-parameterBindingMap.put( entry.getKey(), createBinding( sessionFactory, entry.getValue() ) );
-}
-for ( var entry : parameterBindingMap.entrySet() ) {
-final var queryParameter = entry.getKey();
-final var parameterBinding = entry.getValue();
+this.parameterBindingMapByNameOrPosition =
+mapOfSize( original.parameterBindingMapByNameOrPosition.size() );
+original.parameterBindingMap.forEach( (key, value) ->
+parameterBindingMap.put( key, createBinding( sessionFactory, value ) ) );
+parameterBindingMap.forEach( (queryParameter, parameterBinding) -> {
 if ( queryParameter.isNamed() ) {
 parameterBindingMapByNameOrPosition.put( queryParameter.getName(), parameterBinding );
 }
-else if ( queryParameter.getPosition() != null ) {
+else if ( queryParameter.isOrdinal() ) {
 parameterBindingMapByNameOrPosition.put( queryParameter.getPosition(), parameterBinding );
 }
-}
+} );
 }
 
 private static <T> QueryParameterBindingImpl<T> createBinding(
@@ -164,10 +166,14 @@ public void validate() {
 if ( !entry.getValue().isBound() ) {
 final var queryParameter = entry.getKey();
 if ( queryParameter.isNamed() ) {
-throw new QueryParameterException( "No argument for named parameter ':" + queryParameter.getName() + "'" );
+throw new QueryParameterException(
+"No argument for named parameter ':"
++ queryParameter.getName() + "'" );
 }
 else {
-throw new QueryParameterException( "No argument for ordinal parameter '?" + queryParameter.getPosition() + "'" );
+throw new QueryParameterException(
+"No argument for ordinal parameter '?"
++ queryParameter.getPosition() + "'" );
 }
 }
 }
@@ -231,7 +237,8 @@ public QueryKey.ParameterBindingsMemento generateQueryKeyMemento(SharedSessionCo
 
 private void handleQueryParameters(SharedSessionContractImplementor session, MutableCacheKeyImpl mutableCacheKey) {
 final var typeConfiguration = session.getFactory().getTypeConfiguration();
-// We know that parameters are consumed in processing order, this ensures consistency of generated cache keys
+// We know that parameters are consumed in processing order;
+// this ensures the consistency of generated cache keys
 for ( var entry : parameterBindingMap.entrySet() ) {
 final var queryParameter = entry.getKey();
 final var binding = entry.getValue();
@@ -301,12 +308,14 @@ else if ( binding.getBindValue() != null ) {
 
 if ( bindType == null ) {
 if ( queryParameter.isNamed() ) {
-throw new QueryParameterException( "Could not determine mapping type for named parameter ':"
-+ queryParameter.getName() + "'" );
+throw new QueryParameterException(
+"Could not determine mapping type for named parameter ':"
++ queryParameter.getName() + "'" );
 }
 else {
-throw new QueryParameterException( "Could not determine mapping type for ordinal parameter '?"
-+ queryParameter.getPosition() + "'" );
+throw new QueryParameterException(
+"Could not determine mapping type for ordinal parameter '?"
++ queryParameter.getPosition() + "'" );
 }
 }
 

hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java

@@ -11,6 +11,7 @@
 import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.metamodel.Type;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
@@ -144,14 +145,16 @@ protected int getIntegerLiteral(JpaExpression<Number> expression, int defaultVal
 if ( expression == null ) {
 return defaultValue;
 }
-else if ( expression instanceof SqmLiteral<?> ) {
-return ( (SqmLiteral<Number>) expression ).getLiteralValue().intValue();
+else if ( expression instanceof SqmLiteral<Number> numericLiteral ) {
+return numericLiteral.getLiteralValue().intValue();
 }
-else if ( expression instanceof Parameter<?> ) {
-final Number parameterValue = getParameterValue( (Parameter<Number>) expression );
-return parameterValue == null ? defaultValue : parameterValue.intValue();
+else if ( expression instanceof SqmParameter<Number> parameterExpression ) {
+final Number number = getParameterValue( parameterExpression );
+return number == null ? defaultValue : number.intValue();
+}
+else {
+throw new IllegalArgumentException( "Not an integer literal: " + expression );
 }
-throw new IllegalArgumentException( "Can't get integer literal value from: " + expression );
 }
 
 protected int getMaxRows(SqmSelectStatement<?> selectStatement, int size) {
@@ -171,11 +174,11 @@ protected int getMaxRows(SqmSelectStatement<?> selectStatement, int size) {
 }
 
 private Number fetchValue(JpaExpression<Number> expression) {
-if ( expression instanceof SqmLiteral<?> ) {
-return ((SqmLiteral<Number>) expression).getLiteralValue();
+if ( expression instanceof SqmLiteral<Number> numericLiteral ) {
+return numericLiteral.getLiteralValue();
 }
-else if ( expression instanceof SqmParameter<?> ) {
-return getParameterValue( (Parameter<Number>) expression );
+else if ( expression instanceof SqmParameter<Number> numericParameter ) {
+return getParameterValue( numericParameter );
 }
 else {
 throw new IllegalArgumentException( "Can't get max rows value from: " + expression );
@@ -704,30 +707,36 @@ private <P> JavaType<P> getJavaType(Class<P> javaType) {
 }
 
 protected QueryParameterBinding<?> locateBinding(Parameter<?> parameter) {
-final var bindings = getQueryParameterBindings();
 if ( parameter instanceof QueryParameterImplementor<?> parameterImplementor ) {
 getCheckOpen();
-return bindings.getBinding( getQueryParameter( parameterImplementor ) );
+return getQueryParameterBindings().getBinding( getQueryParameter( parameterImplementor ) );
 }
 else {
-final String name = parameter.getName();
-final Integer position = parameter.getPosition();
-final QueryParameterBinding<?> binding;
-if ( name != null ) {
-binding = bindings.getBinding( name );
-}
-else if ( position != null ) {
-binding = bindings.getBinding( position );
-}
-else {
-throw new IllegalArgumentException( "Parameter must have either a name or a position" );
+return locateBinding( parameter.getName(), parameter.getPosition() );
+}
+}
+
+private @NonNull QueryParameterBinding<?> locateBinding(String name, Integer position) {
+final var bindings = getQueryParameterBindings();
+if ( name != null ) {
+final var binding = bindings.getBinding( name );
+if ( binding == null ) {
+// should never occur
+throw new IllegalArgumentException( "No binding for given parameter named '" + name + "'" );
 }
+return binding;
+}
+else if ( position != null ) {
+final var binding = bindings.getBinding( position );
 if ( binding == null ) {
 // should never occur
-throw new IllegalArgumentException( "No binding for given parameter reference [" + parameter + "]" );
+throw new IllegalArgumentException( "No binding for given parameter at position " + position );
 }
 return binding;
 }
+else {
+throw new IllegalArgumentException( "Parameter must have either a name or a position" );
+}
 }
 
 protected QueryParameterBinding<?> locateBinding(String name) {
@@ -1052,8 +1061,7 @@ public <P> CommonQueryContract setParameterList(String name, P[] values, Class<P
 }
 
 public <P> CommonQueryContract setParameterList(String name, P[] values, Type<P> type) {
-final var list = List.of( values );
-locateBinding( name ).setBindValues( list, (BindableType<P>) type );
+locateBinding( name ).setBindValues( List.of( values ), (BindableType<P>) type );
 return this;
 }
 
@@ -1153,8 +1161,7 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, Col
 
 @Override
 public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values) {
-final var list = List.of( values );
-locateBinding( parameter ).setBindValues( list );
+locateBinding( parameter ).setBindValues( List.of( values ) );
 return this;
 }
 
@@ -1172,8 +1179,7 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[]
 
 @Override
 public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values, Type<P> type) {
-final var list = List.of( values );
-locateBinding( parameter ).setBindValues( list, (BindableType<P>) type );
+locateBinding( parameter ).setBindValues( List.of( values ), (BindableType<P>) type );
 return this;
 }
 

hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java

@@ -94,7 +94,6 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
  * Currently unused and can be safely removed.
  */
 @Deprecated(forRemoval = true, since = "6.6")
-//	@SuppressWarnings({"rawtypes", "unchecked"})
 QueryParameterBindings NO_PARAM_BINDINGS = new QueryParameterBindings() {
 @Override
 public boolean isBound(QueryParameterImplementor<?> parameter) {