Spike/new decita syntax

pom.xml

@@ -113,7 +113,7 @@
     <dependency>
       <groupId>io.github.nergal-perm</groupId>
       <artifactId>java-decita</artifactId>
-      <version>0.7.1</version>
+      <version>0.8.0</version>
     </dependency>
     <dependency>
       <groupId>com.renomad</groupId>
@@ -125,11 +125,6 @@
       <artifactId>jcabi-matchers</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

src/main/java/ru/ewc/checklogic/FileStateFactory.java

@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import lombok.SneakyThrows;
 import org.yaml.snakeyaml.Yaml;
 import ru.ewc.decisions.api.Locator;
@@ -64,7 +63,7 @@ public State initialState() {
             state = FileStateFactory.stateFromAppConfig(file);
             state.locators().putAll(this.locatorsFromFile());
         } catch (final NoSuchFileException exception) {
-            state = new NullState(Map.of());
+            state = State.EMPTY;
         }
         return state;
     }
@@ -97,7 +96,7 @@ private Map<String, Locator> locatorsFromFile() {
                     "There is no Arrange section in the test file, you should add one"
                 );
             }
-            raw.forEach((name, data) -> locators.put(name, new InMemoryStorage(data)));
+            raw.forEach((name, data) -> locators.put(name, new InMemoryStorage(name, data)));
         }
         return locators;
     }
@@ -106,14 +105,9 @@ private Map<String, Locator> locatorsFromFile() {
     @SuppressWarnings("unchecked")
     private static State stateFromAppConfig(final InputStream file) {
         final Map<String, Object> config = new Yaml().load(file);
-        final Stream<String> names = ((List<String>) config.get("locators")).stream();
-        return new State(
-            names.collect(
-                Collectors.toMap(
-                    name -> name,
-                    name -> new InMemoryStorage(new HashMap<>())
-                )
-            )
+        return new State(((List<String>) config.get("locators")).stream()
+            .map(name -> new InMemoryStorage(name, new HashMap<>()))
+            .collect(Collectors.toList())
         );
     }
 }

src/main/java/ru/ewc/checklogic/InMemoryStorage.java

@@ -37,6 +37,11 @@
  */
 @SuppressWarnings("PMD.ProhibitPublicStaticMethods")
 public final class InMemoryStorage implements Locator {
+    /**
+     * The name of this instance.
+     */
+    private final String name;
+
     /**
      * Simple key-value storage.
      */
@@ -45,14 +50,19 @@ public final class InMemoryStorage implements Locator {
     /**
      * Ctor.
      *
+     * @param name This instance name, used to find the storage among other Locators.
      * @param storage The pre-filled key-value storage to start with.
      */
-    public InMemoryStorage(final Map<String, Object> storage) {
+    public InMemoryStorage(final String name, final Map<String, Object> storage) {
+        this.name = name;
         this.storage = storage;
     }
 
-    public static InMemoryStorage from(final List<String> values) {
-        final InMemoryStorage storage = new InMemoryStorage(HashMap.newHashMap(values.size()));
+    public static InMemoryStorage from(final String name, final List<String> values) {
+        final InMemoryStorage storage = new InMemoryStorage(
+            name,
+            HashMap.newHashMap(values.size())
+        );
         values.forEach(
             value -> {
                 final String[] split = value.split(":");
@@ -75,4 +85,9 @@ public void setFragmentValue(final String fragment, final String value) {
     public Map<String, Object> state() {
         return this.storage;
     }
+
+    @Override
+    public String locatorName() {
+        return this.name;
+    }
 }

src/main/java/ru/ewc/checklogic/LogicChecker.java

@@ -51,7 +51,7 @@ public static void main(final String[] args) {
         }
         final String root = args[0];
         final ServerContextFactory factory = ServerContextFactory.create(root);
-        final FullServerContext context = factory.initialState();
+        final ServerInstance context = factory.initialState();
         final FullSystem minum = FullSystem.initialize();
         final WebFramework web = minum.getWebFramework();
         registerEndpoints(web, new ConfigPage(factory.configuration()));

src/main/java/ru/ewc/checklogic/MockStateFactory.java

@@ -24,6 +24,7 @@
 package ru.ewc.checklogic;
 
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 import ru.ewc.state.State;
 
@@ -40,9 +41,9 @@ public MockStateFactory(final String root) {
     @Override
     public State initialState() {
         return new State(
-            Map.of(
-                "locator", new InMemoryStorage(Map.of("fragment", "value")),
-                "request", new InMemoryStorage(Map.of())
+            List.of(
+                new InMemoryStorage("locator", Map.of("fragment", "value")),
+                new InMemoryStorage("request", Map.of())
             )
         );
     }

src/main/java/ru/ewc/checklogic/ServerContextFactory.java

@@ -23,8 +23,9 @@
  */
 package ru.ewc.checklogic;
 
-import java.io.InputStream;
+import java.net.URI;
 import java.nio.file.Path;
+import ru.ewc.decisions.api.ComputationContext;
 
 /**
  * I am a factory for creating server contexts.
@@ -78,35 +79,19 @@ public static ServerContextFactory create(final String root) {
      *
      * @return A new server context initialized with the basic set of empty Locators.
      */
-    public FullServerContext initialState() {
-        final FullServerContext result = new FullServerContext(
-            this.factory,
-            Path.of(this.root, "tables").toUri(),
-            Path.of(this.root, "commands").toUri(),
-            this.config
-        );
-        result.cache("command", "available");
-        result.cache("request", "request");
-        return result;
+    public ServerInstance initialState() {
+        return new ServerInstance(this.factory, this.tablesFolder(), this.config);
     }
 
-    /**
-     * Creates a new server context from a state file. Used in state-based tests, where each test
-     * gets its own initial state, described in test "Arrange" section.
-     *
-     * @param file The stream of the test file's contents.
-     * @return A new server context initialized with state described in test file.
-     */
-    public FullServerContext fromStateFile(final InputStream file) {
-        return new FullServerContext(
-            this.factory.with(file),
-            Path.of(this.root, "tables").toUri(),
-            Path.of(this.root, "commands").toUri(),
-            this.config
-        );
+    public ComputationContext context() {
+        return new ComputationContext(this.factory.initialState(), this.tablesFolder());
     }
 
     public ServerConfiguration configuration() {
         return this.config;
     }
+
+    private URI tablesFolder() {
+        return Path.of(this.root, "tables").toUri();
+    }
 }