From a7291244aedd57a7fd6ceaef3ea75ea583693be3 Mon Sep 17 00:00:00 2001 From: Eelco den Heijer Date: Tue, 5 Dec 2023 10:30:52 +0100 Subject: [PATCH 1/3] 65 - fix for ReferencedRequestMessageIdInResponseValidator Signed-off-by: Eelco den Heijer --- ...exRequestMessageIdInResponseValidator.java | 40 +++++++++ ...edRequestMessageIdInResponseValidator.java | 39 --------- .../core/model/PayloadMessageFixture.java | 16 +++- .../core/model/UftpMessageFixture.java | 4 + .../sending/UftpSendMessageServiceTest.java | 1 - ...questMessageIdInResponseValidatorTest.java | 81 +++++++++++++++++++ .../config/ShapeshifterConfiguration.java | 2 +- 7 files changed, 141 insertions(+), 42 deletions(-) create mode 100644 core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java delete mode 100644 core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java create mode 100644 core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java new file mode 100644 index 0000000..ef0fcca --- /dev/null +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java @@ -0,0 +1,40 @@ +package org.lfenergy.shapeshifter.core.service.validation.base; + + +import lombok.RequiredArgsConstructor; +import org.lfenergy.shapeshifter.api.FlexRequest; +import org.lfenergy.shapeshifter.api.FlexRequestResponse; +import org.lfenergy.shapeshifter.api.PayloadMessageType; +import org.lfenergy.shapeshifter.core.model.UftpMessage; +import org.lfenergy.shapeshifter.core.model.UftpRequestResponseMapping; +import org.lfenergy.shapeshifter.core.service.validation.UftpMessageSupport; +import org.lfenergy.shapeshifter.core.service.validation.UftpValidator; + + +@RequiredArgsConstructor +public class ReferencedFlexRequestMessageIdInResponseValidator implements UftpValidator { + + private final UftpMessageSupport support; + + @Override + public boolean appliesTo(Class clazz) { + return UftpRequestResponseMapping.hasReferencedRequestMessageId(clazz); + } + + @Override + public int order() { + return 0; + } + + @Override + public boolean isValid(UftpMessage message) { + var value = message.payloadMessage().getFlexRequestMessageID(); + return value != null && support.findReferencedMessage(message.referenceToPreviousMessage(value, message.payloadMessage().getConversationID(), + FlexRequest.class)).isPresent(); + } + + @Override + public String getReason() { + return "Unknown reference Request message ID"; + } +} diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java deleted file mode 100644 index 01638b4..0000000 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.lfenergy.shapeshifter.core.service.validation.base; - - -import lombok.RequiredArgsConstructor; -import org.lfenergy.shapeshifter.api.PayloadMessageResponseType; -import org.lfenergy.shapeshifter.api.PayloadMessageType; -import org.lfenergy.shapeshifter.core.model.UftpMessage; -import org.lfenergy.shapeshifter.core.model.UftpRequestResponseMapping; -import org.lfenergy.shapeshifter.core.service.validation.UftpMessageSupport; -import org.lfenergy.shapeshifter.core.service.validation.UftpValidator; - - -@RequiredArgsConstructor -public class ReferencedRequestMessageIdInResponseValidator implements UftpValidator { - - private final UftpMessageSupport support; - - @Override - public boolean appliesTo(Class clazz) { - return UftpRequestResponseMapping.hasReferencedRequestMessageId(clazz); - } - - @Override - public int order() { - return 0; - } - - @Override - public boolean isValid(UftpMessage message) { - var value = UftpRequestResponseMapping.getReferencedRequestMessageId(message.payloadMessage()); - return value.isEmpty() || support.findDuplicateMessage(value.get(), message.payloadMessage().getSenderDomain() , - message.payloadMessage().getRecipientDomain()).isPresent(); - } - - @Override - public String getReason() { - return "Unknown reference Request message ID"; - } -} diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/model/PayloadMessageFixture.java b/core/src/test/java/org/lfenergy/shapeshifter/core/model/PayloadMessageFixture.java index f1a2048..229f38a 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/model/PayloadMessageFixture.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/model/PayloadMessageFixture.java @@ -4,7 +4,11 @@ package org.lfenergy.shapeshifter.core.model; -import org.lfenergy.shapeshifter.api.*; +import org.lfenergy.shapeshifter.api.AvailableRequestedType; +import org.lfenergy.shapeshifter.api.FlexRequest; +import org.lfenergy.shapeshifter.api.FlexRequestISPType; +import org.lfenergy.shapeshifter.api.FlexRequestResponse; +import org.lfenergy.shapeshifter.api.TestMessage; import java.time.Duration; import java.time.OffsetDateTime; @@ -49,6 +53,16 @@ public static FlexRequest createTestFlexRequest(String messageId, String senderD return flexRequest; } + public static FlexRequestResponse createTestFlexRequestResponse(String messageId, String senderDomain, String recipientDomain) { + var flexRequestResponse = new FlexRequestResponse(); + flexRequestResponse.setMessageID(messageId); + flexRequestResponse.setConversationID(CONVERSATION_ID); + flexRequestResponse.setSenderDomain(senderDomain); + flexRequestResponse.setRecipientDomain(recipientDomain); + flexRequestResponse.setTimeStamp(NOW); + return flexRequestResponse; + } + public static TestMessage createTestMessage(String messageId, String senderDomain, String recipientDomain) { var testMessage = new TestMessage(); testMessage.setMessageID(messageId); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/model/UftpMessageFixture.java b/core/src/test/java/org/lfenergy/shapeshifter/core/model/UftpMessageFixture.java index dd398a4..1d476a3 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/model/UftpMessageFixture.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/model/UftpMessageFixture.java @@ -4,6 +4,7 @@ package org.lfenergy.shapeshifter.core.model; +import org.lfenergy.shapeshifter.api.PayloadMessageResponseType; import org.lfenergy.shapeshifter.api.PayloadMessageType; public final class UftpMessageFixture { @@ -15,6 +16,9 @@ private UftpMessageFixture() { public static UftpMessage createIncoming(UftpParticipant sender, T payloadMessage) { return new UftpMessage<>(sender, UftpMessageDirection.INCOMING, payloadMessage); } + public static UftpMessage createIncomingResponse(UftpParticipant sender, T payloadMessage) { + return new UftpMessage<>(sender, UftpMessageDirection.INCOMING, payloadMessage); + } public static UftpMessage createOutgoing(UftpParticipant sender, T payloadMessage) { return new UftpMessage<>(sender, UftpMessageDirection.OUTGOING, payloadMessage); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java index b19f75a..9f24923 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java @@ -65,7 +65,6 @@ class UftpSendMessageServiceTest { @Mock private UftpValidationService uftpValidationService; - private UftpSendMessageService testSubject; @Mock diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java new file mode 100644 index 0000000..5a6e41c --- /dev/null +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java @@ -0,0 +1,81 @@ +package org.lfenergy.shapeshifter.core.service.validation.base; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.lfenergy.shapeshifter.api.FlexRequest; +import org.lfenergy.shapeshifter.api.FlexRequestResponse; +import org.lfenergy.shapeshifter.api.TestMessageResponse; +import org.lfenergy.shapeshifter.api.USEFRoleType; +import org.lfenergy.shapeshifter.core.model.UftpMessageFixture; +import org.lfenergy.shapeshifter.core.model.UftpParticipant; +import org.lfenergy.shapeshifter.core.service.validation.UftpMessageSupport; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; + +@ExtendWith(MockitoExtension.class) +class ReferencedFlexRequestMessageIdInResponseValidatorTest { + private static final String FLEX_REQUEST_MESSAGE_ID = UUID.randomUUID().toString(); + private static final String CONVERSATION_ID = UUID.randomUUID().toString(); + @Mock + private UftpMessageSupport messageSupport; + + @InjectMocks + private ReferencedFlexRequestMessageIdInResponseValidator testSubject; + + private final UftpParticipant sender = new UftpParticipant("example.com", USEFRoleType.DSO); + private final FlexRequestResponse flexRequestResponse = new FlexRequestResponse(); + private final FlexRequest flexRequest = new FlexRequest(); + + @Test + void appliesTo() { + assertThat(testSubject.appliesTo(FlexRequestResponse.class)).isTrue(); + } + + @Test + void notAppliesTo() { + assertThat(testSubject.appliesTo(TestMessageResponse.class)).isFalse(); + } + + @Test + void valid_whenNoFlexRequestReferenceInResponse() { + flexRequestResponse.setFlexRequestMessageID(null); + + assertThat(testSubject.isValid(UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse))).isFalse(); + } + + @Test + void valid_whenFlexRequestReferenceInResponseIsKnown() { + var uftpMessage = UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse); + + flexRequestResponse.setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); + flexRequestResponse.setConversationID(CONVERSATION_ID); + given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(FLEX_REQUEST_MESSAGE_ID, CONVERSATION_ID, + FlexRequest.class))).willReturn(Optional.of(flexRequest)); + + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + } + + @Test + void invalid_whenReferenceInResponseIsNotKnown() { + var uftpMessage = UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse); + + flexRequestResponse.setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); + flexRequestResponse.setConversationID(CONVERSATION_ID); + given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(FLEX_REQUEST_MESSAGE_ID, CONVERSATION_ID, + FlexRequest.class))).willReturn(Optional.empty()); + + assertThat(testSubject.isValid(uftpMessage)).isFalse(); + } + + @Test + void getReason() { + assertThat(testSubject.getReason()).isEqualTo("Unknown reference Request message ID"); + } +} diff --git a/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java b/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java index 5255bad..15def03 100644 --- a/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java +++ b/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java @@ -139,7 +139,7 @@ public UftpValidationService uftpValidationService(ParticipantSupport participan new ReferencedFlexOrderOptionReferenceValidator(uftpMessageSupport), new ReferencedFlexRequestMessageIdValidator(uftpMessageSupport), new ReferencedFlexSettlementResponseOrderReferenceValidator(uftpMessageSupport), - new ReferencedRequestMessageIdInResponseValidator(uftpMessageSupport), + new ReferencedFlexRequestMessageIdInResponseValidator(uftpMessageSupport), new SenderMatchesEnvelopeValidator(), new SenderRoleMatchesContentTypeValidator(), new TimeZoneSupportedValidator(uftpValidatorSupport), From 34831a8d9fbe6c1d3017ac379c88f8bef268a255 Mon Sep 17 00:00:00 2001 From: Eelco den Heijer Date: Tue, 5 Dec 2023 11:13:06 +0100 Subject: [PATCH 2/3] 65 - fix for ReferencedRequestMessageIdInResponseValidator - review comments Signed-off-by: Eelco den Heijer --- ...erencedFlexRequestMessageIdInResponseValidator.java | 10 +++++----- ...cedFlexRequestMessageIdInResponseValidatorTest.java | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java index ef0fcca..f7ca6eb 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import org.lfenergy.shapeshifter.api.FlexRequest; -import org.lfenergy.shapeshifter.api.FlexRequestResponse; +import org.lfenergy.shapeshifter.api.PayloadMessageResponseType; import org.lfenergy.shapeshifter.api.PayloadMessageType; import org.lfenergy.shapeshifter.core.model.UftpMessage; import org.lfenergy.shapeshifter.core.model.UftpRequestResponseMapping; @@ -12,7 +12,7 @@ @RequiredArgsConstructor -public class ReferencedFlexRequestMessageIdInResponseValidator implements UftpValidator { +public class ReferencedFlexRequestMessageIdInResponseValidator implements UftpValidator { private final UftpMessageSupport support; @@ -27,9 +27,9 @@ public int order() { } @Override - public boolean isValid(UftpMessage message) { - var value = message.payloadMessage().getFlexRequestMessageID(); - return value != null && support.findReferencedMessage(message.referenceToPreviousMessage(value, message.payloadMessage().getConversationID(), + public boolean isValid(UftpMessage message) { + var value = UftpRequestResponseMapping.getReferencedRequestMessageId(message.payloadMessage()); + return value.isPresent() && support.findReferencedMessage(message.referenceToPreviousMessage(value.get(), message.payloadMessage().getConversationID(), FlexRequest.class)).isPresent(); } diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java index 5a6e41c..163fe7e 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.shapeshifter.api.FlexRequest; import org.lfenergy.shapeshifter.api.FlexRequestResponse; +import org.lfenergy.shapeshifter.api.PayloadMessageResponseType; import org.lfenergy.shapeshifter.api.TestMessageResponse; import org.lfenergy.shapeshifter.api.USEFRoleType; import org.lfenergy.shapeshifter.core.model.UftpMessageFixture; @@ -30,7 +31,7 @@ class ReferencedFlexRequestMessageIdInResponseValidatorTest { private ReferencedFlexRequestMessageIdInResponseValidator testSubject; private final UftpParticipant sender = new UftpParticipant("example.com", USEFRoleType.DSO); - private final FlexRequestResponse flexRequestResponse = new FlexRequestResponse(); + private final PayloadMessageResponseType flexRequestResponse = new FlexRequestResponse(); private final FlexRequest flexRequest = new FlexRequest(); @Test @@ -45,7 +46,7 @@ void notAppliesTo() { @Test void valid_whenNoFlexRequestReferenceInResponse() { - flexRequestResponse.setFlexRequestMessageID(null); + ((FlexRequestResponse) flexRequestResponse).setFlexRequestMessageID(null); assertThat(testSubject.isValid(UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse))).isFalse(); } @@ -54,7 +55,7 @@ void valid_whenNoFlexRequestReferenceInResponse() { void valid_whenFlexRequestReferenceInResponseIsKnown() { var uftpMessage = UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse); - flexRequestResponse.setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); + ((FlexRequestResponse) flexRequestResponse).setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); flexRequestResponse.setConversationID(CONVERSATION_ID); given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(FLEX_REQUEST_MESSAGE_ID, CONVERSATION_ID, FlexRequest.class))).willReturn(Optional.of(flexRequest)); @@ -66,7 +67,7 @@ void valid_whenFlexRequestReferenceInResponseIsKnown() { void invalid_whenReferenceInResponseIsNotKnown() { var uftpMessage = UftpMessageFixture.createIncomingResponse(sender, flexRequestResponse); - flexRequestResponse.setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); + ((FlexRequestResponse) flexRequestResponse).setFlexRequestMessageID(FLEX_REQUEST_MESSAGE_ID); flexRequestResponse.setConversationID(CONVERSATION_ID); given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(FLEX_REQUEST_MESSAGE_ID, CONVERSATION_ID, FlexRequest.class))).willReturn(Optional.empty()); From 4b0ebaf49bf629effaf98f215e14ea1869728a72 Mon Sep 17 00:00:00 2001 From: Eelco den Heijer Date: Tue, 5 Dec 2023 11:37:20 +0100 Subject: [PATCH 3/3] 65 - fix for ReferencedRequestMessageIdInResponseValidator - renamed validator back to original name Signed-off-by: Eelco den Heijer --- ...ava => ReferencedRequestMessageIdInResponseValidator.java} | 2 +- ...=> ReferencedRequestMessageIdInResponseValidatorTest.java} | 4 ++-- .../shapeshifter/spring/config/ShapeshifterConfiguration.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/{ReferencedFlexRequestMessageIdInResponseValidator.java => ReferencedRequestMessageIdInResponseValidator.java} (92%) rename core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/{ReferencedFlexRequestMessageIdInResponseValidatorTest.java => ReferencedRequestMessageIdInResponseValidatorTest.java} (96%) diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java similarity index 92% rename from core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java rename to core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java index f7ca6eb..761b760 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidator.java @@ -12,7 +12,7 @@ @RequiredArgsConstructor -public class ReferencedFlexRequestMessageIdInResponseValidator implements UftpValidator { +public class ReferencedRequestMessageIdInResponseValidator implements UftpValidator { private final UftpMessageSupport support; diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java similarity index 96% rename from core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java rename to core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java index 163fe7e..ebeb45d 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdInResponseValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java @@ -21,14 +21,14 @@ import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) -class ReferencedFlexRequestMessageIdInResponseValidatorTest { +class ReferencedRequestMessageIdInResponseValidatorTest { private static final String FLEX_REQUEST_MESSAGE_ID = UUID.randomUUID().toString(); private static final String CONVERSATION_ID = UUID.randomUUID().toString(); @Mock private UftpMessageSupport messageSupport; @InjectMocks - private ReferencedFlexRequestMessageIdInResponseValidator testSubject; + private ReferencedRequestMessageIdInResponseValidator testSubject; private final UftpParticipant sender = new UftpParticipant("example.com", USEFRoleType.DSO); private final PayloadMessageResponseType flexRequestResponse = new FlexRequestResponse(); diff --git a/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java b/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java index 15def03..5255bad 100644 --- a/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java +++ b/spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java @@ -139,7 +139,7 @@ public UftpValidationService uftpValidationService(ParticipantSupport participan new ReferencedFlexOrderOptionReferenceValidator(uftpMessageSupport), new ReferencedFlexRequestMessageIdValidator(uftpMessageSupport), new ReferencedFlexSettlementResponseOrderReferenceValidator(uftpMessageSupport), - new ReferencedFlexRequestMessageIdInResponseValidator(uftpMessageSupport), + new ReferencedRequestMessageIdInResponseValidator(uftpMessageSupport), new SenderMatchesEnvelopeValidator(), new SenderRoleMatchesContentTypeValidator(), new TimeZoneSupportedValidator(uftpValidatorSupport),