1 files changed, 10 insertions, 14 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
index 2f6c56d1..415ae286 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
@@ -5,20 +5,24 @@
  */
 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 final class ConstantTerm<T> extends AbstractTerm<T> {
         private final T value;
 
         public ConstantTerm(Class<T> type, T value) {
                 super(type);
                 if (value != null && !type.isInstance(value)) {
-                        throw new IllegalArgumentException("Value %s is not an instance of %s".formatted(value, type.getName()));
+                        throw new InvalidQueryException("Value %s is not an instance of %s".formatted(value, type.getName()));
                 }
                 this.value = value;
         }
@@ -47,6 +51,11 @@ public final class ConstantTerm<T> extends AbstractTerm<T> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), Objects.hash(value));
+        }
+
+        @Override
         public Set<AnyDataVariable> getInputVariables() {
                 return Set.of();
         }
@@ -55,17 +64,4 @@ public final class ConstantTerm<T> extends AbstractTerm<T> {
         public String toString() {
                 return value.toString();
         }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                ConstantTerm<?> that = (ConstantTerm<?>) o;
-                return Objects.equals(value, that.value);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(value);
-        }
 }