STNG-196 Code Quality improvements (#201)

dcsaorg · Oct 21, 2024 · 37a30f9 · 37a30f9
1 parent 4db6d3a
commit 37a30f9
Show file tree

Hide file tree

Showing 37 changed files with 386 additions and 577 deletions.
diff --git a/...n/java/org/dcsa/conformance/standards/adoption/action/SupplyScenarioParametersAction.java b/...n/java/org/dcsa/conformance/standards/adoption/action/SupplyScenarioParametersAction.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
@@ -13,13 +12,12 @@
 import lombok.Getter;
 import org.dcsa.conformance.core.UserFacingException;
 import org.dcsa.conformance.core.scenario.ConformanceAction;
+import org.dcsa.conformance.core.toolkit.JsonToolkit;
 import org.dcsa.conformance.standards.adoption.party.FilterParameter;
 import org.dcsa.conformance.standards.adoption.party.SuppliedScenarioParameters;
 
 @Getter
 public class SupplyScenarioParametersAction extends ConformanceAction {
-  public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
   private SuppliedScenarioParameters suppliedScenarioParameters = null;
   private final LinkedHashSet<FilterParameter> filterParameters;
 
@@ -86,7 +84,7 @@ public JsonNode getJsonForHumanReadablePrompt() {
                         filterParameter ->
                             switch (filterParameter) {
                               case INTERVAL -> "day";
-                              case DATE -> LocalDateTime.now().format(DATE_FORMAT);
+                              case DATE -> LocalDateTime.now().format(JsonToolkit.DEFAULT_DATE_FORMAT);
                             })))
         .toJson();
   }
@@ -108,7 +106,7 @@ public void handlePartyInput(JsonNode partyInput) {
         throw new UserFacingException("Invalid interval supplied: %s".formatted(interval));
       }
       String date = input.required("date").asText();
