From 6afa9d3b17b306391698e4b4f522b6fdff248e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asger=20Geel=20Weirs=C3=B8e?= Date: Mon, 19 Feb 2024 14:16:22 +0100 Subject: [PATCH] ap-v1.2.1 --- pom.xml | 4 +-- src/main/resources/reference.conf | 30 +++++++++---------- .../documenttype/DocumentTypeModuleTest.java | 30 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index cd1adef..d10679f 100755 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ dk.erst.oxalis oxalis - 1.2.0-482e9dc69c402ff235d9a34dba51310428093e10 + 1.2.1-a8d9d05a68cfcfc0fbaa203e249a5f450af3551c dk.erst.oxalis oxalis-as4 - 1.2.0 + 1.2.1 jar Oxalis :: AS4 Extension adding Nemhandel e-Delivery AS4 support to Oxalis diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index ec91b21..ae8cd47 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -54,7 +54,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-Reminder-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:Reminder/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -114,7 +114,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-Invoice-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:Invoice/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -145,7 +145,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-CreditNote-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:CreditNote/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -176,7 +176,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-ApplicationResponse-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:ApplicationResponse/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] responseType: true messageLevelResponse: { @@ -214,7 +214,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-Statement-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:Statement/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -243,7 +243,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-Order-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:Order/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -272,7 +272,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-OrderResponseSimple-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:OrderResponseSimple/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -301,7 +301,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-OrderResponse-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:OrderResponse/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -330,7 +330,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-OrderCancellation-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:OrderCancellation/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -359,7 +359,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-OrderChange-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:OrderChange/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -388,7 +388,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-Catalogue-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:Catalogue/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -417,7 +417,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-CatalogueDeletion-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:CatalogueDeletion/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -446,7 +446,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-CatalogueRequest-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:CatalogueRequest/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -475,7 +475,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-CatalogueItemSpecificationUpdate-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:CatalogueItemSpecificationUpdate/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, @@ -504,7 +504,7 @@ document.type = { schemaPath: "META-INF/Schemas/UBL_v2.1/maindoc/UBL-CataloguePricingUpdate-2.1.xsd" identifierDiscriminators = [{ xpathExpression: "/sbd:StandardBusinessDocument/root:CataloguePricingUpdate/cbc:CustomizationID" - xpathExpectedResult: "OIOUBL-2\\.1" + xpathExpectedResult: "OIOUBL-2\\.(01|02|1)" }] namespaces = [ { namespace: "http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader", prefix: "sbd" }, diff --git a/src/test/java/dk/erst/oxalis/as4/config/documenttype/DocumentTypeModuleTest.java b/src/test/java/dk/erst/oxalis/as4/config/documenttype/DocumentTypeModuleTest.java index be25d6d..c10d073 100644 --- a/src/test/java/dk/erst/oxalis/as4/config/documenttype/DocumentTypeModuleTest.java +++ b/src/test/java/dk/erst/oxalis/as4/config/documenttype/DocumentTypeModuleTest.java @@ -71,7 +71,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("Reminder"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:Reminder-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-Reminder-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Reminder/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Reminder/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -121,7 +121,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("Invoice"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-Invoice-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Invoice/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Invoice/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -146,7 +146,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("CreditNote"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-CreditNote-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CreditNote/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CreditNote/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -171,7 +171,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("ApplicationResponse"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-ApplicationResponse-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:ApplicationResponse/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:ApplicationResponse/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -202,7 +202,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("Statement"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:Statement-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-Statement-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Statement/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Statement/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -227,7 +227,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("Order"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:Order-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-Order-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Order/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Order/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -252,7 +252,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("OrderResponseSimple"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:OrderResponseSimple-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-OrderResponseSimple-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderResponseSimple/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderResponseSimple/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -277,7 +277,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("OrderResponse"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-OrderResponse-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderResponse/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderResponse/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -302,7 +302,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("OrderCancellation"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:OrderCancellation-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-OrderCancellation-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderCancellation/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderCancellation/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -327,7 +327,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("OrderChange"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:OrderChange-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-OrderChange-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderChange/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:OrderChange/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -352,7 +352,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("Catalogue"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-Catalogue-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Catalogue/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:Catalogue/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -377,7 +377,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("CatalogueDeletion"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:CatalogueDeletion-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-CatalogueDeletion-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueDeletion/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueDeletion/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -402,7 +402,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("CatalogueRequest"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:CatalogueRequest-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-CatalogueRequest-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueRequest/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueRequest/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -427,7 +427,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("CatalogueItemSpecificationUpdate"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:CatalogueItemSpecificationUpdate-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-CatalogueItemSpecificationUpdate-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueItemSpecificationUpdate/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CatalogueItemSpecificationUpdate/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), @@ -452,7 +452,7 @@ public class DocumentTypeModuleTest { config.setPayloadRootLocalName("CataloguePricingUpdate"); config.setPayloadRootNamespace("urn:oasis:names:specification:ubl:schema:xsd:CataloguePricingUpdate-2"); config.setSchemaPath(UBL_PATH_PREFIX + "/UBL-CataloguePricingUpdate-2.1.xsd"); - config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CataloguePricingUpdate/cbc:CustomizationID", "OIOUBL-2\\.1"))); + config.setIdentifierDiscriminators(Collections.singletonList(new XpathDiscriminatorConfig("/sbd:StandardBusinessDocument/root:CataloguePricingUpdate/cbc:CustomizationID", "OIOUBL-2\\.(01|02|1)"))); config.setNamespaces(Arrays.asList( standardBusinessDocumentNamespace(), commonAggregateComponentsNamespace(), -- GitLab