Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,32 @@

package org.lfenergy.shapeshifter.core.model;

import lombok.NonNull;
import org.lfenergy.shapeshifter.api.PayloadMessageType;

/**
* Reference to a previously sent or received UFTP message.
*
* @param messageID The MessageID of the UFTP message.
* @param conversationID The Conversation ID of the UFTP message.
* @param direction The direction of the UFTP message, whether it's incoming or outgoing.
* @param senderDomain The SenderDomain of the UFTP message.
* @param messageID The MessageID of the UFTP message.
* @param conversationID The Conversation ID of the UFTP message.
* @param direction The direction of the UFTP message, whether it's incoming or outgoing.
* @param senderDomain The SenderDomain of the UFTP message.
* @param recipientDomain The RecipientDomain of the UFTP message.
* @param type The class of the payload message.
* @param <T> The type of the payload message.
* @param type The class of the payload message.
* @param <T> The type of the payload message.
*/
public record UftpMessageReference<T extends PayloadMessageType>(
String messageID,
String conversationID,
UftpMessageDirection direction,
String senderDomain,
String recipientDomain,
Class<T> type
@NonNull
String messageID,
@NonNull
String conversationID,
@NonNull
UftpMessageDirection direction,
@NonNull
String senderDomain,
@NonNull
String recipientDomain,
@NonNull
Class<T> type
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,12 @@ private boolean validatePeriod(UftpMessage<PayloadMessageType> uftpMessage, Flex

private boolean validatePeriod(UftpMessage<PayloadMessageType> uftpMessage, FlexOrder msg) {
var period = msg.getPeriod();
var offer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(msg.getFlexOfferMessageID(),
var flexOfferMessageID = msg.getFlexOfferMessageID();
if (flexOfferMessageID == null) {
return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period.
}

var offer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID,
msg.getConversationID(), FlexOffer.class));
if (offer.isEmpty()) {
return true; // validated in ReferencedFlexOfferMessageIdValidation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ public int order() {
public boolean isValid(UftpMessage<FlexOrder> uftpMessage) {
var flexOrder = uftpMessage.payloadMessage();

var flexOfferMessageID = flexOrder.getFlexOfferMessageID();
if (flexOfferMessageID == null) {
return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period.
}

var optionReference = flexOrder.getOptionReference();
if (optionReference == null || optionReference.isEmpty()) {
return true;
}

return messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(),
return messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID,
uftpMessage.payloadMessage().getConversationID(), FlexOffer.class))
.map(flexOffer -> flexOffer.getOfferOptions()
.stream()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ public int order() {
public boolean isValid(UftpMessage<FlexOrder> uftpMessage) {
var flexOrder = uftpMessage.payloadMessage();

var flexOffer = uftpMessageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(),
var flexOfferMessageID = flexOrder.getFlexOfferMessageID();
if (flexOfferMessageID == null) {
return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period.
}

var flexOffer = uftpMessageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID,
flexOrder.getConversationID(), FlexOffer.class));
if (flexOffer.isEmpty()) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ public int order() {
public boolean isValid(UftpMessage<FlexOrder> uftpMessage) {
var flexOrder = uftpMessage.payloadMessage();

var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(),
var flexOfferMessageID = flexOrder.getFlexOfferMessageID();
if (flexOfferMessageID == null) {
return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period.
}

var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID,
flexOrder.getConversationID(), FlexOffer.class));
// if there is no flex offer => return false
if (flexOffer.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ public int order() {
@Override
public boolean isValid(UftpMessage<FlexOrder> uftpMessage) {
var flexOrder = uftpMessage.payloadMessage();
var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(),

var flexOfferMessageID = flexOrder.getFlexOfferMessageID();
if (flexOfferMessageID == null) {
return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period.
}

var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID,
flexOrder.getConversationID(), FlexOffer.class));
return flexOffer.map(offer -> offer.getOfferOptions().stream().allMatch(it -> priceMatches(it, flexOrder.getPrice()))).orElse(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,9 @@ void attemptToSendMessage_connectFailed() {
verifyNoValidations();

assertThat(actual)
.isInstanceOf(UftpSendException.class)
.hasMessage("Unexpected I/O exception while sending UFTP message to " + endpoint + ": ConnectException: null");
.isInstanceOf(UftpSendException.class);
assertThat(actual.getMessage())
.startsWith("Unexpected I/O exception while sending UFTP message to " + endpoint + ": ConnectException:");
assertThat(actual.getHttpStatusCode()).isEqualTo(httpStatusCode);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,24 @@ void notAppliesTo() {
public static Stream<Arguments> withParameter() {
FlexRequest flexRequest = new FlexRequest();
flexRequest.setTimeZone(TIME_ZONE_AMSTERDAM);
flexRequest.setSenderDomain("agr.tld");
flexRequest.setRecipientDomain("dso.tld");

FlexOffer flexOffer = new FlexOffer();
flexOffer.setTimeZone(TIME_ZONE_AMSTERDAM);
flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID);
flexOffer.setPeriod(PERIOD);
flexOffer.setConversationID(CONVERSATION_ID);
flexOffer.setSenderDomain("agr.tld");
flexOffer.setRecipientDomain("dso.tld");

FlexOrder flexOrder = new FlexOrder();
flexOrder.setTimeZone(TIME_ZONE_AMSTERDAM);
flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID);
flexOrder.setPeriod(PERIOD);
flexOrder.setConversationID(CONVERSATION_ID);
flexOrder.setSenderDomain("dso.tld");
flexOrder.setRecipientDomain("agr.tld");

return Stream.of(
Arguments.of(flexOffer, FlexRequest.class, flexRequest),
Expand All @@ -104,6 +110,16 @@ void valid_true_whenFlexOfferTypeWhenThereIsNoFlexRequestMessageID() {
assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOffer))).isTrue();
}

@Test
void valid_true_whenFlexOrderTypeWhenThereIsNoFlexOfferMessageID() {
// Unsolicited FlexOrder has no FlexOfferMessageID
FlexOrder flexOrder = new FlexOrder();
flexOrder.setFlexOfferMessageID(null);
flexOrder.setPeriod(PERIOD);

assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOrder))).isTrue();
}

@Test
void valid_flexOffer_true_whenFlexRequestIsSentFromMexicoCity() {
TimeZone.setDefault(TimeZone.getTimeZone(TIME_ZONE_AMSTERDAM));
Expand All @@ -113,6 +129,8 @@ void valid_flexOffer_true_whenFlexRequestIsSentFromMexicoCity() {
flexRequest.setTimeZone(TIME_ZONE_MEXICO_CITY);

var flexOffer = new FlexOffer();
flexOffer.setSenderDomain("agr.tld");
flexOffer.setRecipientDomain("dso.tld");
flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID);
flexOffer.setConversationID(CONVERSATION_ID);
var uftpMessage = UftpMessageFixture.<PayloadMessageType>createOutgoing(sender, flexOffer);
Expand All @@ -133,6 +151,8 @@ void valid_flexOrder_true_whenFlexOfferIsSentFromMexicoCity() {
flexOffer.setConversationID(CONVERSATION_ID);

var flexOrder = new FlexOrder();
flexOrder.setSenderDomain("dso.tld");
flexOrder.setRecipientDomain("agr.tld");
flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID);
flexOrder.setConversationID(CONVERSATION_ID);

Expand Down
Loading