-      DATE_FORMAT.parse(date);
+      JsonToolkit.DEFAULT_DATE_FORMAT.parse(date);
       suppliedScenarioParameters = SuppliedScenarioParameters.fromJson(input);
     } catch (IllegalArgumentException | DateTimeParseException e) {
       throw new UserFacingException("Invalid input: %s".formatted(e.getMessage()));

diff --git a/...va/org/dcsa/conformance/standards/adoption/action/SupplyScenarioParametersActionTest.java b/...va/org/dcsa/conformance/standards/adoption/action/SupplyScenarioParametersActionTest.java
@@ -2,7 +2,6 @@
 
 import static org.dcsa.conformance.core.toolkit.JsonToolkit.OBJECT_MAPPER;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.dcsa.conformance.core.UserFacingException;

diff --git a/...org/dcsa/conformance/standards/booking/action/Carrier_SupplyScenarioParametersAction.java b/...org/dcsa/conformance/standards/booking/action/Carrier_SupplyScenarioParametersAction.java
@@ -4,9 +4,9 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
 import lombok.NonNull;
 import org.dcsa.conformance.standards.booking.checks.ScenarioType;
+import org.dcsa.conformance.standards.booking.party.BookingCarrier;
 import org.dcsa.conformance.standards.booking.party.CarrierScenarioParameters;
 
 public class Carrier_SupplyScenarioParametersAction extends BookingAction {
@@ -59,80 +59,7 @@ public String getHumanReadablePrompt() {
 
   @Override
   public JsonNode getJsonForHumanReadablePrompt() {
-    var csp = switch (scenarioType) {
-      case REGULAR, REGULAR_SHIPPER_OWNED -> new CarrierScenarioParameters( "SCR-1234-REGULAR",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "640510",
-        "Shoes - black, 400 boxes",
-        null,
-        null,
-        "DKAAR",
-        "DEBRV");
-      case REGULAR_2RE1C, REGULAR_2RE2C -> new CarrierScenarioParameters( "SCR-1234-REGULAR-2REC",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "630260",
-        "Tableware and kitchenware",
-        "691010",
-        "Kitchen pots and pans",
-        "DKAAR",
-        "DEBRV");
-      case REGULAR_CHO_DEST -> new CarrierScenarioParameters("SCR-1234-REGULAR-CHO-DEST",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "640510",
-        "Shoes - black, 400 boxes",
-        null,
-        null,
-        "DKAAR",
-        "USGBO");
-      case REGULAR_CHO_ORIG -> new CarrierScenarioParameters("SCR-1234-REGULAR-CHO-ORIG",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "640510",
-        "Shoes - black, 400 boxes",
-        null,
-        null,
-        "DKAAR",
-        "DKAAR");
-      case REGULAR_NON_OPERATING_REEFER -> new CarrierScenarioParameters("SCR-1234-NON-OPERATING-REEFER",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "220291",
-        "Non alcoholic beverages",
-        null,
-        null,
-        "DKAAR",
-        "DEBRV");
-      case REEFER, REEFER_TEMP_CHANGE -> new CarrierScenarioParameters( "SCR-1234-REEFER",
-        "Example Carrier Service",
-        "402E",
-        "service Name",
-        "04052090",
-        "Dairy products",
-        null,
-        null,
-        "DKAAR",
-        "DEBRV");
-      case DG -> new CarrierScenarioParameters("SCR-1234-DG",
-        "Example Carrier Service",
-        "403W",
-        "TA1",
-        "293499",
-        "Environmentally hazardous substance, liquid, N.O.S (Propiconazole)",
-        null,
-        null,
-        "DKAAR",
-        "DEBRV");
-    };
-
-    return csp.toJson();
+    return BookingCarrier.getCarrierScenarioParameters(scenarioType).toJson();
   }
 
   @Override

diff --git a/...java/org/dcsa/conformance/standards/booking/action/UC10_Carrier_DeclineBookingAction.java b/...java/org/dcsa/conformance/standards/booking/action/UC10_Carrier_DeclineBookingAction.java
@@ -47,7 +47,6 @@ public ConformanceCheck createCheck(String expectedApiVersion) {
     return new ConformanceCheck(getActionTitle()) {
       @Override
       protected Stream<? extends ConformanceCheck> createSubChecks() {
-        var dsp = getDspSupplier().get();
         return Stream.of(
             new UrlPathCheck(
                 BookingRole::isCarrier, getMatchedExchangeUuid(), "/v2/booking-notifications"),

diff --git a/...rg/dcsa/conformance/standards/booking/action/UC11_Shipper_CancelBookingRequestAction.java b/...rg/dcsa/conformance/standards/booking/action/UC11_Shipper_CancelBookingRequestAction.java
@@ -1,12 +1,10 @@
 package org.dcsa.conformance.standards.booking.action;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
-import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 

diff --git a/...rg/dcsa/conformance/standards/booking/action/UC13ShipperCancelConfirmedBookingAction.java b/...rg/dcsa/conformance/standards/booking/action/UC13ShipperCancelConfirmedBookingAction.java
@@ -7,13 +7,11 @@
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.ConformanceExchange;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
-import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingCancellationState;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 import org.dcsa.conformance.standards.booking.party.DynamicScenarioParameters;
 
-import java.util.Objects;
 import java.util.stream.Stream;
 
 @Getter

diff --git a/...org/dcsa/conformance/standards/booking/action/UC1_Shipper_SubmitBookingRequestAction.java b/...org/dcsa/conformance/standards/booking/action/UC1_Shipper_SubmitBookingRequestAction.java
@@ -9,7 +9,6 @@
 import org.dcsa.conformance.core.traffic.ConformanceExchange;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
 import org.dcsa.conformance.standards.booking.checks.BookingChecks;
-import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 import org.dcsa.conformance.standards.booking.party.DynamicScenarioParameters;

diff --git a/...ava/org/dcsa/conformance/standards/booking/action/UC7_Shipper_SubmitBookingAmendment.java b/...ava/org/dcsa/conformance/standards/booking/action/UC7_Shipper_SubmitBookingAmendment.java
@@ -1,19 +1,16 @@
 package org.dcsa.conformance.standards.booking.action;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.stream.Stream;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.ConformanceExchange;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
-import org.dcsa.conformance.standards.booking.checks.BookingChecks;
-import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 import org.dcsa.conformance.standards.booking.party.DynamicScenarioParameters;
 
-import java.util.stream.Stream;
-
 @Getter
 @Slf4j
 public class UC7_Shipper_SubmitBookingAmendment extends StateChangingBookingAction {

diff --git a/...ava/org/dcsa/conformance/standards/booking/action/UC9_Shipper_CancelBookingAmendment.java b/...ava/org/dcsa/conformance/standards/booking/action/UC9_Shipper_CancelBookingAmendment.java
@@ -5,7 +5,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
-import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 

diff --git a/...in/java/org/dcsa/conformance/standards/booking/checks/PayloadContentConformanceCheck.java b/...in/java/org/dcsa/conformance/standards/booking/checks/PayloadContentConformanceCheck.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.dcsa.conformance.core.check.ActionCheck;
 import org.dcsa.conformance.core.check.ConformanceCheck;
 import org.dcsa.conformance.core.traffic.ConformanceExchange;