feat(config): ability to configure table delimiters

Closes: #77

Author: nergal-perm

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

@@ -23,9 +23,11 @@
  */
 package ru.ewc.checklogic;
 
+import java.net.URI;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
+import ru.ewc.decisions.input.CombinedCsvFileReader;
 
 /**
  * I am a context for the web server.
@@ -49,7 +51,8 @@ public ServerConfiguration(final String root) {
             Map.of(
                 "request", "request",
                 "command", "available",
-                "function", "function"
+                "function", "function",
+                "delimiter", ","
             )
         );
     }
@@ -90,6 +93,10 @@ public String getRoot() {
         return this.root;
     }
 
+    public CombinedCsvFileReader csvReader(final URI path) {
+        return new CombinedCsvFileReader(path, ".csv", this.getParameterValue("delimiter"));
+    }
+
     public String functionsLocatorName() {
         return this.parameters.get("function");
     }

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

@@ -26,6 +26,7 @@
 import java.net.URI;
 import java.nio.file.Path;
 import ru.ewc.decisions.api.ComputationContext;
+import ru.ewc.decisions.api.DecisionTables;
 
 /**
  * I am a factory for creating server contexts.
@@ -86,7 +87,10 @@ public ServerInstance initialState() {
     }
 
     public ComputationContext context() {
-        return new ComputationContext(this.factory.initialState(), this.tablesFolder());
+        return new ComputationContext(
+            this.factory.initialState(),
+            DecisionTables.using(this.config.csvReader(this.tablesFolder()))
+        );
     }
 
     public ServerConfiguration configuration() {

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

@@ -28,12 +28,10 @@
 import java.util.List;
 import java.util.Map;
 import lombok.Getter;
-import ru.ewc.checklogic.testing.CheckSuite;
 import ru.ewc.decisions.api.ComputationContext;
 import ru.ewc.decisions.api.DecisionTables;
 import ru.ewc.decisions.api.DecitaException;
 import ru.ewc.decisions.api.InMemoryLocator;
-import ru.ewc.decisions.input.CombinedCsvFileReader;
 import ru.ewc.state.State;
 
 /**
@@ -162,11 +160,7 @@ public boolean isNotSpecified(final String arg) {
         return function && !this.states.functionSpecified(args[1]) || request;
     }
 
-    public void createState(final String include, final CheckSuite suite) {
-        suite.findAndPerform(include, this.context);
-    }
-
     private DecisionTables getAllTables() {
-        return DecisionTables.using(new CombinedCsvFileReader(this.tables, ".csv", ";"));
+        return DecisionTables.using(this.server.csvReader(this.tables));
     }
 }

src/main/java/ru/ewc/checklogic/server/StatePage.java

@@ -27,7 +27,6 @@
 import com.renomad.minum.web.RequestLine;
 import com.renomad.minum.web.Response;
 import com.renomad.minum.web.WebFramework;
-import java.net.URI;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +36,6 @@
 import ru.ewc.checklogic.testing.CheckSuite;
 import ru.ewc.decisions.api.ComputationContext;
 import ru.ewc.decisions.api.OutputTracker;
-import ru.ewc.decisions.input.CombinedCsvFileReader;
 
 /**
  * I am a class providing access to the state page.
@@ -149,16 +147,12 @@ private Response resetState(final Request request) {
 
     private CheckSuite testSuite() {
         return CheckSuite.using(
-            new CombinedCsvFileReader(this.testsFolder(), ".csv", ";"),
+            this.config.csvReader(Path.of(this.context.getRoot(), "tests").toUri()),
             this.context.getRoot(),
             this.config.requestLocatorName()
         );
     }
 
-    private URI testsFolder() {
-        return Path.of(this.context.getRoot(), "tests").toUri();
-    }
-
     private String listOfIncludes() {
         return this.testSuite().checkNames().stream()
             .sorted()

src/main/java/ru/ewc/checklogic/server/WebPages.java

@@ -32,7 +32,6 @@
 import ru.ewc.checklogic.ServerConfiguration;
 import ru.ewc.checklogic.testing.CheckSuite;
 import ru.ewc.checklogic.testing.TestResult;
-import ru.ewc.decisions.input.CombinedCsvFileReader;
 
 /**
  * I am a collection of template processors that render the pages to be served.
@@ -80,7 +79,7 @@ public Response uninitializedPage() {
 
     public Response testPage() {
         final CheckSuite suite = CheckSuite.using(
-            new CombinedCsvFileReader(Path.of(this.root, "tests").toUri(), ".csv", ";"),
+            this.config.csvReader(Path.of(this.root, "tests").toUri()),
             this.root,
             this.config.requestLocatorName()
         );

src/main/java/ru/ewc/checklogic/server/config/ConfigPage.java

@@ -51,6 +51,11 @@ public final class ConfigPage implements Endpoints {
      */
     private static final String REQUEST = "request";
 
+    /**
+     * The name of the configuration parameter that holds the delimiter for the table.
+     */
+    private static final String DELIMITER = "delimiter";
+
     /**
      * The configuration of the web server.
      */
@@ -82,6 +87,9 @@ void updateParametersFrom(final Request request) {
         if (keys.contains("reqLocator") && request.body().asBytes("reqLocator").length > 0) {
             this.config.setParameterValue(ConfigPage.REQUEST, fieldFrom(request, "reqLocator"));
         }
+        if (keys.contains("delimiter") && request.body().asBytes("delimiter").length > 0) {
+            this.config.setParameterValue(ConfigPage.DELIMITER, fieldFrom(request, "delimiter"));
+        }
     }
 
     Response render(final Request request) {
@@ -91,7 +99,8 @@ Response render(final Request request) {
     Map<String, String> parameters() {
         return Map.of(
             "commandAvailabilityOutcome", this.config.getParameterValue(ConfigPage.COMMAND),
-            "requestLocatorName", this.config.getParameterValue(ConfigPage.REQUEST)
+            "requestLocatorName", this.config.getParameterValue(ConfigPage.REQUEST),
+            "tableDelimiter", this.config.getParameterValue(ConfigPage.DELIMITER)
         );
     }
 

src/main/resources/templates/config.html

@@ -34,6 +34,11 @@ <h1>Configuration</h1>
             <input class="form-control" type="text" id="reqLocator" name="reqLocator"
                    value="{{ requestLocatorName }}">
         </div>
+        <div class="mb-3">
+            <label class="col-form-label" for="delimiter">Table columns delimiter:</label>
+            <input class="form-control" type="text" id="delimiter" name="delimiter"
+                   value="{{ tableDelimiter }}">
+        </div>
         <button class="btn btn-primary" type="submit">Update configuration</button>
     </form>
 </div>