Add Beta 2 plumbing for ebl issuance and surrender

ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceComponentFactory.java

@@ -117,9 +117,9 @@ public Set<String> getReportRoleNames(
 
   public JsonSchemaValidator getMessageSchemaValidator(String apiProviderRole, boolean forRequest) {
     String schemaFilePath =
-        "/standards/eblissuance/schemas/eblissuance-%s-%s.json"
+        "/standards/eblissuance/schemas/eblissuance-v%s-%s.json"
             .formatted(
-                standardVersion.startsWith("2") ? "v20" : "v30", apiProviderRole.toLowerCase());
+                standardVersion, apiProviderRole.toLowerCase());
     String schemaName =
         EblIssuanceRole.isCarrier(apiProviderRole)
             ? (forRequest ? "issuanceRequest" : null)

ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/party/EblIssuanceCarrier.java

@@ -94,8 +94,8 @@ private void sendIssuanceRequest(JsonNode actionPrompt) {
 
     var jsonRequestBody =
         JsonToolkit.templateFileToJsonNode(
-            "/standards/eblissuance/messages/eblissuance-%s-request.json"
-                .formatted(apiVersion.startsWith("3") ? "v30" : "v20"),
+            "/standards/eblissuance/messages/eblissuance-v%s-request.json"
+                .formatted(apiVersion),
             Map.ofEntries(
                 Map.entry("TRANSPORT_DOCUMENT_REFERENCE_PLACEHOLDER", tdr),
                 Map.entry("SHIPPING_INSTRUCTION_REFERENCE_PLACEHOLDER", sir),
@@ -136,7 +136,7 @@ private void sendIssuanceRequest(JsonNode actionPrompt) {
     }
 
     syncCounterpartPost(
-        "/%s/ebl-issuance-requests".formatted(apiVersion.startsWith("3") ? "v3" : "v2"),
+        "/v%s/ebl-issuance-requests".formatted(apiVersion.charAt(0)),
         jsonRequestBody);
 
     addOperatorLogEntry(

ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/party/EblIssuancePlatform.java

@@ -106,7 +106,7 @@ private void sendIssuanceResponse(JsonNode actionPrompt) {
     }
 
     syncCounterpartPost(
-        "/%s/ebl-issuance-responses".formatted(apiVersion.startsWith("3") ? "v3" : "v2"),
+        "/v%s/ebl-issuance-responses".formatted(apiVersion.charAt(0)),
         objectMapper
             .createObjectNode()
             .put("transportDocumentReference", tdr)

ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderComponentFactory.java

@@ -20,7 +20,11 @@
 
 public class EblSurrenderComponentFactory extends AbstractComponentFactory {
   public static final String STANDARD_NAME = "eBL Surrender";
-  public static final List<String> STANDARD_VERSIONS = List.of("2.0.0-Beta-1", "3.0.0-Beta-1");
+  public static final List<String> STANDARD_VERSIONS = List.of(
+    "2.0.0-Beta-1",
+    "3.0.0-Beta-1",
+    "3.0.0-Beta-2"
+  );
 
   private static final String CARRIER_AUTH_HEADER_VALUE = UUID.randomUUID().toString();
   private static final String PLATFORM_AUTH_HEADER_VALUE = UUID.randomUUID().toString();
@@ -114,9 +118,9 @@ public Set<String> getReportRoleNames(
 
   public JsonSchemaValidator getMessageSchemaValidator(String apiProviderRole, boolean forRequest) {
     String schemaFilePath =
-        "/standards/eblsurrender/schemas/eblsurrender-%s-%s.json"
+        "/standards/eblsurrender/schemas/eblsurrender-v%s-%s.json"
             .formatted(
-                standardVersion.startsWith("2") ? "v20" : "v30", apiProviderRole.toLowerCase());
+                standardVersion, apiProviderRole.toLowerCase());
     String schemaName =
         EblSurrenderRole.isCarrier(apiProviderRole)
             ? (forRequest ? "surrenderRequestDetails" : "surrenderRequestAcknowledgement")

ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/party/EblSurrenderCarrier.java

@@ -140,7 +140,7 @@ private void sendSurrenderResponse(JsonNode actionPrompt) {
       srr = UUID.randomUUID().toString();
     }
     syncCounterpartPost(
-        "/%s/ebl-surrender-responses".formatted(apiVersion.startsWith("3") ? "v3" : "v2"),
+        "/v%s/ebl-surrender-responses".formatted(apiVersion.charAt(0)),
         objectMapper
             .createObjectNode()
             .put("surrenderRequestReference", srr)

ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/party/EblSurrenderPlatform.java

@@ -85,8 +85,8 @@ private void requestSurrender(JsonNode actionPrompt) {
 
     JsonNode jsonRequestBody =
         JsonToolkit.templateFileToJsonNode(
-            "/standards/eblsurrender/messages/eblsurrender-api-%s-request.json"
-                .formatted(apiVersion.startsWith("3") ? "v30" : "v20"),
+            "/standards/eblsurrender/messages/eblsurrender-api-v%s-request.json"
+                .formatted(apiVersion),
             Map.ofEntries(
                 Map.entry("SURRENDER_REQUEST_REFERENCE_PLACEHOLDER", srr),
                 Map.entry("TRANSPORT_DOCUMENT_REFERENCE_PLACEHOLDER", tdr),
@@ -97,7 +97,7 @@ private void requestSurrender(JsonNode actionPrompt) {
                 Map.entry("ACTION_DATE_TIME_PLACEHOLDER", Instant.now().toString())));
 
     syncCounterpartPost(
-        "/%s/ebl-surrender-requests".formatted(apiVersion.startsWith("3") ? "v3" : "v2"),
+        "/v%s/ebl-surrender-requests".formatted(apiVersion.charAt(0)),
         jsonRequestBody);
 
     addOperatorLogEntry(

ebl-surrender/src/main/resources/standards/eblsurrender/messages/eblsurrender-api-v3.0.0-Beta-2-request.json

@@ -0,0 +1,16 @@
+{
+  "surrenderRequestReference": "SURRENDER_REQUEST_REFERENCE_PLACEHOLDER",
+  "transportDocumentReference": "TRANSPORT_DOCUMENT_REFERENCE_PLACEHOLDER",
+  "surrenderRequestCode": "SURRENDER_REQUEST_CODE_PLACEHOLDER",
+  "surrenderRequestedBy": {
+    "eblPlatform": "EBL_PLATFORM_PLACEHOLDER",
+    "legalName": "legal name",
+    "partyCodes": [
+      {
+        "partyCode": "PARTY_CODE_PLACEHOLDER",
+        "codeListProvider": "EPUI",
+        "codeListName": "CODE_LIST_NAME_PLACEHOLDER"
+      }
+    ]
+  }
+}