diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java index 2c0afcce791a..b065d3e29d5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.criteria.Nulls; import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.mapping.EntityValuedModelPart; @@ -15,7 +16,6 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.ordering.ast.DomainPath; import org.hibernate.metamodel.mapping.ordering.ast.OrderingExpression; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlSelection; @@ -117,7 +117,7 @@ public void apply( String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { apply( getReferenceModelPart(), @@ -131,14 +131,14 @@ public void apply( ); } - public void apply( + private void apply( ModelPart referenceModelPart, QuerySpec ast, TableGroup tableGroup, String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { final BasicValuedModelPart basicPart = referenceModelPart.asBasicValuedModelPart(); if ( basicPart != null ) { @@ -193,7 +193,7 @@ private void addSortSpecification( String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { if ( embeddableValuedModelPart.getFetchableName() .equals( modelPartName ) || ELEMENT_TOKEN.equals( modelPartName ) ) { @@ -231,7 +231,7 @@ private void addSortSpecification( TableGroup tableGroup, String collation, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { final TableReference tableReference = tableGroup.resolveTableReference( null, selection.getContainingTableExpression() ); final Expression expression = creationState.getSqlExpressionResolver().resolveSqlExpression( @@ -271,7 +271,7 @@ private void addSortSpecification( collation, creationState ); - ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence.getJpaValue() ) ); + ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) ); } private static boolean selectClauseDoesNotContainOrderExpression(Expression expression, SelectClause selectClause) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java index b1e67d007f6f..a797296bc084 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java @@ -4,13 +4,12 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; +import jakarta.persistence.criteria.Nulls; import org.hibernate.metamodel.UnsupportedMappingException; -import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.ModelPartContainer; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.ordering.TranslationContext; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -86,7 +85,7 @@ public void apply( String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { final Expression expression = resolve( ast, tableGroup, modelPartName, creationState ); // It makes no sense to order by an expression multiple times @@ -99,12 +98,9 @@ public void apply( } } - final Expression sortExpression = OrderingExpression.applyCollation( - expression, - collation, - creationState - ); - ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence.getJpaValue() ) ); + final Expression sortExpression = + OrderingExpression.applyCollation( expression, collation, creationState ); + ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) ); } TableReference getTableReference(TableGroup tableGroup) { @@ -114,9 +110,8 @@ TableReference getTableReference(TableGroup tableGroup) { return tableGroup.getPrimaryTableReference(); } - final MappingType elementMappingType = pluralAttribute.getElementDescriptor().getPartMappingType(); - - if ( elementMappingType instanceof EntityPersister entityPersister ) { + if ( pluralAttribute.getElementDescriptor().getPartMappingType() + instanceof EntityPersister entityPersister ) { final String tableName = entityPersister.getTableNameForColumn( columnExpression ); return tableGroup.getTableReference( tableGroup.getNavigablePath(), tableName ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java index ea0edc8e137e..fa0a3633cbf4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.List; +import jakarta.persistence.criteria.Nulls; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.internal.AbstractDomainPath; -import org.hibernate.query.NullPrecedence; import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SortDirection; import org.hibernate.query.sqm.function.FunctionRenderer; @@ -93,15 +93,14 @@ public void apply( String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { - final SelfRenderingFunctionSqlAstExpression expression = resolve( ast, tableGroup, modelPartName, creationState ); final Expression sortExpression = OrderingExpression.applyCollation( - expression, + resolve( ast, tableGroup, modelPartName, creationState ), collation, creationState ); - ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence.getJpaValue() ) ); + ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java index 77b9b9a58b03..cdd7df82b72a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java @@ -4,6 +4,7 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; +import jakarta.persistence.criteria.Nulls; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; import org.hibernate.query.spi.QueryEngine; @@ -30,15 +31,29 @@ public interface OrderingExpression extends Node { /** * Apply the SQL AST sort-specifications associated with this ordering-expression */ - void apply( + @Deprecated(since = "7.0", forRemoval = true) + default void apply( QuerySpec ast, TableGroup tableGroup, String collation, String modelPartName, SortDirection sortOrder, NullPrecedence nullPrecedence, - SqlAstCreationState creationState); + SqlAstCreationState creationState) { + apply( ast, tableGroup, collation, modelPartName, sortOrder, nullPrecedence.getJpaValue(), creationState ); + } + /** + * Apply the SQL AST sort-specifications associated with this ordering-expression + */ + void apply( + QuerySpec ast, + TableGroup tableGroup, + String collation, + String modelPartName, + SortDirection sortOrder, + Nulls nullPrecedence, + SqlAstCreationState creationState); static Expression applyCollation( Expression expression, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java index f44c2457bd79..6278ae499f6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java @@ -4,7 +4,7 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; -import org.hibernate.query.NullPrecedence; +import jakarta.persistence.criteria.Nulls; import org.hibernate.query.SortDirection; /** @@ -17,7 +17,7 @@ public class OrderingSpecification implements Node { private String collation; private SortDirection sortOrder = SortDirection.ASCENDING; - private NullPrecedence nullPrecedence = NullPrecedence.NONE; + private Nulls nullPrecedence = Nulls.NONE; private String orderByValue; public OrderingSpecification(OrderingExpression orderingExpression, String orderByValue) { @@ -45,11 +45,11 @@ public void setSortOrder(SortDirection sortOrder) { this.sortOrder = sortOrder; } - public NullPrecedence getNullPrecedence() { + public Nulls getNullPrecedence() { return nullPrecedence; } - public void setNullPrecedence(NullPrecedence nullPrecedence) { + public void setNullPrecedence(Nulls nullPrecedence) { this.nullPrecedence = nullPrecedence; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java index 522ae4dd5eec..442bc85b3438 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java @@ -5,12 +5,10 @@ package org.hibernate.metamodel.mapping.ordering.ast; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import org.hibernate.internal.util.QuotingHelper; -import org.hibernate.query.NullPrecedence; +import jakarta.persistence.criteria.Nulls; import org.hibernate.query.SortDirection; import org.hibernate.grammars.ordering.OrderingParser; import org.hibernate.grammars.ordering.OrderingParserBaseVisitor; @@ -22,6 +20,9 @@ import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; +import static java.util.Collections.singletonList; +import static org.hibernate.internal.util.QuotingHelper.unquoteIdentifier; + /** * @author Steve Ebersole */ @@ -41,18 +42,16 @@ public List visitOrderByFragment(OrderingParser.OrderByFr final int size = ctx.getChildCount(); // Shift 1 bit instead of division by 2 final int specificationCount = ( size + 1 ) >> 1; - if ( specificationCount == 1 ) { - return Collections.singletonList( visitSortSpecification( (OrderingParser.SortSpecificationContext) ctx.getChild( 0 ) ) ); + return singletonList( visitSortSpecification( (OrderingParser.SortSpecificationContext) ctx.getChild( 0 ) ) ); } - - final List specifications = new ArrayList<>( specificationCount ); - - for ( int i = 0; i < size; i += 2 ) { - specifications.add( visitSortSpecification( (OrderingParser.SortSpecificationContext) ctx.getChild( i ) ) ); + else { + final List specifications = new ArrayList<>( specificationCount ); + for ( int i = 0; i < size; i += 2 ) { + specifications.add( visitSortSpecification( (OrderingParser.SortSpecificationContext) ctx.getChild( i ) ) ); + } + return specifications; } - - return specifications; } @Override @@ -103,10 +102,10 @@ public OrderingSpecification visitSortSpecification(OrderingParser.SortSpecifica final ParseTree parseTree = parsedSpec.getChild( i ); if ( parseTree instanceof OrderingParser.NullsPrecedenceContext nullsCtx ) { if ( ( (TerminalNode) nullsCtx.getChild( 1 ) ).getSymbol().getType() == OrderingParser.FIRST ) { - result.setNullPrecedence( NullPrecedence.FIRST ); + result.setNullPrecedence( Nulls.FIRST ); } else { - result.setNullPrecedence( NullPrecedence.LAST ); + result.setNullPrecedence( Nulls.LAST ); } } } @@ -216,16 +215,11 @@ public String visitCollationSpecification(OrderingParser.CollationSpecificationC @Override public Object visitTerminal(TerminalNode node) { - if ( node.getSymbol().getType() == OrderingParser.EOF ) { - return null; - } - switch ( node.getSymbol().getType() ) { - case OrderingParser.IDENTIFIER: - return node.getText(); - case OrderingParser.QUOTED_IDENTIFIER: - return QuotingHelper.unquoteIdentifier( node.getText() ); - default: - throw new ParsingException( "Unexpected terminal node [" + node.getText() + "]"); - } + return switch ( node.getSymbol().getType() ) { + case OrderingParser.EOF -> null; + case OrderingParser.IDENTIFIER -> node.getText(); + case OrderingParser.QUOTED_IDENTIFIER -> unquoteIdentifier( node.getText() ); + default -> throw new ParsingException( "Unexpected terminal node [" + node.getText() + "]" ); + }; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java index 491906ca6906..ad191908fbc4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java @@ -4,7 +4,7 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; -import org.hibernate.query.NullPrecedence; +import jakarta.persistence.criteria.Nulls; import org.hibernate.query.SortDirection; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.expression.Expression; @@ -43,7 +43,7 @@ public void apply( String collation, String modelPartName, SortDirection sortOrder, - NullPrecedence nullPrecedence, + Nulls nullPrecedence, SqlAstCreationState creationState) { final Expression expression = resolve( ast, tableGroup, modelPartName, creationState ); // It makes no sense to order by an expression multiple times @@ -55,13 +55,10 @@ public void apply( } } } - final Expression sortExpression = OrderingExpression.applyCollation( - expression, - collation, - creationState - ); - ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence.getJpaValue() ) ); + final Expression sortExpression = + OrderingExpression.applyCollation( expression, collation, creationState ); + ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java index fb4f56b0f6f1..380e0a664269 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java @@ -1119,7 +1119,7 @@ default JpaOrder sort( * @return ordering corresponding to the CTE attribute */ @Incubating - JpaSearchOrder search(JpaCteCriteriaAttribute cteAttribute, SortDirection sortOrder, NullPrecedence nullPrecedence); + JpaSearchOrder search(JpaCteCriteriaAttribute cteAttribute, SortDirection sortOrder, Nulls nullPrecedence); /** * Create a search ordering based on the sort order of the value of the CTE attribute. @@ -2176,30 +2176,30 @@ JpaExpression listagg( Expression separator); /** - * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating - JpaExpression mode(Expression sortExpression, SortDirection sortOrder, NullPrecedence nullPrecedence); + JpaExpression mode(Expression sortExpression, SortDirection sortOrder, Nulls nullPrecedence); /** - * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression mode( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #mode(JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** * Create a {@code mode} ordered set-aggregate function expression. @@ -2221,20 +2221,20 @@ JpaExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileCont( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileCont( @@ -2242,10 +2242,10 @@ JpaExpression percentileCont( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileCont( @@ -2253,7 +2253,7 @@ JpaExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** * Create a {@code percentile_cont} ordered set-aggregate function expression. @@ -2276,20 +2276,20 @@ JpaExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileDisc( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileDisc( @@ -2297,10 +2297,10 @@ JpaExpression percentileDisc( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** - * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, NullPrecedence) + * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortDirection, Nulls) */ @Incubating JpaExpression percentileDisc( @@ -2308,7 +2308,7 @@ JpaExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** * Create a {@code percentile_disc} ordered set-aggregate function expression. @@ -2331,7 +2331,7 @@ JpaExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence); + Nulls nullPrecedence); /** * @see #rank(JpaOrder, JpaPredicate, JpaWindow, Expression...) diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java index 4565ab359f4c..6d23bf9ada91 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java @@ -4,8 +4,8 @@ */ package org.hibernate.query.criteria; +import jakarta.persistence.criteria.Nulls; import org.hibernate.Incubating; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; /** @@ -20,12 +20,12 @@ public interface JpaSearchOrder extends JpaCriteriaNode { /** * Set the precedence of nulls for this search order element */ - JpaSearchOrder nullPrecedence(NullPrecedence precedence); + JpaSearchOrder nullPrecedence(Nulls precedence); /** * The precedence for nulls for this search order element */ - NullPrecedence getNullPrecedence(); + Nulls getNullPrecedence(); /** * Whether ascending ordering is in effect. diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java index 311d1dfa472d..5729b1e22cf9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java @@ -1359,7 +1359,7 @@ public JpaOrder desc(Expression x, boolean nullsFirst) { public JpaSearchOrder search( JpaCteCriteriaAttribute cteAttribute, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.search( cteAttribute, sortOrder, nullPrecedence ); } @@ -2014,7 +2014,7 @@ public JpaExpression listagg( } @Override - public JpaExpression mode(Expression sortExpression, SortDirection sortOrder, NullPrecedence nullPrecedence) { + public JpaExpression mode(Expression sortExpression, SortDirection sortOrder, Nulls nullPrecedence) { return criteriaBuilder.mode( sortExpression, sortOrder, nullPrecedence ); } @@ -2023,7 +2023,7 @@ public JpaExpression mode( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.mode( filter, sortExpression, sortOrder, nullPrecedence ); } @@ -2032,7 +2032,7 @@ public JpaExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.mode( window, sortExpression, sortOrder, nullPrecedence ); } @@ -2042,7 +2042,7 @@ public JpaExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.mode( filter, window, sortExpression, sortOrder, nullPrecedence ); } @@ -2051,7 +2051,7 @@ public JpaExpression percentileCont( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileCont( argument, sortExpression, sortOrder, nullPrecedence ); } @@ -2061,7 +2061,7 @@ public JpaExpression percentileCont( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileCont( argument, filter, sortExpression, sortOrder, nullPrecedence ); } @@ -2071,7 +2071,7 @@ public JpaExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileCont( argument, window, sortExpression, sortOrder, nullPrecedence ); } @@ -2082,7 +2082,7 @@ public JpaExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileCont( argument, filter, window, sortExpression, sortOrder, nullPrecedence ); } @@ -2091,7 +2091,7 @@ public JpaExpression percentileDisc( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileDisc( argument, sortExpression, sortOrder, nullPrecedence ); } @@ -2101,7 +2101,7 @@ public JpaExpression percentileDisc( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileDisc( argument, filter, sortExpression, sortOrder, nullPrecedence ); } @@ -2111,7 +2111,7 @@ public JpaExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileDisc( argument, window, sortExpression, sortOrder, nullPrecedence ); } @@ -2122,7 +2122,7 @@ public JpaExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return criteriaBuilder.percentileDisc( argument, filter, window, sortExpression, sortOrder, nullPrecedence ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index 37121c67e7c3..35f7c22f67df 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; +import jakarta.persistence.criteria.Nulls; import org.hibernate.AssertionFailure; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.cfg.QuerySettings; @@ -55,7 +56,6 @@ import org.hibernate.metamodel.model.domain.SingularPersistentAttribute; import org.hibernate.metamodel.model.domain.internal.AnyDiscriminatorSqmPath; import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.ParameterLabelException; import org.hibernate.query.PathException; import org.hibernate.query.SemanticException; @@ -937,7 +937,7 @@ private void applySearchClause(JpaCteCriteria cteDefinition, HqlParser.Search ); } SortDirection sortOrder = SortDirection.ASCENDING; - NullPrecedence nullPrecedence = NullPrecedence.NONE; + Nulls nullPrecedence = Nulls.NONE; int index = 1; if ( index < specCtx.getChildCount() ) { if ( specCtx.getChild( index ) instanceof HqlParser.SortDirectionContext ) { @@ -955,8 +955,8 @@ private void applySearchClause(JpaCteCriteria cteDefinition, HqlParser.Search final HqlParser.NullsPrecedenceContext nullsPrecedenceContext = specCtx.nullsPrecedence(); final Token symbol = ((TerminalNode) nullsPrecedenceContext.getChild( 1 )).getSymbol(); nullPrecedence = switch ( symbol.getType() ) { - case HqlParser.FIRST -> NullPrecedence.FIRST; - case HqlParser.LAST -> NullPrecedence.LAST; + case HqlParser.FIRST -> Nulls.FIRST; + case HqlParser.LAST -> Nulls.LAST; default -> throw new UnsupportedOperationException( "Unrecognized null precedence: " + nullsPrecedenceContext.getText() ); }; @@ -1737,16 +1737,16 @@ private static SortDirection sortOrder(HqlParser.SortSpecificationContext ctx) { : SortDirection.DESCENDING; } - private static NullPrecedence nullPrecedence(HqlParser.SortSpecificationContext ctx) { + private static Nulls nullPrecedence(HqlParser.SortSpecificationContext ctx) { if ( ctx.nullsPrecedence() == null ) { - return NullPrecedence.NONE; + return Nulls.NONE; } else { if ( ctx.nullsPrecedence().FIRST() != null ) { - return NullPrecedence.FIRST; + return Nulls.FIRST; } else if ( ctx.nullsPrecedence().LAST() != null ) { - return NullPrecedence.LAST; + return Nulls.LAST; } else { throw new ParsingException( "Unrecognized null precedence" ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index a887f4ca3d34..c1ad16c8977d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -50,7 +50,6 @@ import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.type.BindableType; import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode; -import org.hibernate.query.NullPrecedence; import org.hibernate.type.BindingContext; import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; @@ -827,12 +826,12 @@ public SqmSortSpecification desc(Expression x) { @Override public Order asc(Expression expression, Nulls nullPrecedence) { - return new SqmSortSpecification( (SqmExpression) expression, SortDirection.ASCENDING, NullPrecedence.fromJpaValue( nullPrecedence ) ); + return new SqmSortSpecification( (SqmExpression) expression, SortDirection.ASCENDING, nullPrecedence ); } @Override public Order desc(Expression expression, Nulls nullPrecedence) { - return new SqmSortSpecification( (SqmExpression) expression, SortDirection.DESCENDING, NullPrecedence.fromJpaValue( nullPrecedence ) ); + return new SqmSortSpecification( (SqmExpression) expression, SortDirection.DESCENDING, nullPrecedence ); } @Override @@ -840,7 +839,7 @@ public JpaOrder asc(Expression x, boolean nullsFirst) { return new SqmSortSpecification( (SqmExpression) x, SortDirection.ASCENDING, - nullsFirst ? NullPrecedence.FIRST : NullPrecedence.LAST + nullsFirst ? Nulls.FIRST : Nulls.LAST ); } @@ -849,33 +848,33 @@ public JpaOrder desc(Expression x, boolean nullsFirst) { return new SqmSortSpecification( (SqmExpression) x, SortDirection.DESCENDING, - nullsFirst ? NullPrecedence.FIRST : NullPrecedence.LAST + nullsFirst ? Nulls.FIRST : Nulls.LAST ); } @Override - public JpaSearchOrder search(JpaCteCriteriaAttribute sortExpression, SortDirection sortOrder, NullPrecedence nullPrecedence) { + public JpaSearchOrder search(JpaCteCriteriaAttribute sortExpression, SortDirection sortOrder, Nulls nullPrecedence) { return new SqmSearchClauseSpecification( (SqmCteTableColumn) sortExpression, sortOrder, nullPrecedence ); } @Override public JpaSearchOrder search(JpaCteCriteriaAttribute sortExpression, SortDirection sortOrder) { - return new SqmSearchClauseSpecification( (SqmCteTableColumn) sortExpression, sortOrder, NullPrecedence.NONE ); + return new SqmSearchClauseSpecification( (SqmCteTableColumn) sortExpression, sortOrder, Nulls.NONE ); } @Override public JpaSearchOrder search(JpaCteCriteriaAttribute sortExpression) { - return new SqmSearchClauseSpecification( (SqmCteTableColumn) sortExpression, SortDirection.ASCENDING, NullPrecedence.NONE ); + return new SqmSearchClauseSpecification( (SqmCteTableColumn) sortExpression, SortDirection.ASCENDING, Nulls.NONE ); } @Override public JpaSearchOrder asc(JpaCteCriteriaAttribute x) { - return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.ASCENDING, NullPrecedence.NONE ); + return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.ASCENDING, Nulls.NONE ); } @Override public JpaSearchOrder desc(JpaCteCriteriaAttribute x) { - return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.DESCENDING, NullPrecedence.NONE ); + return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.DESCENDING, Nulls.NONE ); } @Override @@ -883,7 +882,7 @@ public JpaSearchOrder asc(JpaCteCriteriaAttribute x, boolean nullsFirst) { return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.ASCENDING, - nullsFirst ? NullPrecedence.FIRST : NullPrecedence.LAST + nullsFirst ? Nulls.FIRST : Nulls.LAST ); } @@ -892,7 +891,7 @@ public JpaSearchOrder desc(JpaCteCriteriaAttribute x, boolean nullsFirst) { return new SqmSearchClauseSpecification( (SqmCteTableColumn) x, SortDirection.DESCENDING, - nullsFirst ? NullPrecedence.FIRST : NullPrecedence.LAST + nullsFirst ? Nulls.FIRST : Nulls.LAST ); } @@ -3888,7 +3887,7 @@ public SqmExpression listagg( } @Override - public SqmExpression mode(Expression sortExpression, SortDirection sortOrder, NullPrecedence nullPrecedence) { + public SqmExpression mode(Expression sortExpression, SortDirection sortOrder, Nulls nullPrecedence) { return mode( null, null, sortExpression, sortOrder, nullPrecedence ); } @@ -3897,7 +3896,7 @@ public SqmExpression mode( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return mode( filter, null, sortExpression, sortOrder, nullPrecedence ); } @@ -3906,7 +3905,7 @@ public SqmExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return mode( null, window, sortExpression, sortOrder, nullPrecedence ); } @@ -3917,7 +3916,7 @@ public SqmExpression mode( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return (SqmExpression) functionWithinGroup( "mode", sortExpression.getJavaType(), @@ -3932,7 +3931,7 @@ public SqmExpression percentileCont( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileCont( argument, null, null, sortExpression, sortOrder, nullPrecedence ); } @@ -3942,7 +3941,7 @@ public SqmExpression percentileCont( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileCont( argument, filter, null, sortExpression, sortOrder, nullPrecedence ); } @@ -3952,7 +3951,7 @@ public SqmExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileCont( argument, null, window, sortExpression, sortOrder, nullPrecedence ); } @@ -3964,7 +3963,7 @@ public SqmExpression percentileCont( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return (SqmExpression) functionWithinGroup( "percentile_cont", sortExpression.getJavaType(), @@ -3980,7 +3979,7 @@ public SqmExpression percentileDisc( Expression argument, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileDisc( argument, null, null, sortExpression, sortOrder, nullPrecedence ); } @@ -3990,7 +3989,7 @@ public SqmExpression percentileDisc( JpaPredicate filter, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileDisc( argument, filter, null, sortExpression, sortOrder, nullPrecedence ); } @@ -4000,7 +3999,7 @@ public SqmExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return percentileDisc( argument, null, window, sortExpression, sortOrder, nullPrecedence ); } @@ -4012,7 +4011,7 @@ public SqmExpression percentileDisc( JpaWindow window, Expression sortExpression, SortDirection sortOrder, - NullPrecedence nullPrecedence) { + Nulls nullPrecedence) { return (SqmExpression) functionWithinGroup( "percentile_disc", sortExpression.getJavaType(), diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java index e5ac05258382..06d1b01a27e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java @@ -4,10 +4,10 @@ */ package org.hibernate.query.sqm.tree.cte; +import jakarta.persistence.criteria.Nulls; import org.hibernate.query.SortDirection; import org.hibernate.query.criteria.JpaCteCriteriaAttribute; import org.hibernate.query.criteria.JpaSearchOrder; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.sqm.tree.SqmCopyContext; /** @@ -16,9 +16,9 @@ public class SqmSearchClauseSpecification implements JpaSearchOrder { private final SqmCteTableColumn cteColumn; private final SortDirection sortOrder; - private NullPrecedence nullPrecedence; + private Nulls nullPrecedence; - public SqmSearchClauseSpecification(SqmCteTableColumn cteColumn, SortDirection sortOrder, NullPrecedence nullPrecedence) { + public SqmSearchClauseSpecification(SqmCteTableColumn cteColumn, SortDirection sortOrder, Nulls nullPrecedence) { if ( cteColumn == null ) { throw new IllegalArgumentException( "Null cte column" ); } @@ -40,7 +40,7 @@ public SqmCteTableColumn getCteColumn() { } @Override - public JpaSearchOrder nullPrecedence(NullPrecedence precedence) { + public JpaSearchOrder nullPrecedence(Nulls precedence) { this.nullPrecedence = precedence; return this; } @@ -67,7 +67,7 @@ public SortDirection getSortOrder() { } @Override - public NullPrecedence getNullPrecedence() { + public Nulls getNullPrecedence() { return nullPrecedence; } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java index 66319c5dfc83..01a0e5f6db55 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java @@ -34,7 +34,7 @@ public SqmSortSpecification( } public SqmSortSpecification( - SqmExpression sortExpression, + SqmExpression sortExpression, SortDirection sortOrder, Nulls nullPrecedence, boolean ignoreCase) { @@ -50,7 +50,7 @@ public SqmSortSpecification( /** * @deprecated Use {@link SqmSortSpecification#SqmSortSpecification(SqmExpression, SortDirection, Nulls)} instead */ - @Deprecated + @Deprecated(since = "7", forRemoval = true) public SqmSortSpecification( @SuppressWarnings("rawtypes") SqmExpression sortExpression, SortDirection sortOrder, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java index 17e26a27adc0..09e7820de753 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java @@ -26,7 +26,7 @@ public SearchClauseSpecification(CteColumn cteColumn, SortDirection sortOrder, N /** * @deprecated Use {@link SearchClauseSpecification#SearchClauseSpecification(CteColumn,SortDirection,Nulls)} instead */ - @Deprecated + @Deprecated(since = "7", forRemoval = true) public SearchClauseSpecification(CteColumn cteColumn, SortDirection sortOrder, NullPrecedence nullPrecedence) { this( cteColumn, sortOrder, nullPrecedence.getJpaValue() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java index d8e40ed91370..19ab5641ffd2 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java @@ -32,7 +32,7 @@ public SortSpecification(Expression sortExpression, SortDirection sortOrder, Nul /** * @deprecated Use {@linkplain #SortSpecification(Expression, SortDirection, Nulls)} instead */ - @Deprecated + @Deprecated(since = "7", forRemoval = true) public SortSpecification(Expression sortExpression, SortDirection sortOrder, NullPrecedence nullPrecedence) { this( sortExpression, sortOrder, nullPrecedence.getJpaValue() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java index 9aa672dc440d..f1ccf192e2a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java @@ -10,9 +10,9 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Nulls; import jakarta.persistence.criteria.Root; -import org.hibernate.query.NullPrecedence; import org.junit.Assert; import org.junit.Test; @@ -33,7 +33,7 @@ public class DefaultNullOrderingTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration configuration) { - configuration.setProperty( AvailableSettings.DEFAULT_NULL_ORDERING, NullPrecedence.LAST ); + configuration.setProperty( AvailableSettings.DEFAULT_NULL_ORDERING, Nulls.LAST ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java index 1bb4f101f99c..b6ddecd4eb0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; +import jakarta.persistence.criteria.Nulls; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; @@ -31,7 +32,6 @@ import org.hibernate.graph.RootGraph; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.Query; import org.hibernate.sql.SimpleSelect; @@ -517,7 +517,7 @@ public void testNullPrecedenceWithOrderBySqlFragment() { @Override protected void configure(Configuration configuration) { - configuration.setProperty( AvailableSettings.DEFAULT_NULL_ORDERING, NullPrecedence.LAST ); + configuration.setProperty( AvailableSettings.DEFAULT_NULL_ORDERING, Nulls.LAST ); configuration.setProperty( DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java index 16d5ac02107b..7471f1583862 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.List; +import jakarta.persistence.criteria.Nulls; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; @@ -18,7 +19,6 @@ import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaRoot; import org.hibernate.query.criteria.JpaWindow; -import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortDirection; import org.hibernate.testing.orm.domain.StandardDomainModel; @@ -237,7 +237,7 @@ public void testInverseDistribution(SessionFactoryScope scope) { cb.literal( 0.5 ), root.get( "theInt" ), SortDirection.ASCENDING, - NullPrecedence.NONE + Nulls.NONE ); cr.select( function ); @@ -266,7 +266,7 @@ public void testInverseDistributionWithWindow(SessionFactoryScope scope) { window, root.get( "theInt" ), SortDirection.ASCENDING, - NullPrecedence.NONE + Nulls.NONE ); cr.select( function ).orderBy( cb.asc( cb.literal( 1 ) ) );