HHH-17002, HHH-18820, HHH-19391, HHH-18514 apply feedback from @beikov

gavinking · gavinking · commit db5357db792f · 2025-06-19T21:24:44.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java
@@ -56,7 +56,8 @@ public BasicType<T> getNodeType() {
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof AsWrapperSqmExpression<?> that
-			&& Objects.equals( this.expression, that.expression );
+			&& Objects.equals( this.expression, that.expression )
+			&& Objects.equals( this.getNodeType(), that.getNodeType() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
@@ -52,5 +52,7 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 		throw new UnsupportedOperationException();
 	}
 
-	//TODO: what is a correct impl of equals() / hashCode() here?
+	// No equals() / hashCode() because this stuff is only
+	// ever used internally and is irrelevant for caching,
+	// so basing equality on the object identity is fine
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public BasicType<T> getNodeType() {`
`56`	`56`	`@Override`
`57`	`57`	`public boolean equals(Object object) {`
`58`	`58`	`return object instanceof AsWrapperSqmExpression<?> that`
`59`		`- && Objects.equals( this.expression, that.expression );`
	`59`	`+ && Objects.equals( this.expression, that.expression )`
	`60`	`+ && Objects.equals( this.getNodeType(), that.getNodeType() );`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,7 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {`
`52`	`52`	`throw new UnsupportedOperationException();`
`53`	`53`	`}`
`54`	`54`
`55`		`- //TODO: what is a correct impl of equals() / hashCode() here?`
	`55`	`+ // No equals() / hashCode() because this stuff is only`
	`56`	`+ // ever used internally and is irrelevant for caching,`
	`57`	`+ // so basing equality on the object identity is fine`
`56`	`58`	`}`