some minor cleanups around SqmSubQuery

gavinking · gavinking · commit 6c36e8c5b3dc · 2025-06-17T01:37:43.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
@@ -75,14 +75,14 @@ public static NavigablePath buildSubNavigablePath(SqmPath<?> lhs, String subNavi
 		return buildSubNavigablePath( navigablePath, subNavigable, alias );
 	}
 
-	public static SqmPredicate combinePredicates(SqmPredicate baseRestriction, List<SqmPredicate> incomingRestrictions) {
+	public static SqmPredicate combinePredicates(SqmPredicate baseRestriction, List<Predicate> incomingRestrictions) {
 		if ( isEmpty( incomingRestrictions ) ) {
 			return baseRestriction;
 		}
 
 		SqmPredicate combined = combinePredicates( null, baseRestriction );
 		for ( int i = 0; i < incomingRestrictions.size(); i++ ) {
-			combined = combinePredicates( combined, incomingRestrictions.get(i) );
+			combined = combinePredicates( combined, (SqmPredicate) incomingRestrictions.get(i) );
 		}
 		return combined;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java
@@ -157,6 +157,7 @@ public SqmPredicate in(Expression<Collection<?>> values) {
 
 	@Override
 	public @Nullable JavaType<T> getJavaTypeDescriptor() {
-		return getNodeType() == null ? null : getNodeType().getExpressibleJavaType();
+		final SqmBindableType<T> nodeType = getNodeType();
+		return nodeType == null ? null : nodeType.getExpressibleJavaType();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
@@ -127,24 +127,28 @@ public SqmPath<?> resolveIndexedAccess(
 		);
 	}
 
+	private Integer ordinalValue() {
+		return getExpressibleJavaType().toOrdinal( enumValue );
+	}
+
 	@Override
 	public SqmExpression<Long> asLong() {
-		return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).longValue() );
+		return nodeBuilder().literal( ordinalValue().longValue() );
 	}
 
 	@Override
 	public SqmExpression<Integer> asInteger() {
-		return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ) );
+		return nodeBuilder().literal( ordinalValue() );
 	}
 
 	@Override
 	public SqmExpression<Float> asFloat() {
-		return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).floatValue() );
+		return nodeBuilder().literal( ordinalValue().floatValue() );
 	}
 
 	@Override
 	public SqmExpression<Double> asDouble() {
-		return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).doubleValue() );
+		return nodeBuilder().literal( ordinalValue().doubleValue() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
@@ -153,9 +153,9 @@ public String getEntityName() {
 
 	@Override
 	public String toString() {
-		return getExplicitAlias() == null
-				? getEntityName()
-				: getEntityName() + " as " + getExplicitAlias();
+		final String entityName = getEntityName();
+		final String explicitAlias = getExplicitAlias();
+		return explicitAlias == null ? entityName : entityName + " as " + explicitAlias;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
@@ -188,17 +188,9 @@ public SqmQuerySpec<T> getQuerySpec() {
 	}
 
 	public boolean producesUniqueResults() {
-		return producesUniqueResults( getQueryPart() );
-	}
-
-	private boolean producesUniqueResults(SqmQueryPart<?> queryPart) {
-		if ( queryPart instanceof SqmQuerySpec<?> querySpec ) {
-			return querySpec.producesUniqueResults();
-		}
-		else {
-			// For query groups we have to assume that duplicates are possible
-			return true;
-		}
+		// For query groups we have to assume that duplicates are possible
+		return !( getQueryPart() instanceof SqmQuerySpec<?> querySpec )
+			|| querySpec.producesUniqueResults();
 	}
 
 	public boolean containsCollectionFetches() {
@@ -322,8 +314,8 @@ public SqmSelectStatement<T> where(List<Predicate> restrictions) {
 
 	@Override
 	public SqmSelectStatement<T> having(List<Predicate> restrictions) {
-		//noinspection unchecked,rawtypes
-		final SqmPredicate combined = combinePredicates( getQuerySpec().getHavingClausePredicate(), (List) restrictions );
+		final SqmPredicate combined =
+				combinePredicates( getQuerySpec().getHavingClausePredicate(), restrictions );
 		getQuerySpec().setHavingClausePredicate( combined );
 		return this;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
@@ -238,9 +238,8 @@ public SqmQuery<?> getContainingQuery() {
 
 	@Override
 	public SqmSelectQuery<?> getParent() {
-		final SqmQuery<?> containingQuery = getContainingQuery();
-		// JPA only allows sub-queries on select queries
-		if ( containingQuery instanceof SqmSelectQuery<?> sqmSelectQuery ) {
+		// JPA only allows subqueries on select queries
+		if ( getContainingQuery() instanceof SqmSelectQuery<?> sqmSelectQuery ) {
 			return sqmSelectQuery;
 		}
 		else {
@@ -656,39 +655,43 @@ private void applyInferableType(Class<T> type) {
 		}
 	}
 
+	private <B> SqmExpression<B> castToBasicType(Class<B> type) {
+		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( type ) );
+	}
+
 	@Override
 	public SqmExpression<Long> asLong() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( Long.class ) );
+		return castToBasicType( Long.class );
 	}
 
 	@Override
 	public SqmExpression<Integer> asInteger() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( Integer.class ) );
+		return castToBasicType( Integer.class );
 	}
 
 	@Override
 	public SqmExpression<Float> asFloat() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( Float.class ) );
+		return castToBasicType( Float.class );
 	}
 
 	@Override
 	public SqmExpression<Double> asDouble() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( Double.class ) );
+		return castToBasicType( Double.class );
 	}
 
 	@Override
 	public SqmExpression<BigDecimal> asBigDecimal() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( BigDecimal.class ) );
