From faf2d567053daa8de0a132b7e968873a884e6fbb Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Mon, 26 Aug 2024 12:53:42 +0200 Subject: [PATCH] Renamed class to EAS4UserMessageSendResult --- .../bdew/MainPhase4BDEWSenderExample.java | 4 +- .../MainCEFeInvoicingConnectivityTest.java | 4 +- .../MainPhase4DBNAllianceSenderExample.java | 4 +- .../euctp/MainPhase4EuCtpSenderExample.java | 6 +- .../sender/AbstractAS4UserMessageBuilder.java | 102 ++---------------- .../sender/EAS4UserMessageSendResult.java | 86 +++++++++++++++ .../phase4/peppol/MainPhase4PeppolSender.java | 4 +- ...ainPhase4PeppolSenderConstantReceiver.java | 4 +- ...MainPhase4PeppolSenderExpiredKeystore.java | 4 +- ...ainPhase4PeppolSenderInMemoryKeyStore.java | 4 +- ...MainPhase4PeppolSenderInvalidWildcard.java | 4 +- .../MainPhase4PeppolSenderLocalHost8080.java | 4 +- .../MainPhase4PeppolSenderMaxDebug.java | 4 +- ...MainPhase4PeppolSenderMinimumInMemory.java | 4 +- ...inPhase4PeppolSenderMinimumPersistent.java | 4 +- ...Phase4PeppolSenderNonExistingReceiver.java | 4 +- ...inPhase4PeppolSenderNonPeppolKeystore.java | 4 +- .../peppol/MainPhase4PeppolSenderSbdh.java | 4 +- .../peppol/MainPhase4PeppolSenderTestbed.java | 4 +- .../MainPhase4PeppolSenderACube.java | 4 +- ...ase4PeppolSenderACubeConstantReceiver.java | 4 +- .../receivers/MainPhase4PeppolSenderAPRO.java | 4 +- .../MainPhase4PeppolSenderATGov.java | 4 +- .../MainPhase4PeppolSenderATOebb.java | 4 +- ...polSenderAlbertPatronConstantReceiver.java | 4 +- .../MainPhase4PeppolSenderB2BRouter.java | 4 +- .../MainPhase4PeppolSenderBasware.java | 4 +- .../MainPhase4PeppolSenderCentiga.java | 4 +- .../MainPhase4PeppolSenderCentiga2.java | 4 +- ...e4PeppolSenderCentigaConstantReceiver.java | 4 +- .../MainPhase4PeppolSenderCisbox.java | 4 +- ...MainPhase4PeppolSenderCisboxXRechnung.java | 4 +- .../MainPhase4PeppolSenderCodabox.java | 4 +- .../MainPhase4PeppolSenderComarch.java | 4 +- ...nPhase4PeppolSenderConstantReceiverSG.java | 4 +- ...Phase4PeppolSenderConstantReceiverSG2.java | 4 +- .../receivers/MainPhase4PeppolSenderDB.java | 4 +- .../MainPhase4PeppolSenderDataport.java | 4 +- .../MainPhase4PeppolSenderEcosio.java | 4 +- .../MainPhase4PeppolSenderEdicom.java | 4 +- .../MainPhase4PeppolSenderElcom.java | 4 +- .../MainPhase4PeppolSenderElcomOrder.java | 4 +- ...4PeppolSenderExplicitCryptoProperties.java | 4 +- ...e4PeppolSenderFujitsuConstantReceiver.java | 4 +- .../MainPhase4PeppolSenderGenerix.java | 4 +- .../MainPhase4PeppolSenderGovernikus.java | 4 +- .../MainPhase4PeppolSenderHelger.java | 4 +- ...MainPhase4PeppolSenderHelgerLargeFile.java | 4 +- ...hase4PeppolSenderHelgerLargeFileLocal.java | 4 +- ...Phase4PeppolSenderHelgerReceiverError.java | 4 +- .../MainPhase4PeppolSenderHelgerTSR.java | 4 +- .../MainPhase4PeppolSenderHelgerWildcard.java | 4 +- ...hase4PeppolSenderHelgerXRechnung12CII.java | 4 +- .../receivers/MainPhase4PeppolSenderIBM.java | 4 +- ...e4PeppolSenderLameschConstantReceiver.java | 4 +- .../MainPhase4PeppolSenderOZGRE.java | 4 +- .../MainPhase4PeppolSenderPrimer.java | 4 +- .../MainPhase4PeppolSenderQvalia.java | 4 +- .../MainPhase4PeppolSenderQvaliaCII.java | 4 +- ...se4PeppolSenderQvaliaConstantReceiver.java | 4 +- ...MainPhase4PeppolSenderQvaliaLargeFile.java | 4 +- .../MainPhase4PeppolSenderQvaliaOrder.java | 4 +- .../MainPhase4PeppolSenderQvaliaUBL.java | 4 +- ...inPhase4PeppolSenderSbiDespatchAdvice.java | 4 +- .../MainPhase4PeppolSenderSbiOrder.java | 4 +- .../MainPhase4PeppolSenderSeres.java | 4 +- .../MainPhase4PeppolSenderStorecove.java | 4 +- ...PeppolSenderStorecoveConstantReceiver.java | 4 +- .../MainPhase4PeppolSenderTradeshift.java | 4 +- .../receivers/MainPhase4PeppolSenderZRE.java | 4 +- 70 files changed, 233 insertions(+), 229 deletions(-) create mode 100644 phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java index 7ef1fbf07..831e548fd 100644 --- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java +++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java @@ -36,7 +36,7 @@ import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.ebms3header.Ebms3SignalMessage; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -71,7 +71,7 @@ public static void main (final String [] args) final Wrapper aSignalMsgHolder = new Wrapper <> (); // Start configuring here - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4BDEWSender.builder () .encryptionKeyIdentifierType (ECryptoKeyIdentifierType.X509_KEY_IDENTIFIER) .signingKeyIdentifierType (ECryptoKeyIdentifierType.BST_DIRECT_REFERENCE) diff --git a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java index c69253ed4..3be1afee4 100644 --- a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java +++ b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java @@ -41,7 +41,7 @@ import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.security.certificate.CertificateHelper; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; @@ -121,7 +121,7 @@ public void onSoapDocument (@Nonnull final Document aDoc) }; // XXX The message ID to use in the UI final String sAS4MessageID = "36999089-662a-441f-95fd-470bec2b538e-100@phase4"; - final ESimpleUserMessageSendResult eRes = Phase4CEFSender.builder () + final EAS4UserMessageSendResult eRes = Phase4CEFSender.builder () .cryptoFactory (CF) .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .action ("TC1Leg1") diff --git a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java index 81abc4941..72d9619ca 100644 --- a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java +++ b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java @@ -26,7 +26,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.bdxr2.BDXR2ClientReadOnly; import com.helger.smpclient.dbna.EDBNASML; @@ -62,7 +62,7 @@ public static void main (final String [] args) EDBNASML.TEST.getZoneName())); aSMPClient.setVerifySignature (false); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4DBNAllianceSender.builder () .documentTypeID (SimpleIdentifierFactory.INSTANCE.createDocumentTypeIdentifier ("bdx-docid-qns", "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##DBNAlliance-1.0-data-Core")) .processID (Phase4DBNAllianceSender.IF.createProcessIdentifier(null, "bdx:noprocess")) diff --git a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java index 400ab9fc8..f530a6889 100644 --- a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java +++ b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java @@ -51,7 +51,7 @@ import com.helger.phase4.profile.euctp.EEuCtpAction; import com.helger.phase4.profile.euctp.EEuCtpService; import com.helger.phase4.profile.euctp.EuCtpPMode; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phase4.util.Phase4Exception; import com.helger.security.keystore.EKeyStoreType; import com.helger.servlet.mock.MockServletContext; @@ -177,7 +177,7 @@ private static void _sendConnectionTest (final Phase4EuCtpHttpClientSettings aHt final Wrapper aSignalMsgHolder, final AS4CryptoFactoryProperties cryptoFactoryProperties) { - ESimpleUserMessageSendResult eResult; + EAS4UserMessageSendResult eResult; eResult = Phase4EuCtpSender.builder () .httpClientFactory (aHttpClientSettings) .fromPartyID (fromPartyID) @@ -206,7 +206,7 @@ private static void _sendENSFilling (final Phase4EuCtpHttpClientSettings aHttpCl final byte [] aPayloadBytes = StreamHelper.getAllBytes (new ClassPathResource ("/external/examples/base-example.xml")); final Wrapper aSignalMsgHolder = new Wrapper <> (); - ESimpleUserMessageSendResult eResult; + EAS4UserMessageSendResult eResult; eResult = Phase4EuCtpSender.builder () .httpClientFactory (aHttpClientSettings) .fromPartyID (fromPartyID) diff --git a/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilder.java b/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilder.java index 5c3a13bf3..9cc338ed4 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilder.java +++ b/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilder.java @@ -27,13 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.helger.commons.annotation.Nonempty; import com.helger.commons.collection.impl.CommonsArrayList; import com.helger.commons.collection.impl.ICommonsList; -import com.helger.commons.id.IHasID; -import com.helger.commons.lang.EnumHelper; import com.helger.commons.state.ESuccess; -import com.helger.commons.state.ISuccessIndicator; import com.helger.commons.string.StringHelper; import com.helger.commons.wrapper.Wrapper; import com.helger.phase4.attachment.AS4OutgoingAttachment; @@ -45,7 +41,6 @@ import com.helger.phase4.model.MessageProperty; import com.helger.phase4.model.pmode.IPMode; import com.helger.phase4.util.Phase4Exception; -import com.helger.phase4.v3.ChangePhase4V3; /** * Abstract builder base class for a user message. @@ -708,96 +703,19 @@ protected void applyToUserMessage (@Nonnull final AS4ClientUserMessage aUserMsg) aUserMsg.setForceMimeMessage (m_bForceMimeMessage); } - /** - * Specific enumeration with the result error codes of the - * {@link AbstractAS4UserMessageBuilder#sendMessageAndCheckForReceipt()} - * method. - * - * @author Philip Helger - */ - @ChangePhase4V3 ("Moved to top-level and rename") - public enum ESimpleUserMessageSendResult implements IHasID , ISuccessIndicator - { - /** - * Programming error, because not all mandatory fields are filled. - */ - INVALID_PARAMETERS ("invalid-parameters"), - /** - * Something failed on the network or HTTP(S) level - */ - TRANSPORT_ERROR ("transport-error"), - /** - * Some answer was received, but it was no valid AS4 Signal Message - */ - NO_SIGNAL_MESSAGE_RECEIVED ("no-signal-msg-received"), - /** - * An AS4 Error Message was received - */ - AS4_ERROR_MESSAGE_RECEIVED ("as4-error-msg-received"), - /** - * An AS4 Signal Message was received, but it was neither a Receipt nor an - * Error Message but something else. - */ - INVALID_SIGNAL_MESSAGE_RECEIVED ("invalid-signal-message-received"), - /** - * Everything worked according to plan. The message was successfully - * delivered. - */ - SUCCESS ("success"); - - private final String m_sID; - - ESimpleUserMessageSendResult (@Nonnull @Nonempty final String sID) - { - m_sID = sID; - } - - /** - * @return The ID of the of the error message. - * @since 1.0.0-rc1 - */ - @Nonnull - @Nonempty - public String getID () - { - return m_sID; - } - - public boolean isSuccess () - { - return this == SUCCESS; - } - - /** - * @return A recommendation whether a retry might be feasible in case the - * internal retries were disabled. - * @since 1.0.0-rc1 - */ - public boolean isRetryFeasible () - { - return this == TRANSPORT_ERROR || this == NO_SIGNAL_MESSAGE_RECEIVED || this == INVALID_SIGNAL_MESSAGE_RECEIVED; - } - - @Nullable - public static ESimpleUserMessageSendResult getFromIDOrNull (@Nullable final String sID) - { - return EnumHelper.getFromIDOrNull (ESimpleUserMessageSendResult.class, sID); - } - } - /** * This is a sanity method that encapsulates all the sending checks that are * necessary to determine overall sending success or error.
* Note: this method is not thread-safe, because it changes the signal message * consumer internally. * - * @return {@link ESimpleUserMessageSendResult#SUCCESS} only if all parameters + * @return {@link EAS4UserMessageSendResult#SUCCESS} only if all parameters * are correct, HTTP transmission was successful and if a positive AS4 * Receipt was returned. Never null. * @since 0.13.0 */ @Nonnull - public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt () + public final EAS4UserMessageSendResult sendMessageAndCheckForReceipt () { // This information might be crucial to determine what went wrong return sendMessageAndCheckForReceipt (ex -> LOGGER.error ("Exception sending AS4 user message", ex)); @@ -812,13 +730,13 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt () * @param aExceptionConsumer * An optional Consumer that takes an eventually thrown * {@link Phase4Exception}. May be null. - * @return {@link ESimpleUserMessageSendResult#SUCCESS} only if all parameters + * @return {@link EAS4UserMessageSendResult#SUCCESS} only if all parameters * are correct, HTTP transmission was successful and if a positive AS4 * Receipt was returned. Never null. * @since 1.0.0-rc1 */ @Nonnull - public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullable final Consumer aExceptionConsumer) + public final EAS4UserMessageSendResult sendMessageAndCheckForReceipt (@Nullable final Consumer aExceptionConsumer) { final IAS4SignalMessageConsumer aOld = m_aSignalMsgConsumer; try @@ -837,7 +755,7 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullab if (sendMessage ().isFailure ()) { // Parameters are missing/incorrect - return ESimpleUserMessageSendResult.INVALID_PARAMETERS; + return EAS4UserMessageSendResult.INVALID_PARAMETERS; } final Ebms3SignalMessage aSignalMsg = aSignalMsgKeeper.get (); @@ -847,7 +765,7 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullab LOGGER.debug ("Failed to get a SignalMessage as the response"); // Unexpected response - invalid XML or at least no Ebms3 signal message - return ESimpleUserMessageSendResult.NO_SIGNAL_MESSAGE_RECEIVED; + return EAS4UserMessageSendResult.NO_SIGNAL_MESSAGE_RECEIVED; } if (aSignalMsg.hasErrorEntries ()) @@ -857,20 +775,20 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullab // An error was returned from the other side // Errors have precedence over receipts - return ESimpleUserMessageSendResult.AS4_ERROR_MESSAGE_RECEIVED; + return EAS4UserMessageSendResult.AS4_ERROR_MESSAGE_RECEIVED; } if (aSignalMsg.getReceipt () != null) { // A receipt was returned - this is deemed success - return ESimpleUserMessageSendResult.SUCCESS; + return EAS4UserMessageSendResult.SUCCESS; } if (LOGGER.isDebugEnabled ()) LOGGER.debug ("The SignalMessage contains neither Errors nor a Receipt - unexpected SignalMessage layout."); // Neither an error nor a receipt was returned - this is weird - return ESimpleUserMessageSendResult.INVALID_SIGNAL_MESSAGE_RECEIVED; + return EAS4UserMessageSendResult.INVALID_SIGNAL_MESSAGE_RECEIVED; } catch (final Phase4Exception ex) { @@ -880,7 +798,7 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullab if (aExceptionConsumer != null) aExceptionConsumer.accept (ex); // Something went wrong - see the logs - return ESimpleUserMessageSendResult.TRANSPORT_ERROR; + return EAS4UserMessageSendResult.TRANSPORT_ERROR; } finally { diff --git a/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java b/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java new file mode 100644 index 000000000..6e4fbf9bb --- /dev/null +++ b/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java @@ -0,0 +1,86 @@ +package com.helger.phase4.sender; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import com.helger.commons.annotation.Nonempty; +import com.helger.commons.id.IHasID; +import com.helger.commons.lang.EnumHelper; +import com.helger.commons.state.ISuccessIndicator; + +/** + * Specific enumeration with the result error codes of the + * {@link AbstractAS4UserMessageBuilder#sendMessageAndCheckForReceipt()} + * method.
+ * Old name before v3: ESimpleUserMessageSendResult + * + * @author Philip Helger + */ +public enum EAS4UserMessageSendResult implements IHasID , ISuccessIndicator +{ + /** + * Programming error, because not all mandatory fields are filled. + */ + INVALID_PARAMETERS ("invalid-parameters"), + /** + * Something failed on the network or HTTP(S) level + */ + TRANSPORT_ERROR ("transport-error"), + /** + * Some answer was received, but it was no valid AS4 Signal Message + */ + NO_SIGNAL_MESSAGE_RECEIVED ("no-signal-msg-received"), + /** + * An AS4 Error Message was received + */ + AS4_ERROR_MESSAGE_RECEIVED ("as4-error-msg-received"), + /** + * An AS4 Signal Message was received, but it was neither a Receipt nor an + * Error Message but something else. + */ + INVALID_SIGNAL_MESSAGE_RECEIVED ("invalid-signal-message-received"), + /** + * Everything worked according to plan. The message was successfully + * delivered. + */ + SUCCESS ("success"); + + private final String m_sID; + + EAS4UserMessageSendResult (@Nonnull @Nonempty final String sID) + { + m_sID = sID; + } + + /** + * @return The ID of the of the error message. + * @since 1.0.0-rc1 + */ + @Nonnull + @Nonempty + public String getID () + { + return m_sID; + } + + public boolean isSuccess () + { + return this == SUCCESS; + } + + /** + * @return A recommendation whether a retry might be feasible in case the + * internal retries were disabled. + * @since 1.0.0-rc1 + */ + public boolean isRetryFeasible () + { + return this == TRANSPORT_ERROR || this == NO_SIGNAL_MESSAGE_RECEIVED || this == INVALID_SIGNAL_MESSAGE_RECEIVED; + } + + @Nullable + public static EAS4UserMessageSendResult getFromIDOrNull (@Nullable final String sID) + { + return EnumHelper.getFromIDOrNull (EAS4UserMessageSendResult.class, sID); + } +} 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..cf61d1aa1 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 @@ -28,7 +28,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.api.result.ValidationResultList; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.photon.io.WebFileIO; @@ -68,7 +68,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..2afb3a70d 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 @@ -27,7 +27,7 @@ import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.http.HttpRetrySettings; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -60,7 +60,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9930:INPOSIATEST"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderExpiredKeystore.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderExpiredKeystore.java index b08743987..131c38a45 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderExpiredKeystore.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderExpiredKeystore.java @@ -31,7 +31,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.photon.io.WebFileIO; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; @@ -83,7 +83,7 @@ public static void main (final String [] args) PeppolKeyStoreHelper.TRUSTSTORE_PASSWORD) .getKeyStore ()); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .cryptoFactory (cf) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) 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..833ddc338 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 @@ -27,7 +27,7 @@ import com.helger.peppolid.IParticipantIdentifier; import com.helger.phase4.crypto.AS4CryptoFactoryInMemoryKeyStore; import com.helger.phase4.crypto.IAS4CryptoFactory; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; @@ -69,7 +69,7 @@ public static void main (final String [] args) "openpeppol aisbl id von pop000306", "peppol", aTS); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInvalidWildcard.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInvalidWildcard.java index a390fb13f..420f64d9d 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInvalidWildcard.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderInvalidWildcard.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.photon.io.WebFileIO; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -67,7 +67,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () /* * It is invalid to include the "*" in the SMP diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderLocalHost8080.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderLocalHost8080.java index e03ea53fc..151128975 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderLocalHost8080.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderLocalHost8080.java @@ -27,7 +27,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -64,7 +64,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMaxDebug.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMaxDebug.java index 1358bf00f..ceb8d1d73 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMaxDebug.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMaxDebug.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.http.AS4HttpDebug; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidationBisAUNZ; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -68,7 +68,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..0c5fd6f13 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 @@ -24,7 +24,7 @@ import com.helger.peppol.sml.ESML; import com.helger.peppolid.IParticipantIdentifier; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -55,7 +55,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumPersistent.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumPersistent.java index 396fb3b1c..04fd344fd 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumPersistent.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderMinimumPersistent.java @@ -26,7 +26,7 @@ import com.helger.peppol.sml.ESML; import com.helger.peppolid.IParticipantIdentifier; import com.helger.phase4.config.AS4Configuration; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.photon.io.WebFileIO; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -64,7 +64,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonExistingReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonExistingReceiver.java index ef51659f5..3ebae352b 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonExistingReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonExistingReceiver.java @@ -26,7 +26,7 @@ import com.helger.peppol.sml.ESML; import com.helger.peppolid.IParticipantIdentifier; import com.helger.phase4.config.AS4Configuration; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phase4.util.Phase4Exception; import com.helger.photon.io.WebFileIO; import com.helger.servlet.mock.MockServletContext; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger-not-existing"); final Wrapper aSendingException = new Wrapper <> (); - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) .senderParticipantID (Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:phase4-test-sender")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonPeppolKeystore.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonPeppolKeystore.java index bbf76fe2a..90d97d4ae 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonPeppolKeystore.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderNonPeppolKeystore.java @@ -31,7 +31,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.photon.io.WebFileIO; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; @@ -83,7 +83,7 @@ public static void main (final String [] args) PeppolKeyStoreHelper.TRUSTSTORE_PASSWORD) .getKeyStore ()); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .cryptoFactory (cf) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderSbdh.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderSbdh.java index bd1828c92..53efec136 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderSbdh.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderSbdh.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4DumpManager; import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.photon.io.WebFileIO; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -65,7 +65,7 @@ public static void main (final String [] args) throw new IllegalStateException ("Failed to read SBDH file to be send"); // Start configuring here - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.sbdhBuilder () .payloadAndMetadata (aSbdh) .senderPartyID ("POP000306") diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderTestbed.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderTestbed.java index 37b950796..ebea4789a 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderTestbed.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/MainPhase4PeppolSenderTestbed.java @@ -23,7 +23,7 @@ import com.helger.peppol.sml.ESML; import com.helger.peppolid.IParticipantIdentifier; import com.helger.phase4.marshaller.Ebms3SignalMessageMarshaller; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -53,7 +53,7 @@ public static void main (final String [] args) // TODO use correct participant ID final IParticipantIdentifier aSenderID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("yours"); final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("theirs"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACube.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACube.java index 1200c87f1..9dd64eb61 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACube.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACube.java @@ -33,7 +33,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -59,7 +59,7 @@ public static void send () // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9906:it10442360961"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACubeConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACubeConstantReceiver.java index 6fe4dc168..1a1b28115 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACubeConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderACubeConstantReceiver.java @@ -28,7 +28,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -54,7 +54,7 @@ public static void send () // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:acube-test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAPRO.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAPRO.java index db84a0c13..3e49c999d 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAPRO.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderAPRO.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -57,7 +57,7 @@ public static void send () // 0106:32070687 final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme (true ? "0106:999912344" : "0106:24286995"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATGov.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATGov.java index e6f61de59..8bfb46b3a 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATGov.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATGov.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATOebb.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATOebb.java index b055f1bc2..2b0e451d5 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATOebb.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderATOebb.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..47fab0f4d 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 @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9922:helger"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..d4ed056ec 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -79,7 +79,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) .senderParticipantID (Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:phase4-test-sender")) 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..843f9c0fe 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -83,7 +83,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) .senderParticipantID (Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:phase4-test-sender")) 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..b640bfafd 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -79,7 +79,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga2.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga2.java index 035e29294..16653b70e 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga2.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentiga2.java @@ -28,7 +28,7 @@ import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -60,7 +60,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0192:915661653"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentigaConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentigaConstantReceiver.java index 68a6bdeba..ad5f58306 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentigaConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCentigaConstantReceiver.java @@ -27,7 +27,7 @@ import com.helger.phase4.dump.AS4IncomingDumperFileBased; import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -59,7 +59,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0192:992156678"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisbox.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisbox.java index c794f71e7..8e8371843 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisbox.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisbox.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -61,7 +61,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9930:de243208591"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java index e57781ce2..f9cd3fea9 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java @@ -31,7 +31,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidation; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.en16931.EN16931Validation; import com.helger.phive.xml.source.IValidationSourceXML; @@ -72,7 +72,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:cisbox1"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCodabox.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCodabox.java index 6ae2cf836..8f6ed7a7c 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCodabox.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCodabox.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -77,7 +77,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) .senderParticipantID (Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:phase4-test-sender")) 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..48c33e4d8 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0088:7350060300002"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG.java index f06d585d8..5282921cd 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidationBisSG; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0195:ocbcTester9000"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:sg:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG2.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG2.java index 8bd822ee0..a7cb62a99 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG2.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderConstantReceiverSG2.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidationBisSG; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0192:810418052"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:sg:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDB.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDB.java index c9fb159a8..965aced98 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDB.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDB.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -77,7 +77,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) .senderParticipantID (Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:phase4-test-sender")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDataport.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDataport.java index 7d9b71e6c..98c601db4 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDataport.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderDataport.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -78,7 +78,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult = Phase4PeppolSender.builder () + final EAS4UserMessageSendResult eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme (true ? "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1" : "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..9d7721e28 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9914:atu68241501"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..4b12ea2f9 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9906:edicomtestes"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..d3de88738 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0088:elcom-test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..20de2f893 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0088:elcom-test"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:poacc:bis:ordering:3")) 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..9ec002a75 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 @@ -28,7 +28,7 @@ import com.helger.phase4.crypto.AS4CryptoProperties; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.keystore.EKeyStoreType; import com.helger.servlet.mock.MockServletContext; @@ -67,7 +67,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9958:peppol-development-governikus-01"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .cryptoFactory (new AS4CryptoFactoryProperties (aCP)) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) 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..973974085 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 @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0088:4026227000001"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..4027b7ecd 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:generixtst"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGovernikus.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGovernikus.java index e1fe18af9..2b1da0984 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGovernikus.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderGovernikus.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -78,7 +78,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme (true ? "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1" : "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1")) 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..443363daa 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 @@ -34,7 +34,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolSender.Builder; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -95,7 +95,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) new Phase4PeppolValidatonResultHandler ()) .buildMessageCallback (aBuildMessageCallback) .rawResponseConsumer (aRRC); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = aBuilder.sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); 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..55b283109 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 @@ -34,7 +34,7 @@ import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -62,7 +62,7 @@ public static void send () final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger"); final IAS4RawResponseConsumer aRRC = new AS4RawResponseConsumerWriteToFile ().setHandleStatusLine (true) .setHandleHttpHeaders (true); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpClientFactory (new HttpClientSettings ().setRetryCount (0) .setResponseTimeout (Timeout.ofMinutes (5))) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFileLocal.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFileLocal.java index 793ecd085..e3babc43c 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFileLocal.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerLargeFileLocal.java @@ -32,7 +32,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phase4.util.Phase4Exception; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -58,7 +58,7 @@ public static void send () // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("9915:helger"); final Wrapper aSendingExceptionKeeper = new Wrapper <> (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpClientFactory (new HttpClientSettings ().setRetryCount (0) .setResponseTimeout (Timeout.ofMinutes (5))) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerReceiverError.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerReceiverError.java index 9efaffaf9..d02929e7f 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerReceiverError.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerReceiverError.java @@ -30,7 +30,7 @@ import com.helger.phase4.model.MessageProperty; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolSender.Builder; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; 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 send () ESML.DIGIT_TEST)) .checkReceiverAPCertificate (true) .disableValidation (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = aBuilder.sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerTSR.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerTSR.java index 1f52f9733..d024d0665 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerTSR.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerTSR.java @@ -34,7 +34,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolSender.Builder; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.sbdh.SBDMarshaller; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -90,7 +90,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) .sbdDocumentConsumer (x -> LOGGER.info (new SBDMarshaller ().setFormattedOutput (true) .getAsString (x))) .buildMessageCallback (aBuildMessageCallback); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = aBuilder.sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerWildcard.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerWildcard.java index ade11a85d..c7aef43b8 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerWildcard.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerWildcard.java @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolSender.Builder; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -70,7 +70,7 @@ public static void send () ESML.DIGIT_TEST)) .checkReceiverAPCertificate (true) .disableValidation (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = aBuilder.sendMessageAndCheckForReceipt (); LOGGER.info ("Peppol send result: " + eResult); diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java index e03e566f4..f2b193651 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java @@ -37,7 +37,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidation; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.en16931.EN16931Validation; import com.helger.phive.xml.source.IValidationSourceXML; @@ -90,7 +90,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) EN16931Validation.initEN16931 (aVESRegistry); XRechnungValidation.initXRechnung (aVESRegistry); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100::CrossIndustryInvoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_1.2::D16B")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..4428e7e7b 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -80,7 +80,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..3bf8171a9 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 @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -62,7 +62,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0088:4026227000001"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderOZGRE.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderOZGRE.java index 6d502488c..435af727d 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderOZGRE.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderOZGRE.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -80,7 +80,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme (bVerify ? "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1" : "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderPrimer.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderPrimer.java index ae0c7e353..79ace30e1 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderPrimer.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderPrimer.java @@ -31,7 +31,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -77,7 +77,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2::ApplicationResponse##urn:fdc:peppol.eu:poacc:trns:invoice_response:3::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:poacc:bis:invoice_response:3")) 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 e9d624bce..bc4dc1b41 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 @@ -57,7 +57,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.keystore.EKeyStoreType; import com.helger.security.keystore.KeyStoreHelper; @@ -111,7 +111,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) PeppolKeyStoreHelper.Config2018.TRUSTSTORE_AP_PRODUCTION_CLASSPATH, PeppolKeyStoreHelper.TRUSTSTORE_PASSWORD) .getKeyStore ()); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .cryptoFactory (cf) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java index 4c4ad0dc0..d0dd62c8c 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java @@ -32,7 +32,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidation; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.en16931.EN16931Validation; import com.helger.phive.xml.source.IValidationSourceXML; @@ -72,7 +72,7 @@ public static void main (final String [] args) final IValidationExecutorSetRegistry aVESRegistry = Phase4PeppolValidation.createDefaultRegistry (); EN16931Validation.initEN16931 (aVESRegistry); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100::CrossIndustryInvoice##urn:cen.eu:en16931:2017::D16B")) 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..eaf64b5e2 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 @@ -34,7 +34,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; @@ -79,7 +79,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) }; final IAS4CryptoFactory cf = AS4CryptoFactoryProperties.getDefaultInstance (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .cryptoFactory (cf) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaLargeFile.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaLargeFile.java index 17a898076..2cf7811a1 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaLargeFile.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaLargeFile.java @@ -31,7 +31,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.http.HttpRetrySettings; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -66,7 +66,7 @@ public static void main (final String [] args) // Invalid certificate is valid until 2029 final IAS4CryptoFactory cf = AS4CryptoFactoryProperties.getDefaultInstance (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .cryptoFactory (cf) 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..fc0b5133d 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0007:5567321707"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:poacc:bis:ordering:3")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java index 757ad6e99..f79a71e10 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java @@ -37,7 +37,7 @@ import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidation; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.en16931.EN16931Validation; import com.helger.phive.xml.source.IValidationSourceXML; @@ -92,7 +92,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) // Invalid certificate is valid until 2029 final IAS4CryptoFactory cf = AS4CryptoFactoryProperties.getDefaultInstance (); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .httpRetrySettings (new HttpRetrySettings ().setMaxRetries (0)) .cryptoFactory (cf) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiDespatchAdvice.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiDespatchAdvice.java index 582c989af..ac74f353a 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiDespatchAdvice.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiDespatchAdvice.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -61,7 +61,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0211:IT04513160962"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2::DespatchAdvice##urn:fdc:peppol.eu:poacc:trns:despatch_advice:3::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:poacc:bis:despatch_advice:3")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiOrder.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiOrder.java index f3c7f7c01..06c58df82 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiOrder.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSbiOrder.java @@ -29,7 +29,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -61,7 +61,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0211:IT04513160962"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:poacc:bis:ordering:3")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSeres.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSeres.java index 89317ae76..8c96657c3 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSeres.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderSeres.java @@ -32,7 +32,7 @@ import com.helger.phase4.messaging.domain.AS4UserMessage; import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; import com.helger.web.scope.mgr.WebScopeManager; @@ -77,7 +77,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..6c2b37b14 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 @@ -30,7 +30,7 @@ import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -63,7 +63,7 @@ public static void main (final String [] args) // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0106:sc998899889"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) diff --git a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecoveConstantReceiver.java b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecoveConstantReceiver.java index cd9b47b83..a43d8506d 100644 --- a/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecoveConstantReceiver.java +++ b/phase4-peppol-client/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderStorecoveConstantReceiver.java @@ -28,7 +28,7 @@ import com.helger.phase4.dump.AS4OutgoingDumperFileBased; import com.helger.phase4.dump.AS4RawResponseConsumerWriteToFile; import com.helger.phase4.peppol.Phase4PeppolSender; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.security.certificate.CertificateHelper; import com.helger.servlet.mock.MockServletContext; import com.helger.web.scope.mgr.WebScopeManager; @@ -55,7 +55,7 @@ public static void send () // Start configuring here final IParticipantIdentifier aReceiverID = Phase4PeppolSender.IF.createParticipantIdentifierWithDefaultScheme ("0106:sc998899889"); - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..5d758dc89 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -79,7 +79,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme ("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1")) .processID (Phase4PeppolSender.IF.createProcessIdentifierWithDefaultScheme ("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")) 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..40474055f 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 @@ -33,7 +33,7 @@ import com.helger.phase4.messaging.domain.AbstractAS4Message; import com.helger.phase4.peppol.Phase4PeppolSender; import com.helger.phase4.peppol.Phase4PeppolValidatonResultHandler; -import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult; +import com.helger.phase4.sender.EAS4UserMessageSendResult; import com.helger.phive.peppol.PeppolValidation2023_11; import com.helger.servlet.mock.MockServletContext; import com.helger.smpclient.peppol.SMPClientReadOnly; @@ -80,7 +80,7 @@ public void onAS4Message (final AbstractAS4Message aMsg) "'"); } }; - final ESimpleUserMessageSendResult eResult; + final EAS4UserMessageSendResult eResult; eResult = Phase4PeppolSender.builder () .documentTypeID (Phase4PeppolSender.IF.createDocumentTypeIdentifierWithDefaultScheme (bVerify ? "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0::2.1" : "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1"))