refactor: lambda-based Dnf and Query factory

* Helps keeping variable scoping clear by limiting variable scopes to the body
  of the corresponding lambda.
* Overloads for convenience where variables are automatically created for lambda
  parameters.

31 files changed, 770 insertions, 86 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java
new file mode 100644
index 00000000..ddd69b9f
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf;
+
+import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public abstract class AbstractQueryBuilder<T extends AbstractQueryBuilder<T>> {
+        protected final DnfBuilder dnfBuilder;
+
+        protected AbstractQueryBuilder(DnfBuilder dnfBuilder) {
+                this.dnfBuilder = dnfBuilder;
+        }
+
+        protected abstract T self();
+
+        public NodeVariable parameter() {
+                return dnfBuilder.parameter();
+        }
+
+        public NodeVariable parameter(String name) {
+                return dnfBuilder.parameter(name);
+        }
+
+        public T parameter(NodeVariable variable) {
+                dnfBuilder.parameter(variable);
+                return self();
+        }
+
+        public T parameters(NodeVariable... variables) {
+                dnfBuilder.parameters(variables);
+                return self();
+        }
+
+        public T parameters(List<NodeVariable> variables) {
+                dnfBuilder.parameters(variables);
+                return self();
+        }
+
+        public T functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
+                dnfBuilder.functionalDependencies(functionalDependencies);
+                return self();
+        }
+
+        public T functionalDependency(FunctionalDependency<Variable> functionalDependency) {
+                dnfBuilder.functionalDependency(functionalDependency);
+                return self();
+        }
+
+        public T functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
+                dnfBuilder.functionalDependency(forEach, unique);
+                return self();
+        }
+
+        public T clause(ClauseCallback0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback1Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback1Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback2Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback2Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback2Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback3Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback3Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback3Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public <U1, U2, U3> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3,
+                                                                 ClauseCallback3Data3<U1, U2, U3> callback) {
+                dnfBuilder.clause(type1, type2, type3, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback4Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback4Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback4Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public <U1, U2, U3> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3,
+                                                                 ClauseCallback4Data3<U1, U2, U3> callback) {
+                dnfBuilder.clause(type1, type2, type3, callback);
+                return self();
+        }
+
+        public <U1, U2, U3, U4> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3, Class<U4> type4,
+                                                                         ClauseCallback4Data4<U1, U2, U3, U4> callback) {
+                dnfBuilder.clause(type1, type2, type3, type4, callback);
+                return self();
+        }
+
+        public T clause(Literal... literals) {
+                dnfBuilder.clause(literals);
+                return self();
+        }
+
+        public T clause(Collection<? extends Literal> literals) {
+                dnfBuilder.clause(literals);
+                return self();
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
index 3321a10f..8de5079d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
@@ -16,6 +16,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 public final class Dnf implements Constraint {
         private static final String INDENTATION = "    ";
@@ -196,4 +197,14 @@ public final class Dnf implements Constraint {
         public static DnfBuilder builder(String name) {
                 return new DnfBuilder(name);
         }
+
+        public static Dnf of(Consumer<DnfBuilder> callback) {
+                return of(null, callback);
+        }
+
+        public static Dnf of(String name, Consumer<DnfBuilder> callback) {
+                var builder = builder(name);
+                callback.accept(builder);
+                return builder.build();
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
index 4f920f8f..a42ae558 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
@@ -5,8 +5,10 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.dnf.callback.*;
 import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.Variable;
 
 import java.util.*;
@@ -25,6 +27,26 @@ public final class DnfBuilder {
                 this.name = name;
         }
 
+        public NodeVariable parameter() {
+                return parameter((String) null);
+        }
+
+        public NodeVariable parameter(String name) {
+                var variable = Variable.of(name);
+                parameter(variable);
+                return variable;
+        }
+
+        public <T> DataVariable<T> parameter(Class<T> type) {
+                return parameter(null, type);
+        }
+
+        public <T> DataVariable<T> parameter(String name, Class<T> type) {
+                var variable = Variable.of(name, type);
+                parameter(variable);
+                return variable;
+        }
+
         public DnfBuilder parameter(Variable variable) {
                 if (parameters.contains(variable)) {
                         throw new IllegalArgumentException("Duplicate parameter: " + variable);
@@ -56,6 +78,74 @@ public final class DnfBuilder {
                 return functionalDependency(new FunctionalDependency<>(Set.copyOf(forEach), Set.copyOf(unique)));
         }
 
+        public DnfBuilder clause(ClauseCallback0 callback) {
+                return clause(callback.toLiterals());
+        }
+
+        public DnfBuilder clause(ClauseCallback1Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback1Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1", type1)));
+        }
+
+        public DnfBuilder clause(ClauseCallback2Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback2Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback2Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2)));
+        }
+
+        public DnfBuilder clause(ClauseCallback3Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback3Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("d1", type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback3Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1), Variable.of("d2", type2)));
+        }
+
+        public <T1, T2, T3> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3,
+                                                                                  ClauseCallback3Data3<T1, T2, T3> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3)));
+        }
+
+        public DnfBuilder clause(ClauseCallback4Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3"), Variable.of("v4")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback4Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3"), Variable.of("d1",
+                                type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback4Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("d1", type1),
+                                Variable.of("d2", type2)));
+        }
+
+        public <T1, T2, T3> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3,
+                                                                                  ClauseCallback4Data3<T1, T2, T3> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3)));
+        }
+
+        public <T1, T2, T3, T4> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3, Class<T4> type4,
+                                                                                          ClauseCallback4Data4<T1, T2, T3, T4> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3), Variable.of("d4", type4)));
+        }
+
         public DnfBuilder clause(Literal... literals) {
                 clause(List.of(literals));
                 return this;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
index 63580676..d1cd7ba8 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
@@ -5,47 +5,25 @@
  */
 package tools.refinery.store.query.dnf;
 
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.DataVariable;
 
-import java.util.Collection;
-import java.util.Set;
-
-public final class FunctionalQueryBuilder<T> {
-        private final DnfBuilder dnfBuilder;
+public final class FunctionalQueryBuilder<T> extends AbstractQueryBuilder<FunctionalQueryBuilder<T>> {
+        private final DataVariable<T> outputVariable;
         private final Class<T> type;
 
-        FunctionalQueryBuilder(DnfBuilder dnfBuilder, Class<T> type) {
-                this.dnfBuilder = dnfBuilder;
+        FunctionalQueryBuilder(DataVariable<T> outputVariable, DnfBuilder dnfBuilder, Class<T> type) {
+                super(dnfBuilder);
+                this.outputVariable = outputVariable;
                 this.type = type;
         }
 
-        public FunctionalQueryBuilder<T> functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                dnfBuilder.functionalDependencies(functionalDependencies);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> functionalDependency(FunctionalDependency<Variable> functionalDependency) {
-                dnfBuilder.functionalDependency(functionalDependency);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
-                dnfBuilder.functionalDependency(forEach, unique);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> clause(Literal... literals) {
-                dnfBuilder.clause(literals);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> clause(Collection<? extends Literal> literals) {
-                dnfBuilder.clause(literals);
+        @Override
+        protected FunctionalQueryBuilder<T> self() {
                 return this;
         }
 
         public FunctionalQuery<T> build() {
+                dnfBuilder.output(outputVariable);
                 return dnfBuilder.build().asFunction(type);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
index d3de475f..e94c0c6b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
@@ -5,17 +5,130 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.store.query.term.Variable;
+
 public sealed interface Query<T> extends AnyQuery permits RelationalQuery, FunctionalQuery {
+        String OUTPUT_VARIABLE_NAME = "output";
+
         @Override
         Class<T> valueType();
 
         T defaultValue();
 
         static QueryBuilder builder() {
-                return new QueryBuilder();
+                return builder(null);
         }
 
         static QueryBuilder builder(String name) {
                 return new QueryBuilder(name);
         }
+
+        static RelationalQuery of(QueryCallback0 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback0 callback) {
+                var builder = builder(name);
+                callback.accept(builder);
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback1 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback1 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback2 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback2 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback3 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback3 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback4 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback4 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                builder.parameter("p4"));
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback0<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback0<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback1<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback1<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback2<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback2<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback3<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback3<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback4<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback4<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                builder.parameter("p4"), outputVariable);
+                return builder.build();
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
index f925c9ac..138911bc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
@@ -5,69 +5,20 @@
  */
 package tools.refinery.store.query.dnf;
 
-import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-public final class QueryBuilder {
-        private final DnfBuilder dnfBuilder;
 
+public final class QueryBuilder extends AbstractQueryBuilder<QueryBuilder> {
         QueryBuilder(String name) {
-                dnfBuilder = Dnf.builder(name);
-        }
-
-        QueryBuilder() {
-                dnfBuilder = Dnf.builder();
-        }
-
-        public QueryBuilder parameter(NodeVariable variable) {
-                dnfBuilder.parameter(variable);
-                return this;
+                super(Dnf.builder(name));
         }
 
-        public QueryBuilder parameters(NodeVariable... variables) {
-                dnfBuilder.parameters(variables);
-                return this;
-        }
-
-        public QueryBuilder parameters(List<NodeVariable> variables) {
-                dnfBuilder.parameters(variables);
+        @Override
+        protected QueryBuilder self() {
                 return this;
         }
 
         public <T> FunctionalQueryBuilder<T> output(DataVariable<T> outputVariable) {
-                dnfBuilder.output(outputVariable);
-                return new FunctionalQueryBuilder<>(dnfBuilder, outputVariable.getType());
-        }
-
-        public QueryBuilder functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                dnfBuilder.functionalDependencies(functionalDependencies);
-                return this;
-        }
-
-        public QueryBuilder functionalDependency(FunctionalDependency<Variable> functionalDependency) {
-                dnfBuilder.functionalDependency(functionalDependency);
-                return this;
-        }
-
-        public QueryBuilder functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
-                dnfBuilder.functionalDependency(forEach, unique);
-                return this;
-        }
-
-        public QueryBuilder clause(Literal... literals) {
-                dnfBuilder.clause(literals);
-                return this;
-        }
-
-        public QueryBuilder clause(Collection<? extends Literal> literals) {
-                dnfBuilder.clause(literals);
-                return this;
+                return new FunctionalQueryBuilder<>(outputVariable, dnfBuilder, outputVariable.getType());
         }
 
         public RelationalQuery build() {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java
new file mode 100644
index 00000000..d98dda2e
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback0 {
+        Collection<Literal> toLiterals();
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java
new file mode 100644
index 00000000..4c01a527
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback1Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java
new file mode 100644
index 00000000..2c0cb6eb
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback1Data1<T> {
+        Collection<Literal> toLiterals(DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java
new file mode 100644
index 00000000..d764bdba
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java
new file mode 100644
index 00000000..140af03a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T> x1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java
new file mode 100644
index 00000000..bfc8637c
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data2<T1, T2> {
+        Collection<Literal> toLiterals(DataVariable<T1> x1, DataVariable<T2> x2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java
new file mode 100644
index 00000000..074df65b
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java
new file mode 100644
index 00000000..24ba5187
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java
new file mode 100644
index 00000000..2a2e837a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data2<T1, T2> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T1> d1, DataVariable<T2> d2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java
new file mode 100644
index 00000000..8f4bdd01
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data3<T1, T2, T3> {
+        Collection<Literal> toLiterals(DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java
new file mode 100644
index 00000000..ed0f87b2
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3, NodeVariable v4);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java
new file mode 100644
index 00000000..9b27e2e1
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3, DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java
new file mode 100644
index 00000000..cbc4808e
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data2<T1, T2> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, DataVariable<T1> d1, DataVariable<T2> d2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java
new file mode 100644
index 00000000..a6258f36
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data3<T1, T2, T3> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java
new file mode 100644
index 00000000..b52a911a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data4<T1, T2, T3, T4> {
+        Collection<Literal> toLiterals(DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3, DataVariable<T4> d4);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java
new file mode 100644
index 00000000..63b3eee6
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback0<T> {
+        void accept(FunctionalQueryBuilder<T> builder, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java
new file mode 100644
index 00000000..1295a118
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback1<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java
new file mode 100644
index 00000000..d5b7f9ff
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback2<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java
new file mode 100644
index 00000000..dc8404a0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback3<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, NodeVariable p3,
+                                DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java
new file mode 100644
index 00000000..b6d3ddb0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback4<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, NodeVariable p3, NodeVariable p4,
+                                DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java
new file mode 100644
index 00000000..3cf1de48
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+
+@FunctionalInterface
+public interface QueryCallback0 {
+        void accept(QueryBuilder builder);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java
new file mode 100644
index 00000000..0a150955
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback1 {
+        void accept(QueryBuilder builder, NodeVariable p1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java
new file mode 100644
index 00000000..9493a7b4
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback2 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java
new file mode 100644
index 00000000..358c7da7
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback3 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java
new file mode 100644
index 00000000..890dda16
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback4 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3, NodeVariable p4);
+}