Issue #106: Do not validate resource path matching for error responses.

Signed-off-by: Juergen Fickel <juergen.fickel@bosch.io>
eclipse-ditto · Nov 24, 2021 · 8ae818b · 8ae818b
1 parent 4418fb8
commit 8ae818b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/.../ditto/internal/models/signal/correlation/CommandAndCommandResponseMatchingValidator.java b/.../ditto/internal/models/signal/correlation/CommandAndCommandResponseMatchingValidator.java
@@ -233,7 +233,10 @@ private static MatchingValidationResult validateResourcePathsMatch(final Command
         if (SignalInformationPoint.isThingCommand(command)) {
             final var commandResourcePath = command.getResourcePath();
             final var commandResponseResourcePath = commandResponse.getResourcePath();
-            if (isAcknowledgement(commandResponse) || commandResourcePath.equals(commandResponseResourcePath)) {
+            if (commandResourcePath.equals(commandResponseResourcePath) ||
+                    isAcknowledgement(commandResponse) ||
+                    isErrorResponseType(commandResponse)) {
+
                 result = MatchingValidationResult.success();
             } else {
                 final var pattern = "Resource path of live response <{0}> differs from resource path of command <{1}>.";

diff --git a/...to/internal/models/signal/correlation/CommandAndCommandResponseMatchingValidatorTest.java b/...to/internal/models/signal/correlation/CommandAndCommandResponseMatchingValidatorTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.ditto.base.model.common.ResponseType;
 import org.eclipse.ditto.base.model.correlationid.TestNameCorrelationId;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.TooManyRequestsException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
@@ -323,6 +324,33 @@ public void applyThingCommandResponseWithDifferentResourcePath() {
                                 command.getResourcePath()));
     }
 
+    @Test
+    public void applyTooManyRequestsExceptionAsThingErrorResponse() {
+
+        // GIVEN
+        final var command = ModifyAttribute.of(THING_ID,
+                JsonPointer.of("manufacturer"),
+                JsonValue.of("ACME"),
+                getDittoHeadersWithCorrelationId());
+
+        final var tooManyRequestsException = TooManyRequestsException.fromMessage("I'm just a random error mate!",
+                command.getDittoHeaders());
+        final var thingErrorResponse = ThingErrorResponse.of(THING_ID, tooManyRequestsException);
+
+        final var underTest = CommandAndCommandResponseMatchingValidator.getInstance();
+
+        // WHEN
+        final var validationResult = underTest.apply(command, thingErrorResponse);
+
+        // THEN
+        softly.assertThat(validationResult.isSuccess())
+                .withFailMessage(() -> {
+                    final var failure = validationResult.asFailureOrThrow();
+                    return failure.getDetailMessage();
+                })
+                .isTrue();
+    }
+
     private DittoHeaders getDittoHeadersWithCorrelationId() {
         return DittoHeaders.newBuilder().correlationId(testNameCorrelationId.getCorrelationId()).build();
     }