Merge pull request #2118 from beyonnex-io/bugfix/wot-response-message-validation-regression

fixed regression in message response WoT validation done at wrong place

Author: thjaeckle

things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java

@@ -715,18 +715,6 @@ private CompletionStage<Void> performWotBasedFeatureMessageValidation(final Mess
                 ((MessageCommandResponse<JsonValue, ?>) messageCommandResponse)
                         .getMessage();
 
-        if (message.getPayload().isPresent() && !isJsonMessageContent(message)) {
-            return CompletableFuture.failedFuture(
-                    WotThingModelPayloadValidationException
-                            .newBuilder("Could not validate non-JSON message content type <" +
-                                    message.getContentType().orElse("?") + "> for message response subject " +
-                                    "<" + message.getSubject() + ">"
-                            )
-                            .dittoHeaders(messageCommandResponse.getDittoHeaders())
-                            .build()
-            );
-        }
-
         // lazily only supply JsonValue if validation is enabled for the message:
         final Supplier<JsonValue> messageCommandPayloadSupplier = () -> {
             if (message.getPayload().isPresent() && !isJsonMessageContent(message)) {
@@ -742,9 +730,7 @@ private CompletionStage<Void> performWotBasedFeatureMessageValidation(final Mess
             return message.getPayload().orElse(null);
         };
 
-        final MessageDirection messageDirection = message.getDirection();
-        if (messageDirection == MessageDirection.TO &&
-                messageCommandResponse instanceof SendThingMessageResponse<?> sendThingMessageResponse) {
+        if (messageCommandResponse instanceof SendThingMessageResponse<?> sendThingMessageResponse) {
             return resolveThingDefinition()
                     .thenCompose(optThingDefinition -> thingModelValidator.validateThingActionOutput(
                             optThingDefinition.orElse(null),
@@ -754,8 +740,7 @@ private CompletionStage<Void> performWotBasedFeatureMessageValidation(final Mess
                             sendThingMessageResponse.getDittoHeaders()
                     ))
                     .thenApply(aVoid -> messageCommandResponse);
-        } else if (messageDirection == MessageDirection.TO &&
-                messageCommandResponse instanceof SendFeatureMessageResponse<?> sendFeatureMessageResponse) {
+        } else if (messageCommandResponse instanceof SendFeatureMessageResponse<?> sendFeatureMessageResponse) {
             final String featureId = sendFeatureMessageResponse.getFeatureId();
             return resolveThingAndFeatureDefinition(featureId)
                     .thenCompose(optDefinitionPair -> thingModelValidator.validateFeatureActionOutput(