jentrata#63 add messageid as option client

This are the java code changes needed to process the messageId.
cavycorp · Jan 28, 2019 · 6a5b556 · 6a5b556
1 parent 7d3f718
commit 6a5b556
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Plugins/CorvusEbMS/src/main/java/hk/hku/cecid/ebms/spa/service/EbmsMessageSenderService.java b/Plugins/CorvusEbMS/src/main/java/hk/hku/cecid/ebms/spa/service/EbmsMessageSenderService.java
@@ -66,6 +66,7 @@ public void serviceRequested(WebServicesRequest request,
         String refToMessageId = getText(bodies, "refToMessageId");
         String fromPartyRole = getText(bodies, "fromPartyRole");
         String toPartyRole = getText(bodies, "toPartyRole");
+	String messageId = getText(bodies, "messageId");
 
         if (cpaId == null || service == null || action == null
                 || convId == null || fromPartyId == null
@@ -102,11 +103,11 @@ public void serviceRequested(WebServicesRequest request,
                 + ", toPartyId: "	  + toPartyId
                 + ", toPartyType: " + toPartyType
                 + ", toPartyRole: " + toPartyRole
-                + ", refToMessageId: " + refToMessageId);
+                + ", refToMessageId: " + refToMessageId
+                + ", messageId: " + messageId);
 
         // Construct Ebxml message
         EbxmlMessage ebxmlMessage = null;
-        String messageId = null;
         try {
             ebxmlMessage = new EbxmlMessage();
             MessageHeader msgHeader = ebxmlMessage.addMessageHeader();
@@ -120,9 +121,11 @@ public void serviceRequested(WebServicesRequest request,
             	msgHeader.setServiceType(serviceType);
             }
 
-            messageId = Generator.generateMessageID();
+            if (messageId == null || messageId.equals("")) {
+                messageId = Generator.generateMessageID();
+                EbmsProcessor.core.log.info("Generated message id: " + messageId);
+	    }
             ebxmlMessage.getMessageHeader().setMessageId(messageId);
-            EbmsProcessor.core.log.info("Genereating message id: " + messageId);
 
             msgHeader.setTimestamp(EbmsUtility.getCurrentUTCDateTime());