From 6df459932506c7cb1b454976199b77112e70df58 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 17 Sep 2024 10:13:40 +0200 Subject: [PATCH] Updated to phive 10 and phive-rules 3.2.0 --- .../phase4/peppol/Phase4PeppolSender.java | 16 ++++++------- .../phase4/peppol/Phase4PeppolValidation.java | 23 +++++++++++-------- .../phase4/peppol/MainPhase4PeppolSender.java | 4 ++-- ...ainPhase4PeppolSenderConstantReceiver.java | 4 ++-- ...ainPhase4PeppolSenderInMemoryKeyStore.java | 4 ++-- ...MainPhase4PeppolSenderMinimumInMemory.java | 4 ++-- ...polSenderAlbertPatronConstantReceiver.java | 4 ++-- .../MainPhase4PeppolSenderB2BRouter.java | 4 ++-- .../MainPhase4PeppolSenderBasware.java | 4 ++-- .../MainPhase4PeppolSenderCentiga.java | 4 ++-- .../MainPhase4PeppolSenderComarch.java | 4 ++-- .../MainPhase4PeppolSenderEcosio.java | 4 ++-- .../MainPhase4PeppolSenderEdicom.java | 4 ++-- .../MainPhase4PeppolSenderElcom.java | 4 ++-- .../MainPhase4PeppolSenderElcomOrder.java | 4 ++-- ...4PeppolSenderExplicitCryptoProperties.java | 4 ++-- ...e4PeppolSenderFujitsuConstantReceiver.java | 4 ++-- .../MainPhase4PeppolSenderGenerix.java | 4 ++-- .../MainPhase4PeppolSenderHelger.java | 4 ++-- ...MainPhase4PeppolSenderHelgerLargeFile.java | 4 ++-- .../receivers/MainPhase4PeppolSenderIBM.java | 4 ++-- ...e4PeppolSenderLameschConstantReceiver.java | 4 ++-- .../MainPhase4PeppolSenderQvalia.java | 4 ++-- ...se4PeppolSenderQvaliaConstantReceiver.java | 4 ++-- .../MainPhase4PeppolSenderQvaliaOrder.java | 4 ++-- .../MainPhase4PeppolSenderStorecove.java | 4 ++-- .../MainPhase4PeppolSenderTradeshift.java | 4 ++-- .../receivers/MainPhase4PeppolSenderZRE.java | 4 ++-- pom.xml | 4 ++-- 29 files changed, 75 insertions(+), 72 deletions(-) diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java index 6c88d9daf..451e98d29 100644 --- a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java +++ b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java @@ -44,7 +44,7 @@ import com.helger.commons.state.ESuccess; import com.helger.commons.state.ETriState; import com.helger.commons.string.StringHelper; -import com.helger.diver.api.version.VESID; +import com.helger.diver.api.coord.DVRCoordinate; import com.helger.peppol.reporting.api.PeppolReportingHelper; import com.helger.peppol.reporting.api.PeppolReportingItem; import com.helger.peppol.reporting.api.backend.PeppolReportingBackend; @@ -281,7 +281,7 @@ public static StandardBusinessDocument createSBDH (@Nonnull final IParticipantId */ private static void _validatePayload (@Nonnull final Element aPayloadElement, @Nullable final IValidationExecutorSetRegistry aRegistry, - @Nullable final VESID aVESID, + @Nullable final DVRCoordinate aVESID, @Nullable final IPhase4PeppolValidationResultHandler aValidationResultHandler) throws Phase4PeppolException { // Client side validation @@ -1063,7 +1063,7 @@ public static class Builder extends AbstractPeppolUserMessageBuilder private Consumer m_aSBDBytesConsumer; private IValidationExecutorSetRegistry m_aVESRegistry; - private VESID m_aVESID; + private DVRCoordinate m_aVESID; private IPhase4PeppolValidationResultHandler m_aValidationResultHandler; /** @@ -1289,14 +1289,14 @@ public Builder validationRegistry (@Nullable final IValidationExecutorSetRegistr * * @param aVESID * The Validation Execution Set ID as in - * PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3. + * PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3. * May be null. * @return this for chaining - * @see #validationConfiguration(VESID, + * @see #validationConfiguration(DVRCoordinate, * IPhase4PeppolValidationResultHandler) */ @Nonnull - public Builder validationConfiguration (@Nullable final VESID aVESID) + public Builder validationConfiguration (@Nullable final DVRCoordinate aVESID) { final IPhase4PeppolValidationResultHandler aHdl = aVESID == null ? null : new Phase4PeppolValidatonResultHandler (); @@ -1311,7 +1311,7 @@ public Builder validationConfiguration (@Nullable final VESID aVESID) * * @param aVESID * The Validation Execution Set ID as in - * PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3. + * PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3. * May be null. * @param aValidationResultHandler * The validation result handler for positive and negative response @@ -1319,7 +1319,7 @@ public Builder validationConfiguration (@Nullable final VESID aVESID) * @return this for chaining */ @Nonnull - public Builder validationConfiguration (@Nullable final VESID aVESID, + public Builder validationConfiguration (@Nullable final DVRCoordinate aVESID, @Nullable final IPhase4PeppolValidationResultHandler aValidationResultHandler) { m_aVESID = aVESID; diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java index 6cbe663b9..7744fd237 100644 --- a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java +++ b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java @@ -25,12 +25,13 @@ import com.helger.commons.ValueEnforcer; import com.helger.commons.annotation.ReturnsMutableCopy; import com.helger.commons.annotation.ReturnsMutableObject; -import com.helger.diver.api.version.VESID; +import com.helger.diver.api.coord.DVRCoordinate; import com.helger.phive.api.execute.ValidationExecutionManager; import com.helger.phive.api.executorset.IValidationExecutorSet; import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.api.executorset.ValidationExecutorSetRegistry; import com.helger.phive.api.result.ValidationResultList; +import com.helger.phive.api.validity.IValidityDeterminator; import com.helger.phive.peppol.PeppolValidation; import com.helger.phive.xml.source.IValidationSourceXML; import com.helger.phive.xml.source.ValidationSourceXML; @@ -84,8 +85,8 @@ public static ValidationExecutorSetRegistry createDefault * @param aXML * The XML element to be validated. May not be null. * @param aVESID - * The {@link VESID} to be used. Must be contained in the default - * registry. May not be null. + * The {@link DVRCoordinate} to be used. Must be contained in the + * default registry. May not be null. * @param aValidationResultHandler * The validation result handler to be used. May not be * null. @@ -93,11 +94,11 @@ public static ValidationExecutorSetRegistry createDefault * In case e.g. the validation failed. This usually implies, that the * document will NOT be send out. * @see #validateOutgoingBusinessDocument(Element, - * IValidationExecutorSetRegistry, VESID, + * IValidationExecutorSetRegistry, DVRCoordinate, * IPhase4PeppolValidationResultHandler) */ public static void validateOutgoingBusinessDocument (@Nonnull final Element aXML, - @Nonnull final VESID aVESID, + @Nonnull final DVRCoordinate aVESID, @Nonnull final IPhase4PeppolValidationResultHandler aValidationResultHandler) throws Phase4PeppolException { validateOutgoingBusinessDocument (aXML, VES_REGISTRY, aVESID, aValidationResultHandler); @@ -112,8 +113,8 @@ public static void validateOutgoingBusinessDocument (@Nonnull final Element aXML * @param aVESRegistry * The VES registry the VESID is looked up in. * @param aVESID - * The {@link VESID} to be used. Must be contained in the provided - * registry. May not be null. + * The {@link DVRCoordinate} to be used. Must be contained in the + * provided registry. May not be null. * @param aValidationResultHandler * The validation result handler to be used. May not be * null. @@ -124,7 +125,7 @@ public static void validateOutgoingBusinessDocument (@Nonnull final Element aXML */ public static void validateOutgoingBusinessDocument (@Nonnull final Element aXML, @Nonnull final IValidationExecutorSetRegistry aVESRegistry, - @Nonnull final VESID aVESID, + @Nonnull final DVRCoordinate aVESID, @Nonnull final IPhase4PeppolValidationResultHandler aValidationResultHandler) throws Phase4PeppolException { ValueEnforcer.notNull (aXML, "XMLElement"); @@ -136,8 +137,10 @@ public static void validateOutgoingBusinessDocument (@Nonnull final Element aXML if (aVES == null) throw new Phase4PeppolException ("The validation executor set ID " + aVESID.getAsSingleID () + " is unknown!"); - final ValidationResultList aValidationResult = ValidationExecutionManager.executeValidation (aVES, - ValidationSourceXML.create (null, aXML)); + final ValidationResultList aValidationResult = ValidationExecutionManager.executeValidation (IValidityDeterminator.createDefault (), + aVES, + ValidationSourceXML.create (null, + aXML)); if (aValidationResult.containsAtLeastOneError ()) { aValidationResultHandler.onValidationErrors (aValidationResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSender.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSender.java index 56b57b2b3..794d9e7b2 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSender.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSender.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; import com.helger.phive.api.result.ValidationResultList; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.photon.io.WebFileIO; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -80,7 +80,7 @@ public static void main (final String [] args) .smpClient (new SMPClientReadOnly (Phase4PeppolSender.URL_PROVIDER, aReceiverID, ESML.DIGIT_TEST)) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler () { @Override diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderConstantReceiver.java index 8ab04dd1c..cee1b3f6e 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderConstantReceiver.java @@ -28,7 +28,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -106,7 +106,7 @@ public static void main (final String [] args) "njEO\r\n" + "-----END CERTIFICATE-----\r\n"), "https://www.zweikommadrei.de/as4") - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInMemoryKeyStore.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInMemoryKeyStore.java index 510bbceb0..757c366cd 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInMemoryKeyStore.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInMemoryKeyStore.java @@ -28,7 +28,7 @@ import com.helger.phase4.crypto.AS4CryptoFactoryInMemoryKeyStore; import com.helger.phase4.crypto.IAS4CryptoFactory; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; import com.helger.servlet.mock.MockServletContext; @@ -81,7 +81,7 @@ public static void main (final String [] args) .smpClient (new SMPClientReadOnly (Phase4PeppolSender.URL_PROVIDER, aReceiverID, ESML.DIGIT_TEST)) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .cryptoFactory (aInMemoryCryptoFactory) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumInMemory.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumInMemory.java index a01aafde0..50e2d4170 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumInMemory.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumInMemory.java @@ -25,7 +25,7 @@ import com.helger.peppol.sml.ESML; import com.helger.peppolid.IParticipantIdentifier; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -67,7 +67,7 @@ public static void main (final String [] args) .smpClient (new SMPClientReadOnly (Phase4PeppolSender.URL_PROVIDER, aReceiverID, ESML.DIGIT_TEST)) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAlbertPatronConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAlbertPatronConstantReceiver.java index 54872ea61..68115a278 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAlbertPatronConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAlbertPatronConstantReceiver.java @@ -30,7 +30,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -106,7 +106,7 @@ public static void main (final String [] args) "-----END CERTIFICATE-----\r\n"), "https://albertpatron.com/as4/as4") .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderB2BRouter.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderB2BRouter.java index 2d014644f..72015a73c 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderB2BRouter.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderB2BRouter.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -91,7 +91,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderBasware.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderBasware.java index 1382e2a44..ce742f16c 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderBasware.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderBasware.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -95,7 +95,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga.java index 52a16e49c..aae627139 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -92,7 +92,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderComarch.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderComarch.java index 34fd193d6..5f7562118 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderComarch.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderComarch.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEcosio.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEcosio.java index 5a50770d4..e438338dd 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEcosio.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEcosio.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEdicom.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEdicom.java index fd9dd1d16..aecf079d9 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEdicom.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderEdicom.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcom.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcom.java index 222fe7d4d..70dda9fb0 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcom.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcom.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcomOrder.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcomOrder.java index 4fc86773c..8c7040a67 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcomOrder.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderElcomOrder.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_ORDER_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderExplicitCryptoProperties.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderExplicitCryptoProperties.java index 463c0d424..951f34457 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderExplicitCryptoProperties.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderExplicitCryptoProperties.java @@ -29,7 +29,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.keystore.EKeyStoreType; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -80,7 +80,7 @@ public static void main (final String [] args) .smpClient (new SMPClientReadOnly (Phase4PeppolSender.URL_PROVIDER, aReceiverID, ESML.DIGIT_TEST)) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderFujitsuConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderFujitsuConstantReceiver.java index 2918a31b0..ed77922c2 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderFujitsuConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderFujitsuConstantReceiver.java @@ -30,7 +30,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -107,7 +107,7 @@ public static void main (final String [] args) "-----END CERTIFICATE-----\r\n"), "https://testb2bportal.ts.fujitsu.com/ws/msh/receive") .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGenerix.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGenerix.java index 39b3938cf..e341d6527 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGenerix.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGenerix.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelger.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelger.java index 2cdc57557..ab99f359e 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelger.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelger.java @@ -35,7 +35,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender.Builder; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -91,7 +91,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .checkReceiverAPCertificate (true) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .rawResponseConsumer (aRRC); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFile.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFile.java index 7fe79c520..e65670c72 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFile.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFile.java @@ -35,7 +35,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -79,7 +79,7 @@ public static void send () aReceiverID, ESML.DIGIT_TEST)) .validationConfiguration (bNoValidate ? null - : PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + : PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, bNoValidate ? null : new Phase4PeppolValidatonResultHandler ()) .rawResponseConsumer (aRRC) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderIBM.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderIBM.java index 8fdfec54a..452bb58c7 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderIBM.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderIBM.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -93,7 +93,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderLameschConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderLameschConstantReceiver.java index 27853383c..f8fb2d654 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderLameschConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderLameschConstantReceiver.java @@ -30,7 +30,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -107,7 +107,7 @@ public static void main (final String [] args) "-----END CERTIFICATE-----\r\n"), "https://peppol.lamesch.lu/as4") .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvalia.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvalia.java index fc1ab7c2d..f713607f3 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvalia.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvalia.java @@ -58,7 +58,7 @@ import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; import com.helger.phase4.servlet.IAS4MessageState; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; import com.helger.servlet.mock.MockServletContext; @@ -126,7 +126,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaConstantReceiver.java index ab99bc034..c2cb7e18a 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaConstantReceiver.java @@ -35,7 +35,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -94,7 +94,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "MIIFxzCCA6+gAwIBAgIQPTQFeVdn6tiW/2yg/RWC5jANBgkqhkiG9w0BAQsFADBr MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQT3BlblBFUFBPTCBBSVNCTDEWMBQGA1UE CxMNRk9SIFRFU1QgT05MWTEpMCcGA1UEAxMgUEVQUE9MIEFDQ0VTUyBQT0lOVCBU RVNUIENBIC0gRzIwHhcNMjIwNjE1MDAwMDAwWhcNMjQwNjA0MjM1OTU5WjBUMQsw CQYDVQQGEwJTRTEYMBYGA1UECgwPUXZhbGlhIEdyb3VwIEFCMRcwFQYDVQQLDA5Q RVBQT0wgVEVTVCBBUDESMBAGA1UEAwwJUFNFMDAwMDk0MIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEA2YAPM1AZ/kdh8sgWozYr0h8tqiTD2g70yyQVRB2e 8DXzuqQ/plAIJnNPNWgc4bJNp+Zamexx9eHCUDjasAsFDmyoyOEKensqUhdvTcmp U7thxQEQZbE8loh05xRYRDkRRAp8WZj90t1iADqkl+cuRS1UHHiXm3+sPaO5aK8J iBJKc0A6a/0Ui7OHcsuLQ6uaLaE9VNG/ZMXG3FBgxwGzPH2ajYfPS7Xt2lceVkQM VO0UDaDdHhu/C1an3EjMnvcgypyFLWhgLxR7nuxNUhVOQPrT8lau5ZMkoMQqcTB2 PPOPIhX7xEBpI4NBkzhbk8wBAGEbVEFSbC0Y9DkVu248ewIDAQABo4IBfDCCAXgw DAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCA6gwFgYDVR0lAQH/BAwwCgYIKwYB BQUHAwIwHQYDVR0OBBYEFM2oQA528A/6Wf2mCHe3ezL4pu25MF0GA1UdHwRWMFQw UqBQoE6GTGh0dHA6Ly9wa2ktY3JsLnN5bWF1dGguY29tL2NhXzZhOTM3NzM0YTM5 M2EwODA1YmYzM2NkYThiMzMxMDkzL0xhdGVzdENSTC5jcmwwNwYIKwYBBQUHAQEE KzApMCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3ltYXV0aC5jb20wHwYD VR0jBBgwFoAUa29LtvE3uis8fxjNuiuyuXwqN+swLQYKYIZIAYb4RQEQAwQfMB0G E2CGSAGG+EUBEAECAwEBgamQ4QMWBjk1NzYwODA5BgpghkgBhvhFARAFBCswKQIB ABYkYUhSMGNITTZMeTl3YTJrdGNtRXVjM2x0WVhWMGFDNWpiMjA9MA0GCSqGSIb3 DQEBCwUAA4ICAQARgU8wT2cl322fyZ396dlCeel7Bg46IgH9/ZtNYidqkxCoUIm2 yUzdbPPPeYthrtcLuJrA3oeBO8xHOC8vbfBxxBwNxxFOL6gAKpuKuPEq9MxU6vLT VdXNT6Nql5b1O+eNQtt1QWmGRSIsqUYs8BHcjGC7RITI8OfBQSURY+s1F65YzJYo jOEFeJW/CYhWsVwkOXy/GBV+WAGm3G57se4Yxswir5VVMydqBl4WxR5Vd0yiMfNA iPxZ27uJqmueojH7Fqy4PljbclvBrsZqfr/Z9/w9M0+wtAJ3Fe9xyDLzfEvfYaOO CNpm/iU5h+vP3fLTpwu2kmM63mGbeOr3sBNfqBDsVtkQkv3lxiY/aHvLTJM6uPIp qqoAWwSZVnHwRsDAK4+5PP8GnlzOJLmzTwLvugF826jektgqIBrh/HCPzAajbKpL clHtSieMPFEQ8ZTT2MZFbcpf0bSxy6Ft/311JkGpfp+q0Ud8YJFjWSfQ4Gm1T0GL GMrgEKLsgqTc+QZeQE1FkY/vn9BRb3VqMv7eJFPhhEb54rQcFXAWVuNqxpcOoxBd pbItP8Hlps4tApCllrPiZQ9hHslu5CHU99Pi7kJiIERte+MkqCHEms88GBbHOXg4 tlaNP/7eITPpE00dXzPihcrii9zrNCjODZQhmX8/TTbMrNbG+/pLWXYvHg==" + "-----END CERTIFICATE-----\r\n"), "https://peppol-ap-test.qvalia.com/peppol/as4") - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaOrder.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaOrder.java index dfdc23415..d3eced023 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaOrder.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaOrder.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_ORDER_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecove.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecove.java index d99fcad88..d04d6ed10 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecove.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecove.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -76,7 +76,7 @@ public static void main (final String [] args) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderTradeshift.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderTradeshift.java index 82ea52a35..57ae3511e 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderTradeshift.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderTradeshift.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -92,7 +92,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) aReceiverID, ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) - .validationConfiguration (PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + .validationConfiguration (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderZRE.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderZRE.java index 6ff3b663b..e10648e92 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderZRE.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderZRE.java @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; -import com.helger.phive.peppol.PeppolValidation2023_11; +import com.helger.phive.peppol.PeppolValidation2024_05; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -95,7 +95,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) ESML.DIGIT_TEST)) .rawResponseConsumer (new AS4RawResponseConsumerWriteToFile ()) .validationConfiguration (bVerify ? null - : PeppolValidation2023_11.VID_OPENPEPPOL_INVOICE_UBL_V3, + : PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3, new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .sendMessageAndCheckForReceipt (); diff --git a/pom.xml b/pom.xml index c2376b430..c3019280d 100644 --- a/pom.xml +++ b/pom.xml @@ -83,8 +83,8 @@ 9.0.2 8.0.3 10.1.9 - 9.2.2 - 3.1.13 + 10.0.2 + 3.2.0 3.3.2