fix some covariant overriding in JpaExpression and subtypes

gavinking · gavinking · commit 4362844cb45e · 2025-03-22T08:33:11.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java
@@ -8,7 +8,6 @@
 import java.math.BigInteger;
 import java.util.Collection;
 import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Predicate;
 
 /**
  * API extension to the JPA {@link Expression} contract
@@ -53,17 +52,17 @@ public interface JpaExpression<T> extends JpaSelection<T>, Expression<T> {
 	JpaPredicate in(Expression<Collection<?>> values);
 
 	@Override
-	Predicate equalTo(Expression<?> value);
+	JpaPredicate equalTo(Expression<?> value);
 
 	@Override
-	Predicate equalTo(Object value);
+	JpaPredicate equalTo(Object value);
 
 	@Override
 	<X> JpaExpression<X> cast(Class<X> type);
 
 	@Override
-	Predicate notEqualTo(Expression<?> value);
+	JpaPredicate notEqualTo(Expression<?> value);
 
 	@Override
-	Predicate notEqualTo(Object value);
+	JpaPredicate notEqualTo(Object value);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java
@@ -30,7 +30,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Predicate;
 
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 
@@ -219,12 +218,12 @@ public SqmPredicate equalTo(Object that) {
 	}
 
 	@Override
-	public Predicate notEqualTo(Expression value) {
+	public SqmPredicate notEqualTo(Expression value) {
 		return null;
 	}
 
 	@Override
-	public Predicate notEqualTo(Object value) {
+	public SqmPredicate notEqualTo(Object value) {
 		return null;
 	}
 
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
@@ -18,7 +18,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static org.hibernate.query.internal.QueryHelper.highestPrecedenceType2;
@@ -121,12 +120,12 @@ public SqmPredicate equalTo(Object value) {
 	}
 
 	@Override
-	public Predicate notEqualTo(Expression<?> value) {
+	public SqmPredicate notEqualTo(Expression<?> value) {
 		return nodeBuilder().notEqual( this, value );
 	}
 
 	@Override
-	public Predicate notEqualTo(Object value) {
+	public SqmPredicate notEqualTo(Object value) {
 		return nodeBuilder().notEqual( this, value );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java
@@ -9,13 +9,13 @@
 import java.util.Collection;
 import java.util.function.Consumer;
 import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import org.hibernate.Internal;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.criteria.JpaExpression;
+import org.hibernate.query.criteria.JpaPredicate;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -130,8 +130,8 @@ default <X> SqmExpression<X> cast(Class<X> type) {
 	}
 
 	@Override
-	Predicate notEqualTo(Expression<?> value);
+	JpaPredicate notEqualTo(Expression<?> value);
 
 	@Override
-	Predicate notEqualTo(Object value);
+	JpaPredicate notEqualTo(Object value);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
@@ -27,7 +27,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -163,12 +162,12 @@ public SqmPredicate equalTo(Object that) {
 	}
 
 	@Override
-	public Predicate notEqualTo(Expression<?> that) {
+	public SqmPredicate notEqualTo(Expression<?> that) {
 		return nodeBuilder().notEqual( this, that );
 	}
 
 	@Override
-	public Predicate notEqualTo(Object that) {
+	public SqmPredicate notEqualTo(Object that) {
 		return nodeBuilder().notEqual( this, that );
 	}
 
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
@@ -21,6 +21,7 @@
 import org.hibernate.query.criteria.JpaEntityJoin;
 import org.hibernate.query.criteria.JpaExpression;
 import org.hibernate.query.criteria.JpaOrder;
+import org.hibernate.query.criteria.JpaPredicate;
 import org.hibernate.query.criteria.JpaSelection;
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.common.FetchClauseType;
@@ -746,12 +747,12 @@ public Set<ParameterExpression<?>> getParameters() {
 	}
 
 	@Override
-	public Predicate notEqualTo(Expression<?> value) {
+	public JpaPredicate notEqualTo(Expression<?> value) {
 		return nodeBuilder().notEqual( this, value );
 	}
 
 	@Override
-	public Predicate notEqualTo(Object value) {
+	public JpaPredicate notEqualTo(Object value) {
 		return nodeBuilder().notEqual( this, value );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`import org.hibernate.type.descriptor.java.JavaType;`
`31`	`31`
`32`	`32`	`import jakarta.persistence.criteria.Expression;`
`33`		`-import jakarta.persistence.criteria.Predicate;`
`34`	`33`
`35`	`34`	`import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;`
`36`	`35`
`@@ -219,12 +218,12 @@ public SqmPredicate equalTo(Object that) {`
`219`	`218`	`}`
`220`	`219`
`221`	`220`	`@Override`
`222`		`- public Predicate notEqualTo(Expression value) {`
	`221`	`+ public SqmPredicate notEqualTo(Expression value) {`
`223`	`222`	`return null;`
`224`	`223`	`}`
`225`	`224`
`226`	`225`	`@Override`
`227`		`- public Predicate notEqualTo(Object value) {`
	`226`	`+ public SqmPredicate notEqualTo(Object value) {`
`228`	`227`	`return null;`
`229`	`228`	`}`
`230`	`229`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import org.hibernate.type.descriptor.java.JavaType;`
`19`	`19`
`20`	`20`	`import jakarta.persistence.criteria.Expression;`
`21`		`-import jakarta.persistence.criteria.Predicate;`
`22`	`21`	`import org.checkerframework.checker.nullness.qual.Nullable;`
`23`	`22`
`24`	`23`	`import static org.hibernate.query.internal.QueryHelper.highestPrecedenceType2;`
`@@ -121,12 +120,12 @@ public SqmPredicate equalTo(Object value) {`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`@Override`
`124`		`- public Predicate notEqualTo(Expression<?> value) {`
	`123`	`+ public SqmPredicate notEqualTo(Expression<?> value) {`
`125`	`124`	`return nodeBuilder().notEqual( this, value );`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`@Override`
`129`		`- public Predicate notEqualTo(Object value) {`
	`128`	`+ public SqmPredicate notEqualTo(Object value) {`
`130`	`129`	`return nodeBuilder().notEqual( this, value );`
`131`	`130`	`}`
`132`	`131`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`import org.hibernate.type.descriptor.java.JavaType;`
`28`	`28`
`29`	`29`	`import jakarta.persistence.criteria.Expression;`
`30`		`-import jakarta.persistence.criteria.Predicate;`
`31`	`30`	`import org.checkerframework.checker.nullness.qual.Nullable;`
`32`	`31`
`33`	`32`	`/**`
`@@ -163,12 +162,12 @@ public SqmPredicate equalTo(Object that) {`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`@Override`
`166`		`- public Predicate notEqualTo(Expression<?> that) {`
	`165`	`+ public SqmPredicate notEqualTo(Expression<?> that) {`
`167`	`166`	`return nodeBuilder().notEqual( this, that );`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`@Override`
`171`		`- public Predicate notEqualTo(Object that) {`
	`170`	`+ public SqmPredicate notEqualTo(Object that) {`
`172`	`171`	`return nodeBuilder().notEqual( this, that );`
`173`	`172`	`}`
`174`	`173`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import org.hibernate.query.criteria.JpaEntityJoin;`
`22`	`22`	`import org.hibernate.query.criteria.JpaExpression;`
`23`	`23`	`import org.hibernate.query.criteria.JpaOrder;`
	`24`	`+import org.hibernate.query.criteria.JpaPredicate;`
`24`	`25`	`import org.hibernate.query.criteria.JpaSelection;`
`25`	`26`	`import org.hibernate.query.criteria.JpaSubQuery;`
`26`	`27`	`import org.hibernate.query.common.FetchClauseType;`
`@@ -746,12 +747,12 @@ public Set<ParameterExpression<?>> getParameters() {`
`746`	`747`	`}`
`747`	`748`
`748`	`749`	`@Override`
`749`		`- public Predicate notEqualTo(Expression<?> value) {`
	`750`	`+ public JpaPredicate notEqualTo(Expression<?> value) {`
`750`	`751`	`return nodeBuilder().notEqual( this, value );`
`751`	`752`	`}`
`752`	`753`
`753`	`754`	`@Override`
`754`		`- public Predicate notEqualTo(Object value) {`
	`755`	`+ public JpaPredicate notEqualTo(Object value) {`
`755`	`756`	`return nodeBuilder().notEqual( this, value );`
`756`	`757`	`}`
`757`	`758`