Required adjustments after merging test into dev

dcsaorg · Dec 10, 2023 · 995eaa5 · 995eaa5
1 parent 291768b
commit 995eaa5
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 58 deletions.
diff --git a/booking/src/main/java/org/dcsa/conformance/standards/booking/party/Carrier.java b/booking/src/main/java/org/dcsa/conformance/standards/booking/party/Carrier.java
@@ -2,22 +2,14 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.time.Instant;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.StreamSupport;
 import lombok.Builder;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -450,8 +442,8 @@ private ConformanceResponse _handlePutBookingRequest(ConformanceRequest request)
                       .booking(booking)
                       .build()
                       .asJsonNode()),
-          1,
-          TimeUnit.SECONDS);
+          100,
+          TimeUnit.MILLISECONDS);
     }
     return returnBookingStatusResponse(200, request, booking, cbrr);
   }
@@ -581,8 +573,8 @@ private ConformanceResponse _handlePostBookingRequest(ConformanceRequest request
                       .booking(persistableCarrierBooking.getBooking())
                       .build()
                       .asJsonNode()),
-          1,
-          TimeUnit.SECONDS);
+          100,
+          TimeUnit.MILLISECONDS);
     }
     return returnBookingStatusResponse(
       201,

diff --git a/core/src/main/java/org/dcsa/conformance/core/party/ConformanceParty.java b/core/src/main/java/org/dcsa/conformance/core/party/ConformanceParty.java
@@ -188,30 +188,6 @@ protected void asyncCounterpartPatch(String path, Map<String, ? extends Collecti
     asyncCounterpartPatch(path, queryParams, jsonBody, conformanceResponse -> {});
   }
 
-  protected void asyncCounterpartGet(
-      String path,
-      Map<String, ? extends Collection<String>> queryParams) {
-    asyncWebClient.accept(
-        new ConformanceRequest(
-            "GET",
-            counterpartConfiguration.getUrl() + path,
-            queryParams,
-            new ConformanceMessage(
-                partyConfiguration.getName(),
-                partyConfiguration.getRole(),
-                counterpartConfiguration.getName(),
-                counterpartConfiguration.getRole(),
-                counterpartConfiguration.getAuthHeaderName().isBlank()
-                    ? Map.of("Api-Version", List.of(apiVersion))
-                    : Map.of(
-                        "Api-Version",
-                        List.of(apiVersion),
-                        counterpartConfiguration.getAuthHeaderName(),
-                        List.of(counterpartConfiguration.getAuthHeaderValue())),
-                new ConformanceMessageBody(""),
-                System.currentTimeMillis())));
-  }
-
   protected void asyncCounterpartPost(String path, JsonNode jsonBody) {
     asyncCounterpartPost(path, jsonBody, conformanceResponse -> {});
   }

diff --git a/ebl/src/main/java/org/dcsa/conformance/standards/ebl/party/EblCarrier.java b/ebl/src/main/java/org/dcsa/conformance/standards/ebl/party/EblCarrier.java
@@ -441,8 +441,8 @@ private ConformanceResponse _handlePostShippingInstructions(ConformanceRequest r
               .shippingInstructions(si.getShippingInstructions())
               .build()
               .asJsonNode()),
-        1,
-        TimeUnit.SECONDS);
+        100,
+        TimeUnit.MILLISECONDS);
     }
     return returnShippingInstructionsRefStatusResponse(
       201,
@@ -476,8 +476,8 @@ private ConformanceResponse _handlePutShippingInstructions(ConformanceRequest re
               .shippingInstructions(si.getShippingInstructions())
               .build()
               .asJsonNode()),
-        1,
-        TimeUnit.SECONDS);
+        100,
+        TimeUnit.MILLISECONDS);
     }
     return returnShippingInstructionsRefStatusResponse(200, request, si.getShippingInstructions(), documentReference);
   }