+		return castToBasicType( BigDecimal.class );
 	}
 
 	@Override
 	public SqmExpression<BigInteger> asBigInteger() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( BigInteger.class ) );
+		return castToBasicType( BigInteger.class );
 	}
 
 	@Override
 	public SqmExpression<String> asString() {
-		return castAs( nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( String.class ) );
+		return castToBasicType( String.class );
 	}
 
 	@Override
@@ -698,10 +701,8 @@ public <X> SqmExpression<X> as(Class<X> type) {
 
 	@Override
 	public JavaType<T> getJavaTypeDescriptor() {
-		if ( getNodeType() == null ) {
-			return null;
-		}
-		return getNodeType().getExpressibleJavaType();
+		final SqmBindableType<T> nodeType = getNodeType();
+		return nodeType == null ? null : nodeType.getExpressibleJavaType();
 	}
 
 	@Override
@@ -728,8 +729,8 @@ public Subquery<T> where(List<Predicate> restrictions) {
 
 	@Override
 	public Subquery<T> having(List<Predicate> restrictions) {
-		//noinspection unchecked,rawtypes
-		final SqmPredicate combined = combinePredicates( getQuerySpec().getHavingClausePredicate(), (List) restrictions );
+		final SqmPredicate combined =
+				combinePredicates( getQuerySpec().getHavingClausePredicate(), restrictions );
 		getQuerySpec().setHavingClausePredicate( combined );
 		return this;
 	}

Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,14 @@ public static NavigablePath buildSubNavigablePath(SqmPath<?> lhs, String subNavi`
`75`	`75`	`return buildSubNavigablePath( navigablePath, subNavigable, alias );`
`76`	`76`	`}`
`77`	`77`
`78`		`- public static SqmPredicate combinePredicates(SqmPredicate baseRestriction, List<SqmPredicate> incomingRestrictions) {`
	`78`	`+ public static SqmPredicate combinePredicates(SqmPredicate baseRestriction, List<Predicate> incomingRestrictions) {`
`79`	`79`	`if ( isEmpty( incomingRestrictions ) ) {`
`80`	`80`	`return baseRestriction;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`SqmPredicate combined = combinePredicates( null, baseRestriction );`
`84`	`84`	`for ( int i = 0; i < incomingRestrictions.size(); i++ ) {`
`85`		`- combined = combinePredicates( combined, incomingRestrictions.get(i) );`
	`85`	`+ combined = combinePredicates( combined, (SqmPredicate) incomingRestrictions.get(i) );`
`86`	`86`	`}`
`87`	`87`	`return combined;`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public SqmPredicate in(Expression<Collection<?>> values) {`
`157`	`157`
`158`	`158`	`@Override`
`159`	`159`	`public @Nullable JavaType<T> getJavaTypeDescriptor() {`
`160`		`- return getNodeType() == null ? null : getNodeType().getExpressibleJavaType();`
	`160`	`+ final SqmBindableType<T> nodeType = getNodeType();`
	`161`	`+ return nodeType == null ? null : nodeType.getExpressibleJavaType();`
`161`	`162`	`}`
`162`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,24 +127,28 @@ public SqmPath<?> resolveIndexedAccess(`
`127`	`127`	`);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ private Integer ordinalValue() {`
	`131`	`+ return getExpressibleJavaType().toOrdinal( enumValue );`
	`132`	`+ }`
	`133`	`+`
`130`	`134`	`@Override`
`131`	`135`	`public SqmExpression<Long> asLong() {`
`132`		`- return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).longValue() );`
	`136`	`+ return nodeBuilder().literal( ordinalValue().longValue() );`
`133`	`137`	`}`
`134`	`138`
`135`	`139`	`@Override`
`136`	`140`	`public SqmExpression<Integer> asInteger() {`
`137`		`- return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ) );`
	`141`	`+ return nodeBuilder().literal( ordinalValue() );`
`138`	`142`	`}`
`139`	`143`
`140`	`144`	`@Override`
`141`	`145`	`public SqmExpression<Float> asFloat() {`
`142`		`- return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).floatValue() );`
	`146`	`+ return nodeBuilder().literal( ordinalValue().floatValue() );`
`143`	`147`	`}`
`144`	`148`
`145`	`149`	`@Override`
`146`	`150`	`public SqmExpression<Double> asDouble() {`
`147`		`- return nodeBuilder().literal( getExpressibleJavaType().toOrdinal( enumValue ).doubleValue() );`
	`151`	`+ return nodeBuilder().literal( ordinalValue().doubleValue() );`
`148`	`152`	`}`
`149`	`153`
`150`	`154`	`@Override`