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

gavinking · gavinking · commit 93c624263846 · 2025-07-17T15:24:03.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBMinMaxFunction.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBMinMaxFunction.java
@@ -62,7 +62,7 @@ public void render(
 			Predicate filter,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( getName() );
 		sqlAppender.appendSql( '(' );
 		final Expression arg = (Expression) sqlAstArguments.get( 0 );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java
@@ -90,7 +90,7 @@ public void render(
 			Predicate filter,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "avg(" );
 		final Expression arg;
 		if ( sqlAstArguments.get( 0 ) instanceof Distinct ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
@@ -150,7 +150,7 @@ public void render(
 			Predicate filter,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		final SqlAstNode arg = sqlAstArguments.get( 0 );
 		sqlAppender.appendSql( countFunctionName );
 		sqlAppender.appendSql( '(' );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesArgumentTypeResolver.java b/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;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java
@@ -64,7 +64,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		if ( filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause() ) {
+		if ( filter != null && !filterClauseSupported( translator ) ) {
 			throw new IllegalArgumentException( "Can't emulate filter clause for inverse distribution function [" + getName() + "]" );
 		}
 		sqlAppender.appendSql( getName() );
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
@@ -95,7 +95,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		if ( filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause() ) {
+		if ( filter != null && !filterClauseSupported( translator ) ) {
 			throw new IllegalArgumentException( "Can't emulate filter clause for inverse distribution function [" + getName() + "]" );
 		}
 		sqlAppender.appendSql( getName() );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java
@@ -74,7 +74,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "listagg(" );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
 		final Expression arg;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java
@@ -74,7 +74,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "group_concat(" );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
 		final Expression arg;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java
@@ -87,7 +87,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( functionName );
 		sqlAppender.appendSql( '(' );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java
@@ -38,7 +38,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "stats_mode(" );
 		if ( withinGroup == null || withinGroup.size() != 1 ) {
 			throw new IllegalArgumentException( "MODE function requires a WITHIN GROUP clause with exactly one order by item" );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java
@@ -60,7 +60,7 @@ public void render(
 			Predicate filter,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( getName() );
 		sqlAppender.appendSql( '(' );
 		final Expression arg = (Expression) sqlAstArguments.get( 0 );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java b/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();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java
@@ -72,7 +72,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && ( !supportsFilter || !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause() );
+		final boolean caseWrapper = filter != null && ( !supportsFilter || !filterClauseSupported( translator ) );
 		sqlAppender.appendSql( functionName );
 		sqlAppender.appendSql( '(' );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java b/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 );
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java b/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();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java b/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();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java
@@ -62,7 +62,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "json_arrayagg(" );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
 		final JsonNullBehavior nullBehavior;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java
@@ -72,7 +72,7 @@ protected void render(
 			Predicate filter,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "json_objectagg(" );
 		arguments.key().accept( translator );
 		sqlAppender.appendSql( valueSeparator );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java
@@ -192,7 +192,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "cast(string_agg(" );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
 		final Expression arg;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java
@@ -74,7 +74,7 @@ public void render(
 			List<SortSpecification> withinGroup,
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> translator) {
-		final boolean caseWrapper = filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+		final boolean caseWrapper = filter != null && !filterClauseSupported( translator );
 		sqlAppender.appendSql( "xmlagg(" );
 		final SqlAstNode firstArg = sqlAstArguments.get( 0 );
 		final Expression arg;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java
@@ -176,4 +176,7 @@ protected <T> SelfRenderingSqmWindowFunction<T> generateSqmWindowFunctionExpress
 		);
 	}
 
+	public static boolean filterClauseSupported(SqlAstTranslator<?> translator) {
+		return translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java b/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) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java b/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,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java b/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 ) );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java
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/produce/function/internal/AbstractFunctionArgumentTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/AbstractFunctionArgumentTypeResolver.java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java b/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void render(`
`64`	`64`	`List<SortSpecification> withinGroup,`
`65`	`65`	`ReturnableType<?> returnType,`
`66`	`66`	`SqlAstTranslator<?> translator) {`
`67`		`- if ( filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause() ) {`
	`67`	`+ if ( filter != null && !filterClauseSupported( translator ) ) {`
`68`	`68`	`throw new IllegalArgumentException( "Can't emulate filter clause for inverse distribution function [" + getName() + "]" );`
`69`	`69`	`}`
`70`	`70`	`sqlAppender.appendSql( getName() );`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void render(`
`95`	`95`	`List<SortSpecification> withinGroup,`
`96`	`96`	`ReturnableType<?> returnType,`
`97`	`97`	`SqlAstTranslator<?> translator) {`
`98`		`- if ( filter != null && !translator.getSessionFactory().getJdbcServices().getDialect().supportsFilterClause() ) {`
	`98`	`+ if ( filter != null && !filterClauseSupported( translator ) ) {`
`99`	`99`	`throw new IllegalArgumentException( "Can't emulate filter clause for inverse distribution function [" + getName() + "]" );`
`100`	`100`	`}`
`101`	`101`	`sqlAppender.appendSql( getName() );`