4 files changed, 23 insertions, 32 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQuery.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQuery.java
deleted file mode 100644
index 3fff6f2e..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQuery.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra;
-
-import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.ModelQuery;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryBuilderImpl;
-
-public final class ViatraModelQuery extends ModelAdapterBuilderFactory<ViatraModelQueryAdapter,
-                ViatraModelQueryStoreAdapter, ViatraModelQueryBuilder> {
-        public static final ViatraModelQuery ADAPTER = new ViatraModelQuery();
-
-        private ViatraModelQuery() {
-                super(ViatraModelQueryAdapter.class, ViatraModelQueryStoreAdapter.class, ViatraModelQueryBuilder.class);
-                extendsAdapter(ModelQuery.ADAPTER);
-        }
-
-        @Override
-        public ViatraModelQueryBuilder createBuilder(ModelStoreBuilder storeBuilder) {
-                return new ViatraModelQueryBuilderImpl(storeBuilder);
-        }
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java
index 411e251e..12c93f62 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java
@@ -6,8 +6,13 @@
 package tools.refinery.store.query.viatra;
 
 import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.viatra.internal.ViatraModelQueryBuilderImpl;
 
 public interface ViatraModelQueryAdapter extends ModelQueryAdapter {
         @Override
         ViatraModelQueryStoreAdapter getStoreAdapter();
+
+        static ViatraModelQueryBuilder builder() {
+                return new ViatraModelQueryBuilderImpl();
+        }
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
index 310171e8..931a07aa 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
@@ -50,5 +50,5 @@ public interface ViatraModelQueryBuilder extends ModelQueryBuilder {
         ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint);
 
         @Override
-        ViatraModelQueryStoreAdapter createStoreAdapter(ModelStore store);
+        ViatraModelQueryStoreAdapter build(ModelStore store);
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
index 44ed1505..ce2467b4 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
@@ -25,7 +25,8 @@ import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery;
 import java.util.*;
 import java.util.function.Function;
 
-public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder implements ViatraModelQueryBuilder {
+public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<ViatraModelQueryStoreAdapterImpl>
+                implements ViatraModelQueryBuilder {
         private ViatraQueryEngineOptions.Builder engineOptionsBuilder;
         private QueryEvaluationHint defaultHint = new QueryEvaluationHint(Map.of(
                         // Use a cost function that ignores the initial (empty) model but allows higher arity input keys.
@@ -35,8 +36,7 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder imp
         private final Set<AnyQuery> vacuousQueries = new LinkedHashSet<>();
         private final Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications = new LinkedHashMap<>();
 
-        public ViatraModelQueryBuilderImpl(ModelStoreBuilder storeBuilder) {
-                super(storeBuilder);
+        public ViatraModelQueryBuilderImpl() {
                 engineOptionsBuilder = new ViatraQueryEngineOptions.Builder()
                                 .withDefaultBackend(ReteBackendFactory.INSTANCE)
                                 .withDefaultCachingBackend(ReteBackendFactory.INSTANCE)
@@ -45,36 +45,42 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder imp
 
         @Override
         public ViatraModelQueryBuilder engineOptions(ViatraQueryEngineOptions engineOptions) {
+                checkNotConfigured();
                 engineOptionsBuilder = new ViatraQueryEngineOptions.Builder(engineOptions);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder defaultHint(QueryEvaluationHint queryEvaluationHint) {
+                checkNotConfigured();
                 defaultHint = defaultHint.overrideBy(queryEvaluationHint);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder backend(IQueryBackendFactory queryBackendFactory) {
+                checkNotConfigured();
                 engineOptionsBuilder.withDefaultBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder cachingBackend(IQueryBackendFactory queryBackendFactory) {
+                checkNotConfigured();
                 engineOptionsBuilder.withDefaultCachingBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder searchBackend(IQueryBackendFactory queryBackendFactory) {
+                checkNotConfigured();
                 engineOptionsBuilder.withDefaultSearchBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder query(AnyQuery query) {
+                checkNotConfigured();
                 if (querySpecifications.containsKey(query) || vacuousQueries.contains(query)) {
                         // Ignore duplicate queries.
                         return this;
@@ -103,20 +109,26 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder imp
 
         @Override
         public ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
+                checkNotConfigured();
                 dnf2PQuery.setComputeHint(computeHint);
                 return this;
         }
 
         @Override
         public ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint) {
+                checkNotConfigured();
                 dnf2PQuery.hint(dnf, queryEvaluationHint);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryStoreAdapterImpl createStoreAdapter(ModelStore store) {
-                validateSymbols(store);
+        public void doConfigure(ModelStoreBuilder storeBuilder) {
                 dnf2PQuery.assertNoUnusedHints();
+        }
+
+        @Override
+        public ViatraModelQueryStoreAdapterImpl doBuild(ModelStore store) {
+                validateSymbols(store);
                 return new ViatraModelQueryStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(),
                                 Collections.unmodifiableMap(querySpecifications), Collections.unmodifiableSet(vacuousQueries));
         }