diff --git a/ovs/src/main/java/org/dcsa/conformance/standards/ovs/OvsComponentFactory.java b/ovs/src/main/java/org/dcsa/conformance/standards/ovs/OvsComponentFactory.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -12,8 +13,10 @@
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ScenarioListBuilder;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.toolkit.JsonToolkit;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
+import org.dcsa.conformance.core.traffic.ConformanceResponse;
 import org.dcsa.conformance.standards.ovs.party.OvsPublisher;
 import org.dcsa.conformance.standards.ovs.party.OvsRole;
 import org.dcsa.conformance.standards.ovs.party.OvsSubscriber;
@@ -38,7 +41,8 @@ public OvsComponentFactory(String standardVersion) {
   public List<ConformanceParty> createParties(
       PartyConfiguration[] partyConfigurations,
       CounterpartConfiguration[] counterpartConfigurations,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     Map<String, PartyConfiguration> partyConfigurationsByRoleName =
         Arrays.stream(partyConfigurations)
@@ -57,6 +61,7 @@ public List<ConformanceParty> createParties(
               standardVersion,
               publisherConfiguration,
               counterpartConfigurationsByRoleName.get(OvsRole.SUBSCRIBER.getConfigName()),
+              persistentMap,
               asyncWebClient,
               orchestratorAuthHeader));
     }
@@ -69,6 +74,7 @@ public List<ConformanceParty> createParties(
               standardVersion,
               subscriberConfiguration,
               counterpartConfigurationsByRoleName.get(OvsRole.PUBLISHER.getConfigName()),
+              persistentMap,
               asyncWebClient,
               orchestratorAuthHeader));
     }
@@ -116,8 +122,7 @@ public JsonSchemaValidator getMessageSchemaValidator(String apiProviderRole, boo
                 standardVersion.startsWith("2") ? "v22" : "v30", apiProviderRole.toLowerCase());
     String schemaName =
         OvsRole.isPublisher(apiProviderRole) ? (forRequest ? null : "serviceSchedules") : null;
-    return new JsonSchemaValidator(
-        OvsComponentFactory.class.getResourceAsStream(schemaFilePath), schemaName);
+    return JsonSchemaValidator.getInstance(schemaFilePath, schemaName);
   }
 
   @SneakyThrows

diff --git a/ovs/src/main/java/org/dcsa/conformance/standards/ovs/party/OvsPublisher.java b/ovs/src/main/java/org/dcsa/conformance/standards/ovs/party/OvsPublisher.java
@@ -3,12 +3,14 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.party.ConformanceParty;
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ConformanceAction;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.toolkit.JsonToolkit;
 import org.dcsa.conformance.core.traffic.ConformanceMessageBody;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
@@ -21,12 +23,14 @@ public OvsPublisher(
       String apiVersion,
       PartyConfiguration partyConfiguration,
       CounterpartConfiguration counterpartConfiguration,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     super(
         apiVersion,
         partyConfiguration,
         counterpartConfiguration,
+        persistentMap,
         asyncWebClient,
         orchestratorAuthHeader);
   }

diff --git a/ovs/src/main/java/org/dcsa/conformance/standards/ovs/party/OvsSubscriber.java b/ovs/src/main/java/org/dcsa/conformance/standards/ovs/party/OvsSubscriber.java
@@ -3,12 +3,14 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.party.ConformanceParty;
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ConformanceAction;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
 import org.dcsa.conformance.core.traffic.ConformanceResponse;
 import org.dcsa.conformance.standards.ovs.action.OvsGetSchedulesAction;
@@ -20,12 +22,14 @@ public OvsSubscriber(
       String apiVersion,
       PartyConfiguration partyConfiguration,
       CounterpartConfiguration counterpartConfiguration,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     super(
         apiVersion,
         partyConfiguration,
         counterpartConfiguration,
+        persistentMap,
         asyncWebClient,
         orchestratorAuthHeader);
   }

