refactor: do not allow Symbol in CallAtom

5 files changed, 12 insertions, 9 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java b/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java
index 3ce4eed9..95c5d787 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java
@@ -1,11 +1,10 @@
 package tools.refinery.store.query;
 
-import tools.refinery.store.representation.SymbolLike;
 import tools.refinery.store.query.atom.DNFAtom;
 
 import java.util.*;
 
-public final class DNF implements SymbolLike {
+public final class DNF implements RelationLike {
         private final String name;
 
         private final String uniqueName;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/SymbolLike.java b/subprojects/store/src/main/java/tools/refinery/store/query/RelationLike.java
index 30a892ae..8c784d8b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/SymbolLike.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/RelationLike.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.representation;
+package tools.refinery.store.query;
 
-public interface SymbolLike {
+public interface RelationLike {
         String name();
 
         int arity();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
index 6de5cd08..47121870 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
@@ -1,13 +1,13 @@
 package tools.refinery.store.query.atom;
 
 import tools.refinery.store.query.Variable;
-import tools.refinery.store.representation.SymbolLike;
+import tools.refinery.store.query.RelationLike;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-public abstract class CallAtom<T extends SymbolLike> implements DNFAtom {
+public abstract class CallAtom<T extends RelationLike> implements DNFAtom {
         private final CallPolarity polarity;
         private final T target;
         private final List<Variable> substitution;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
index eb64b589..328cde3a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
@@ -3,11 +3,11 @@ package tools.refinery.store.query.view;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.FunctionalDependency;
 import tools.refinery.store.representation.AnySymbol;
-import tools.refinery.store.representation.SymbolLike;
+import tools.refinery.store.query.RelationLike;
 
 import java.util.Set;
 
-public sealed interface AnyRelationView extends SymbolLike permits RelationView {
+public sealed interface AnyRelationView extends RelationLike permits RelationView {
         AnySymbol getSymbol();
 
         default Set<FunctionalDependency<Integer>> getFunctionalDependencies() {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java b/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
index 12a45bed..20b9eead 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
@@ -1,5 +1,9 @@
 package tools.refinery.store.representation;
 
-public sealed interface AnySymbol extends SymbolLike permits Symbol {
+public sealed interface AnySymbol permits Symbol {
+        String name();
+
+        int arity();
+
         Class<?> valueType();
 }