modernize some code in o.h.query.sqm.produce.function

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesArgumentTypeResolver.java

@@ -19,7 +19,7 @@
 /**
  * A {@link ArgumentsValidator} that validates the array type is compatible with the element type.
  */
-public class GenerateSeriesArgumentTypeResolver extends AbstractFunctionArgumentTypeResolver {
+public class GenerateSeriesArgumentTypeResolver implements AbstractFunctionArgumentTypeResolver {
 
 	private final BasicType<Duration> durationType;
 

hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java

@@ -39,7 +39,7 @@ public String getArgumentListSignature() {
 		return "(OBJECT element, INTEGER elementCount)";
 	}
 
-	private static class ArrayFillArgumentsValidator extends AbstractFunctionArgumentTypeResolver {
+	private static class ArrayFillArgumentsValidator implements AbstractFunctionArgumentTypeResolver {
 
 		public static final FunctionArgumentTypeResolver INSTANCE = new ArrayFillArgumentsValidator();
 

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java

@@ -21,7 +21,7 @@
  * A {@link FunctionArgumentTypeResolver} that resolves the array argument type based on the element argument type
  * or the element argument type based on the array argument type.
  */
-public class ArrayAndElementArgumentTypeResolver extends AbstractFunctionArgumentTypeResolver {
+public class ArrayAndElementArgumentTypeResolver implements AbstractFunctionArgumentTypeResolver {
 
 	public static final FunctionArgumentTypeResolver DEFAULT_INSTANCE = new ArrayAndElementArgumentTypeResolver( 0, 1 );
 

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java

@@ -19,7 +19,7 @@
 /**
  * A {@link FunctionArgumentTypeResolver} that resolves the argument types for the {@code array_contains} function.
  */
-public class ArrayContainsArgumentTypeResolver extends AbstractFunctionArgumentTypeResolver {
+public class ArrayContainsArgumentTypeResolver implements AbstractFunctionArgumentTypeResolver {
 
 	public static final FunctionArgumentTypeResolver INSTANCE = new ArrayContainsArgumentTypeResolver();
 

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java

@@ -17,7 +17,7 @@
 /**
  * A {@link FunctionArgumentTypeResolver} that resolves the argument types for the {@code array_includes} function.
  */
-public class ArrayIncludesArgumentTypeResolver extends AbstractFunctionArgumentTypeResolver {
+public class ArrayIncludesArgumentTypeResolver implements AbstractFunctionArgumentTypeResolver {
 
 	public static final FunctionArgumentTypeResolver INSTANCE = new ArrayIncludesArgumentTypeResolver();
 

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java

@@ -75,7 +75,7 @@ public void validate(
 			BindingContext bindingContext) {
 		delegate.validate( arguments, functionName, bindingContext );
 		int count = 0;
-		for (SqmTypedNode<?> argument : arguments) {
+		for ( var argument : arguments ) {
 //			JdbcTypeIndicators indicators = typeConfiguration.getCurrentBaseSqlTypeIndicators();
 			final SqmExpressible<?> nodeType = argument.getNodeType();
 			final FunctionParameterType type = count < types.length ? types[count++] : types[types.length - 1];
@@ -182,7 +182,7 @@ public void validateSqlTypes(List<? extends SqlAstNode> arguments, String functi
 		for ( SqlAstNode argument : arguments ) {
 			if ( argument instanceof Expression expression ) {
 				final JdbcMappingContainer expressionType = expression.getExpressionType();
-				if (expressionType != null) {
+				if ( expressionType != null ) {
 					if ( isUnknownExpressionType( expressionType ) ) {
 						count += expressionType.getJdbcTypeCount();
 					}
@@ -199,8 +199,8 @@ public void validateSqlTypes(List<? extends SqlAstNode> arguments, String functi
 	 */
 	public static boolean isUnknownExpressionType(JdbcMappingContainer expressionType) {
 		return expressionType instanceof JavaObjectType
-			|| expressionType instanceof BasicType
-				&& isUnknown( ((BasicType<?>) expressionType).getJavaTypeDescriptor() );
+			|| expressionType instanceof BasicType<?> basicType
+				&& isUnknown( basicType.getJavaTypeDescriptor() );
 	}
 
 	private int validateArgument(int paramNumber, JdbcMappingContainer expressionType, String functionName) {

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java

@@ -32,7 +32,7 @@ public interface FunctionArgumentTypeResolver {
 	 * @return The resolved type.
 	 * @deprecated Use {@link #resolveFunctionArgumentType(List, int, SqmToSqlAstConverter)} instead
 	 */
-	@Deprecated(forRemoval = true)
+	@Deprecated(forRemoval = true, since = "7.0")
 	@Nullable MappingModelExpressible<?> resolveFunctionArgumentType(
 			SqmFunction<?> function,
 			int argumentIndex,

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java

@@ -91,7 +91,7 @@ public void validate(
 
 			@Override
 			public String getSignature() {
-				StringBuilder sig = new StringBuilder("(");
+				final StringBuilder sig = new StringBuilder("(");
 				for (int i=0; i<minNumOfArgs; i++) {
 					if (i!=0) {
 						sig.append(", ");
@@ -128,7 +128,7 @@ public void validate(
 
 			@Override
 			public String getSignature() {
-				StringBuilder sig = new StringBuilder("(");
+				final StringBuilder sig = new StringBuilder("(");
 				for (int i=0; i<number; i++) {
 					if (i!=0) {
 						sig.append(", ");
@@ -167,7 +167,7 @@ public void validate(
 
 			@Override
 			public String getSignature() {
-				StringBuilder sig = new StringBuilder("([");
+				final StringBuilder sig = new StringBuilder("([");
 				for (int i=0; i<maxNumOfArgs; i++) {
 					if (i!=0) {
 						sig.append(", ");
@@ -187,7 +187,7 @@ public void validate(
 					List<? extends SqmTypedNode<?>> arguments,
 					String functionName,
 					BindingContext bindingContext) {
-				if (arguments.size() < minNumOfArgs || arguments.size() > maxNumOfArgs) {
+				if ( arguments.size() < minNumOfArgs || arguments.size() > maxNumOfArgs ) {
 					throw new FunctionArgumentException(
 							String.format(
 									Locale.ROOT,
@@ -203,7 +203,7 @@ public void validate(
 
 			@Override
 			public String getSignature() {
-				StringBuilder sig = new StringBuilder("(");
+				final StringBuilder sig = new StringBuilder("(");
 				for (int i=0; i<maxNumOfArgs; i++) {
 					if (i==minNumOfArgs) {
 						sig.append("[");
@@ -226,8 +226,8 @@ public void validate(
 					List<? extends SqmTypedNode<?>> arguments,
 					String functionName,
 					BindingContext bindingContext) {
-				for ( SqmTypedNode<?> argument : arguments ) {
-					Class<?> argType = argument.getNodeJavaType().getJavaTypeClass();
+				for ( var argument : arguments ) {
+					var argType = argument.getNodeJavaType().getJavaTypeClass();
 					if ( !javaType.isAssignableFrom( argType ) ) {
 						throw new FunctionArgumentException(
 								String.format(
@@ -255,11 +255,8 @@ public void validate(
 					List<? extends SqmTypedNode<?>> arguments,
 					String functionName,
 					BindingContext bindingContext) {
-				validators.forEach( individualValidator -> individualValidator.validate(
-						arguments,
-						functionName,
-						bindingContext
-				) );
+				validators.forEach( individualValidator ->
+						individualValidator.validate( arguments, functionName, bindingContext ) );
 			}
 		};
 	}