diff --git a/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java b/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java
@@ -387,7 +387,7 @@ private JsonNode _handleActionInput(String userId, JsonNode requestNode) {
         asyncWebClient,
         sandboxId,
         requestNode.get("actionId").asText(),
-        actionInputNode == null ? null : actionInputNode.asText());
+        actionInputNode);
   }
 
   private JsonNode _startOrStopScenario(String userId, JsonNode requestNode) {

diff --git a/spring-boot/src/main/java/org/dcsa/conformance/springboot/ConformanceApplication.java b/spring-boot/src/main/java/org/dcsa/conformance/springboot/ConformanceApplication.java
@@ -342,6 +342,8 @@ private String _buildHomeSandboxSection(String sandboxId) {
             .formatted(localhostAuthUrlToken, sandboxId),
         "<a href=\"/conformance/%s/sandbox/%s/report\">Report</a> - "
             .formatted(localhostAuthUrlToken, sandboxId),
+        "<a href=\"/conformance/%s/sandbox/%s/printableReport\">Printable</a> - "
+            .formatted(localhostAuthUrlToken, sandboxId),
         "<a href=\"/conformance/%s/sandbox/%s/party/%s/prompt/json\">Carrier1 prompt</a> - "
             .formatted(localhostAuthUrlToken, sandboxId, "Carrier1"),
         "<a href=\"/conformance/%s/sandbox/%s/party/%s/prompt/json\">Platform1 prompt</a>"

diff --git a/tnt/src/main/java/org/dcsa/conformance/standards/tnt/TntComponentFactory.java b/tnt/src/main/java/org/dcsa/conformance/standards/tnt/TntComponentFactory.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -12,8 +13,10 @@
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ScenarioListBuilder;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.toolkit.JsonToolkit;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
+import org.dcsa.conformance.core.traffic.ConformanceResponse;
 import org.dcsa.conformance.standards.tnt.action.TntEventType;
 import org.dcsa.conformance.standards.tnt.party.TntPublisher;
 import org.dcsa.conformance.standards.tnt.party.TntRole;
@@ -39,7 +42,8 @@ public TntComponentFactory(String standardVersion) {
   public List<ConformanceParty> createParties(
       PartyConfiguration[] partyConfigurations,
       CounterpartConfiguration[] counterpartConfigurations,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     Map<String, PartyConfiguration> partyConfigurationsByRoleName =
         Arrays.stream(partyConfigurations)
@@ -58,6 +62,7 @@ public List<ConformanceParty> createParties(
               standardVersion,
               publisherConfiguration,
               counterpartConfigurationsByRoleName.get(TntRole.SUBSCRIBER.getConfigName()),
+              persistentMap,
               asyncWebClient,
               orchestratorAuthHeader));
     }
@@ -70,6 +75,7 @@ public List<ConformanceParty> createParties(
               standardVersion,
               subscriberConfiguration,
               counterpartConfigurationsByRoleName.get(TntRole.PUBLISHER.getConfigName()),
+              persistentMap,
               asyncWebClient,
               orchestratorAuthHeader));
     }
@@ -115,16 +121,13 @@ public Map<TntEventType, JsonSchemaValidator> getEventSchemaValidators() {
     return Map.ofEntries(
         Map.entry(
             TntEventType.EQUIPMENT,
-            new JsonSchemaValidator(
-                TntComponentFactory.class.getResourceAsStream(schemaFilePath), "equipmentEvent")),
+            JsonSchemaValidator.getInstance(schemaFilePath, "equipmentEvent")),
         Map.entry(
             TntEventType.SHIPMENT,
-            new JsonSchemaValidator(
-                TntComponentFactory.class.getResourceAsStream(schemaFilePath), "shipmentEvent")),
+          JsonSchemaValidator.getInstance(schemaFilePath, "shipmentEvent")),
         Map.entry(
             TntEventType.TRANSPORT,
-            new JsonSchemaValidator(
-                TntComponentFactory.class.getResourceAsStream(schemaFilePath), "transportEvent")));
+          JsonSchemaValidator.getInstance(schemaFilePath, "transportEvent")));
   }
 
   public JsonSchemaValidator getMessageSchemaValidator(String apiProviderRole, boolean forRequest) {
@@ -134,8 +137,7 @@ public JsonSchemaValidator getMessageSchemaValidator(String apiProviderRole, boo
                 standardVersion.startsWith("2") ? "v22" : "v30", apiProviderRole.toLowerCase());
     String schemaName =
         TntRole.isPublisher(apiProviderRole) ? (forRequest ? null : "events") : null;
-    return new JsonSchemaValidator(
-        TntComponentFactory.class.getResourceAsStream(schemaFilePath), schemaName);
+    return JsonSchemaValidator.getInstance(schemaFilePath, schemaName);
   }
 
   @SneakyThrows

