1 files changed, 10 insertions, 15 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
index a46ebe31..a464ece5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
@@ -5,13 +5,17 @@
  */
 package tools.refinery.store.query.term;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.valuation.Valuation;
 
 import java.util.Objects;
 import java.util.Set;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractTerm}.
+@SuppressWarnings("squid:S2160")
 public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         private final Class<T> bodyType;
         private final Term<T> body;
@@ -19,7 +23,7 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         protected UnaryTerm(Class<R> type, Class<T> bodyType, Term<T> body) {
                 super(type);
                 if (!body.getType().equals(bodyType)) {
-                        throw new IllegalArgumentException("Expected body %s to be of type %s, got %s instead".formatted(body,
+                        throw new InvalidQueryException("Expected body %s to be of type %s, got %s instead".formatted(body,
                                         bodyType.getName(), body.getType().getName()));
                 }
                 this.bodyType = bodyType;
@@ -52,6 +56,11 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), bodyType, body.hashCodeWithSubstitution(helper));
+        }
+
+        @Override
         public Term<R> substitute(Substitution substitution) {
                 return doSubstitute(substitution, body.substitute(substitution));
         }
@@ -62,18 +71,4 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         public Set<AnyDataVariable> getInputVariables() {
                 return body.getInputVariables();
         }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                UnaryTerm<?, ?> unaryTerm = (UnaryTerm<?, ?>) o;
-                return Objects.equals(bodyType, unaryTerm.bodyType) && Objects.equals(body, unaryTerm.body);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), bodyType, body);
-        }
 }