Skip to content

Commit 58a6afe

Browse files
committed
remove deprecated FunctionRenderingSupport
1 parent f2f8026 commit 58a6afe

File tree

4 files changed

+38
-130
lines changed

4 files changed

+38
-130
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ protected <T> SelfRenderingSqmAggregateFunction<T> generateSqmOrderedSetAggregat
222222
* function descriptors that wish to customize creation of the node.
223223
*
224224
* @param arguments the arguments of the function invocation
225-
* @param respectNulls
226-
* @param fromFirst
227225
* @param impliedResultType the function return type as inferred from its usage
228226
*/
229227
protected <T> SelfRenderingSqmWindowFunction<T> generateSqmWindowFunctionExpression(

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,43 @@ protected <T> SelfRenderingSqmFunction<T> generateSqmFunctionExpression(
6666
List<? extends SqmTypedNode<?>> arguments,
6767
ReturnableType<T> impliedResultType,
6868
QueryEngine queryEngine) {
69-
switch ( functionKind ) {
70-
case ORDERED_SET_AGGREGATE:
71-
return generateOrderedSetAggregateSqmExpression(
72-
arguments,
73-
null,
74-
null,
75-
impliedResultType,
76-
queryEngine
77-
);
78-
case AGGREGATE:
79-
return generateAggregateSqmExpression(
80-
arguments,
81-
null,
82-
impliedResultType,
83-
queryEngine
84-
);
85-
case WINDOW:
86-
return generateWindowSqmExpression(
87-
arguments,
88-
null,
89-
null,
90-
null,
91-
impliedResultType,
92-
queryEngine
93-
);
94-
default:
95-
return new SelfRenderingSqmFunction<>(
96-
this,
97-
this,
98-
arguments,
99-
impliedResultType,
100-
getArgumentsValidator(),
101-
getReturnTypeResolver(),
102-
queryEngine.getCriteriaBuilder(),
103-
getName()
104-
);
105-
}
69+
return switch (functionKind) {
70+
case ORDERED_SET_AGGREGATE ->
71+
generateOrderedSetAggregateSqmExpression(
72+
arguments,
73+
null,
74+
null,
75+
impliedResultType,
76+
queryEngine
77+
);
78+
case AGGREGATE ->
79+
generateAggregateSqmExpression(
80+
arguments,
81+
null,
82+
impliedResultType,
83+
queryEngine
84+
);
85+
case WINDOW ->
86+
generateWindowSqmExpression(
87+
arguments,
88+
null,
89+
null,
90+
null,
91+
impliedResultType,
92+
queryEngine
93+
);
94+
default ->
95+
new SelfRenderingSqmFunction<>(
96+
this,
97+
this,
98+
arguments,
99+
impliedResultType,
100+
getArgumentsValidator(),
101+
getReturnTypeResolver(),
102+
queryEngine.getCriteriaBuilder(),
103+
getName()
104+
);
105+
};
106106
}
107107

108108
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @since 6.4
2828
*/
2929
@FunctionalInterface
30-
public interface FunctionRenderer extends FunctionRenderingSupport {
30+
public interface FunctionRenderer {
3131
/**
3232
* @deprecated Use {@link #render(SqlAppender, List, ReturnableType, SqlAstTranslator)} instead
3333
*/

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

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)