diff --git a/tnt/src/main/java/org/dcsa/conformance/standards/tnt/action/TntGetEventsAction.java b/tnt/src/main/java/org/dcsa/conformance/standards/tnt/action/TntGetEventsAction.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Stream;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -60,7 +61,8 @@ private ArrayList<JsonNode> _findEventNodes(
               }
 
               @Override
-              protected Set<String> checkConformance(ConformanceExchange exchange) {
+              protected Set<String> checkConformance(Function<UUID, ConformanceExchange> getExchangeByUuid) {
+                ConformanceExchange exchange = getExchangeByUuid.apply(matchedExchangeUuid);
                 JsonNode jsonResponse = exchange.getMessage(httpMessageType).body().getJsonBody();
                 LinkedHashSet<String> validationErrors = new LinkedHashSet<>();
                 if (!jsonResponse.isArray()) {

diff --git a/tnt/src/main/java/org/dcsa/conformance/standards/tnt/party/TntPublisher.java b/tnt/src/main/java/org/dcsa/conformance/standards/tnt/party/TntPublisher.java
@@ -3,12 +3,14 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.party.ConformanceParty;
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ConformanceAction;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.toolkit.JsonToolkit;
 import org.dcsa.conformance.core.traffic.ConformanceMessageBody;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
@@ -21,12 +23,14 @@ public TntPublisher(
       String apiVersion,
       PartyConfiguration partyConfiguration,
       CounterpartConfiguration counterpartConfiguration,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     super(
         apiVersion,
         partyConfiguration,
         counterpartConfiguration,
+        persistentMap,
         asyncWebClient,
         orchestratorAuthHeader);
   }

diff --git a/tnt/src/main/java/org/dcsa/conformance/standards/tnt/party/TntSubscriber.java b/tnt/src/main/java/org/dcsa/conformance/standards/tnt/party/TntSubscriber.java
@@ -3,12 +3,14 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.party.ConformanceParty;
 import org.dcsa.conformance.core.party.CounterpartConfiguration;
 import org.dcsa.conformance.core.party.PartyConfiguration;
 import org.dcsa.conformance.core.scenario.ConformanceAction;
+import org.dcsa.conformance.core.state.JsonNodeMap;
 import org.dcsa.conformance.core.traffic.ConformanceRequest;
 import org.dcsa.conformance.core.traffic.ConformanceResponse;
 import org.dcsa.conformance.standards.tnt.action.TntGetEventsAction;
@@ -20,12 +22,14 @@ public TntSubscriber(
       String apiVersion,
       PartyConfiguration partyConfiguration,
       CounterpartConfiguration counterpartConfiguration,
-      Consumer<ConformanceRequest> asyncWebClient,
+      JsonNodeMap persistentMap,
+      BiConsumer<ConformanceRequest, Consumer<ConformanceResponse>> asyncWebClient,
       Map<String, ? extends Collection<String>> orchestratorAuthHeader) {
     super(
         apiVersion,
         partyConfiguration,
         counterpartConfiguration,
+        persistentMap,
         asyncWebClient,
         orchestratorAuthHeader);
   }