HHH-19745 Use custom SqmCacheable#isCompatible and SqmCacheable#cacheHashCode instead of equals/hashCode for SqmNode

Author: beikov

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java

@@ -13,7 +13,6 @@
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.spi.NavigablePath;
 
-import java.util.Objects;
 
 public class AnyDiscriminatorSqmPath<T> extends AbstractSqmPath<T> implements DiscriminatorSqmPath<T> {
 
@@ -49,15 +48,25 @@ public AnyDiscriminatorSqmPathSource<T> getExpressible() {
 		return (AnyDiscriminatorSqmPathSource<T>) getReferencedPathSource();
 	}
 
-
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof AnyDiscriminatorSqmPath<?> that
-			&& Objects.equals( this.getLhs(), that.getLhs() );
+			&& getLhs().equals( that.getLhs() );
 	}
 
 	@Override
 	public int hashCode() {
 		return getLhs().hashCode();
 	}
+
+	@Override
+	public boolean isCompatible(Object object) {
+		return object instanceof AnyDiscriminatorSqmPath<?> that
+			&& getLhs().isCompatible( that.getLhs() );
+	}
+
+	@Override
+	public int cacheHashCode() {
+		return getLhs().cacheHashCode();
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java

@@ -14,8 +14,6 @@
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.spi.NavigablePath;
 
-import java.util.Objects;
-
 /**
  * {@link SqmPath} specialization for an embeddable discriminator
  *
@@ -65,11 +63,22 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof EmbeddedDiscriminatorSqmPath<?> that
-			&& Objects.equals( this.getLhs(), that.getLhs() );
+			&& getLhs().equals( that.getLhs() );
 	}
 
 	@Override
 	public int hashCode() {
 		return getLhs().hashCode();
 	}
+
+	@Override
+	public boolean isCompatible(Object object) {
+		return object instanceof EmbeddedDiscriminatorSqmPath<?> that
+			&& getLhs().isCompatible( that.getLhs() );
+	}
+
+	@Override
+	public int cacheHashCode() {
+		return getLhs().cacheHashCode();
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java

@@ -17,7 +17,6 @@
 import org.hibernate.query.sqm.tree.domain.SqmEntityDomainType;
 import org.hibernate.spi.NavigablePath;
 
-import java.util.Objects;
 
 /**
  * {@link SqmPath} specialization for an entity discriminator
@@ -79,11 +78,22 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof EntityDiscriminatorSqmPath<?> that
-			&& Objects.equals( this.getLhs(), that.getLhs() );
+			&& getLhs().equals( that.getLhs() );
 	}
 
 	@Override
 	public int hashCode() {
 		return getLhs().hashCode();
 	}
+
+	@Override
+	public boolean isCompatible(Object object) {
+		return object instanceof EntityDiscriminatorSqmPath<?> that
+			&& getLhs().isCompatible( that.getLhs() );
+	}
+
+	@Override
+	public int cacheHashCode() {
+		return getLhs().cacheHashCode();
+	}
 }