Extended API of IAS4(Signal|User)MessageConsumer. #177

phax · Oct 25, 2023 · 72ac706 · 72ac706
1 parent ebb4f6e
commit 72ac706
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
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
@@ -87,7 +87,7 @@ public static void main (final String [] args)
                                                                .compressionGZIP ()
                                                                .mimeTypeXML ()
                                                                .charset (StandardCharsets.UTF_8), aBDEWPayloadParams)
-                                .signalMsgConsumer (aSignalMsgHolder::set)
+                                .signalMsgConsumer ( (aSignalMsg, aMMD) -> aSignalMsgHolder.set (aSignalMsg))
                                 .sendMessageAndCheckForReceipt ();
       LOGGER.info ("BDEW send result: " + eResult);
     }

diff --git a/phase4-lib/src/main/java/com/helger/phase4/client/IAS4SignalMessageConsumer.java b/phase4-lib/src/main/java/com/helger/phase4/client/IAS4SignalMessageConsumer.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
+import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.util.Phase4Exception;
 
 /**
@@ -35,8 +36,12 @@ public interface IAS4SignalMessageConsumer
    *
    * @param aSignalMsg
    *        The Signal Message domain object. Never <code>null</code>.
+   * @param aMessageMetadata
+   *        The message metadata of the synchronously received message. Never
+   *        <code>null</code>. Added in v2.5.0.
    * @throws Phase4Exception
    *         in case of error
    */
-  void handleSignalMessage (@Nonnull Ebms3SignalMessage aSignalMsg) throws Phase4Exception;
+  void handleSignalMessage (@Nonnull Ebms3SignalMessage aSignalMsg,
+                            @Nonnull IAS4IncomingMessageMetadata aMessageMetadata) throws Phase4Exception;
 }
diff --git a/phase4-lib/src/main/java/com/helger/phase4/client/IAS4UserMessageConsumer.java b/phase4-lib/src/main/java/com/helger/phase4/client/IAS4UserMessageConsumer.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
+import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.util.Phase4Exception;
 
 /**
@@ -35,8 +36,12 @@ public interface IAS4UserMessageConsumer
    *
    * @param aUserMsg
    *        The User Message domain object. Never <code>null</code>.
+   * @param aMessageMetadata
+   *        The message metadata of the synchronously received message. Never
+   *        <code>null</code>. Added in v2.5.0.
    * @throws Phase4Exception
    *         in case of error
    */
-  void handleUserMessage (@Nonnull Ebms3UserMessage aUserMsg) throws Phase4Exception;
+  void handleUserMessage (@Nonnull Ebms3UserMessage aUserMsg, @Nonnull IAS4IncomingMessageMetadata aMessageMetadata)
+                                                                                                                     throws Phase4Exception;
 }
diff --git a/phase4-lib/src/main/java/com/helger/phase4/sender/AS4BidirectionalClientHelper.java b/phase4-lib/src/main/java/com/helger/phase4/sender/AS4BidirectionalClientHelper.java
@@ -83,7 +83,7 @@ public static void sendAS4UserMessageAndReceiveAS4SignalMessage (@Nonnull final
                                                                    @Nullable final IAS4IncomingDumper aIncomingDumper,
                                                                    @Nonnull final IAS4IncomingSecurityConfiguration aIncomingSecurityConfiguration,
                                                                    @Nullable final IAS4RetryCallback aRetryCallback,
-                                                                   @Nullable final IAS4RawResponseConsumer aResponseConsumer,
+                                                                   @Nullable final IAS4RawResponseConsumer aRawResponseConsumer,
                                                                    @Nullable final IAS4SignalMessageConsumer aSignalMsgConsumer) throws IOException,
                                                                                                                                  Phase4Exception,
                                                                                                                                  WSSecurityException,
@@ -135,6 +135,7 @@ public static void sendAS4UserMessageAndReceiveAS4SignalMessage (@Nonnull final
       return EntityUtils.toByteArray (aEntity);
     };
 
+    // Main HTTP sending
     final AS4ClientSentMessage <byte []> aResponseEntity = aClientUserMsg.sendMessageWithRetries (sURL,
                                                                                                   aHttpResponseHdl,
                                                                                                   aBuildMessageCallback,
@@ -147,8 +148,8 @@ public static void sendAS4UserMessageAndReceiveAS4SignalMessage (@Nonnull final
                  sURL +
                  "'");
 
-    if (aResponseConsumer != null)
-      aResponseConsumer.handleResponse (aResponseEntity);
+    if (aRawResponseConsumer != null)
+      aRawResponseConsumer.handleResponse (aResponseEntity);
 
     // Try interpret result as SignalMessage
     if (aResponseEntity.hasResponse () && aResponseEntity.getResponse ().length > 0)
@@ -172,7 +173,7 @@ public static void sendAS4UserMessageAndReceiveAS4SignalMessage (@Nonnull final
                                                                                        aIncomingDumper,
                                                                                        aIncomingSecurityConfiguration);
       if (aSignalMessage != null && aSignalMsgConsumer != null)
-        aSignalMsgConsumer.handleSignalMessage (aSignalMessage);
+        aSignalMsgConsumer.handleSignalMessage (aSignalMessage, aMessageMetadata);
     }
     else
       LOGGER.info ("AS4 ResponseEntity is empty");
@@ -254,7 +255,7 @@ public static void sendAS4PullRequestAndReceiveAS4UserMessage (@Nonnull final IA
                                                                                  aIncomingDumper,
                                                                                  aIncomingSecurityConfiguration);
       if (aUserMessage != null && aUserMsgConsumer != null)
-        aUserMsgConsumer.handleUserMessage (aUserMessage);
+        aUserMsgConsumer.handleUserMessage (aUserMessage, aMessageMetadata);
     }
     else
       LOGGER.info ("AS4 ResponseEntity is empty");

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
@@ -747,9 +747,10 @@ public final ESimpleUserMessageSendResult sendMessageAndCheckForReceipt (@Nullab
     {
       // Store the received signal message
       final Wrapper <Ebms3SignalMessage> aSignalMsgKeeper = new Wrapper <> ();
-      m_aSignalMsgConsumer = aOld == null ? aSignalMsgKeeper::set : x -> {
-        aSignalMsgKeeper.set (x);
-        aOld.handleSignalMessage (x);
+      m_aSignalMsgConsumer = aOld == null ? (aSignalMsg, aMMD) -> aSignalMsgKeeper.set (aSignalMsg) : (aSignalMsg,
+                                                                                                       aMMD) -> {
+        aSignalMsgKeeper.set (aSignalMsg);
+        aOld.handleSignalMessage (aSignalMsg, aMMD);
       };
 
       // Main sending

diff --git a/...t/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java b/...t/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java
@@ -107,7 +107,7 @@ public void onAS4Message (final AbstractAS4Message <?> aMsg)
                                                             new Phase4PeppolValidatonResultHandler ())
                                   .buildMessageCallback (aBuildMessageCallback)
                                   .rawResponseConsumer (aRRC)
-                                  .signalMsgConsumer (aSignalMsgWrapper::set)
+                                  .signalMsgConsumer ( (aSignalMsg, aMMD) -> aSignalMsgWrapper.set (aSignalMsg))
                                   .sendMessageAndCheckForReceipt ();
       LOGGER.info ("Peppol send result: " + eResult);
     }