Skip to content

#63 add messageid as option client #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cavycorp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#63 add messageid as option client #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3f718
#63 add messageid as option client WSDL
cavycorp Jan 28, 2019
6a5b556
#63 add messageid as option client
cavycorp Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Plugins/CorvusEbMS/src/main/java/hk/hku/cecid/ebms/spa/service/EbmsMessageSenderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand All @@ -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());

Expand Down
3 changes: 2 additions & 1 deletion Plugins/CorvusEbMS/src/main/java/hk/hku/cecid/ebms/spa/service/EbmsMessageSenderService.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<part name="toPartyRole" type="s:string" />
<part name="refToMessageId" type="s:string" />
<part name="serviceType" type="s:string" />
<part name="messageId" type="s:string" />
</message>
<message name="EbmsResponseMsg">
<part name="message_id" type="s:string" />
Expand Down Expand Up @@ -52,4 +53,4 @@
<soap:address location="http://127.0.0.1:8080/corvus/httpd/ebms/sender" />
</port>
</service>
</definitions>
</definitions>