fix WoT action validation was only done for application/json content-type

Author: thjaeckle

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

@@ -34,7 +34,6 @@
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
 import org.eclipse.ditto.base.model.namespaces.NamespaceBlockedException;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
@@ -572,29 +571,25 @@ private CompletionStage<Boolean> doesThingExist() {
     private CompletionStage<MessageCommand<?, ?>> performWotBasedMessageCommandValidation(
             final MessageCommand<?, ?> messageCommand
     ) {
-        if (isJsonMessageContent(messageCommand.getMessage())) {
-            @SuppressWarnings("unchecked") final Message<JsonValue> message =
-                    ((MessageCommand<JsonValue, ?>) messageCommand)
-                            .getMessage();
-
-            final MessageDirection messageDirection = message.getDirection();
-            final JsonValue messageCommandPayload = message
-                    .getPayload()
-                    .orElse(null);
-
-            if (messageCommand instanceof SendThingMessage<?> sendThingMessage) {
-                return performWotBasedThingMessageValidation(messageCommand, sendThingMessage, messageDirection,
-                        messageCommandPayload
-                ).thenApply(aVoid -> messageCommand);
-            } else if (messageCommand instanceof SendFeatureMessage<?> sendFeatureMessage) {
-                final String featureId = sendFeatureMessage.getFeatureId();
-                return performWotBasedFeatureMessageValidation(messageCommand, sendFeatureMessage, featureId,
-                        messageDirection, messageCommandPayload
-                ).thenApply(aVoid -> messageCommand);
+        @SuppressWarnings("unchecked") final Message<JsonValue> message =
+                ((MessageCommand<JsonValue, ?>) messageCommand)
+                        .getMessage();
+
+        final MessageDirection messageDirection = message.getDirection();
+        final JsonValue messageCommandPayload = message
+                .getPayload()
+                .orElse(null);
+
+        if (messageCommand instanceof SendThingMessage<?> sendThingMessage) {
+            return performWotBasedThingMessageValidation(messageCommand, sendThingMessage, messageDirection,
+                    messageCommandPayload
+            ).thenApply(aVoid -> messageCommand);
+        } else if (messageCommand instanceof SendFeatureMessage<?> sendFeatureMessage) {
+            final String featureId = sendFeatureMessage.getFeatureId();
+            return performWotBasedFeatureMessageValidation(messageCommand, sendFeatureMessage, featureId,
+                    messageDirection, messageCommandPayload
+            ).thenApply(aVoid -> messageCommand);
 
-            } else {
-                return CompletableFuture.completedFuture(messageCommand);
-            }
         } else {
             return CompletableFuture.completedFuture(messageCommand);
         }
@@ -674,56 +669,45 @@ private CompletionStage<Void> performWotBasedFeatureMessageValidation(final Mess
     private CompletionStage<MessageCommandResponse<?, ?>> performWotBasedMessageCommandResponseValidation(
             final MessageCommandResponse<?, ?> messageCommandResponse
     ) {
-        if (isJsonMessageContent(messageCommandResponse.getMessage())) {
-            @SuppressWarnings("unchecked") final Message<JsonValue> message =
-                    ((MessageCommandResponse<JsonValue, ?>) messageCommandResponse)
-                            .getMessage();
-
-            final MessageDirection messageDirection = message.getDirection();
-            final JsonValue messageCommandPayload = message
-                    .getPayload()
-                    .orElse(null);
-
-            if (messageDirection == MessageDirection.TO &&
-                    messageCommandResponse instanceof SendThingMessageResponse<?> sendThingMessageResponse) {
-                return resolveThingDefinition()
-                        .thenCompose(optThingDefinition -> thingModelValidator.validateThingActionOutput(
-                                optThingDefinition.orElse(null),
-                                sendThingMessageResponse.getMessage().getSubject(),
-                                messageCommandPayload,
-                                sendThingMessageResponse.getResourcePath(),
-                                sendThingMessageResponse.getDittoHeaders()
-                        ))
-                        .thenApply(aVoid -> messageCommandResponse);
-            } else if (messageDirection == MessageDirection.TO &&
-                    messageCommandResponse instanceof SendFeatureMessageResponse<?> sendFeatureMessageResponse) {
-                final String featureId = sendFeatureMessageResponse.getFeatureId();
-                return resolveThingAndFeatureDefinition(featureId)
-                        .thenCompose(optDefinitionPair -> thingModelValidator.validateFeatureActionOutput(
-                                optDefinitionPair.first().orElse(null),
-                                optDefinitionPair.second().orElse(null),
-                                featureId,
-                                sendFeatureMessageResponse.getMessage().getSubject(),
-                                messageCommandPayload,
-                                sendFeatureMessageResponse.getResourcePath(),
-                                sendFeatureMessageResponse.getDittoHeaders()
-                        ))
-                        .thenApply(aVoid -> messageCommandResponse);
-            } else {
-                return CompletableFuture.completedFuture(messageCommandResponse);
-            }
+        @SuppressWarnings("unchecked") final Message<JsonValue> message =
+                ((MessageCommandResponse<JsonValue, ?>) messageCommandResponse)
+                        .getMessage();
+
+        final MessageDirection messageDirection = message.getDirection();
+        final JsonValue messageCommandPayload = message
+                .getPayload()
+                .orElse(null);
+
+        if (messageDirection == MessageDirection.TO &&
+                messageCommandResponse instanceof SendThingMessageResponse<?> sendThingMessageResponse) {
+            return resolveThingDefinition()
+                    .thenCompose(optThingDefinition -> thingModelValidator.validateThingActionOutput(
+                            optThingDefinition.orElse(null),
+                            sendThingMessageResponse.getMessage().getSubject(),
+                            messageCommandPayload,
+                            sendThingMessageResponse.getResourcePath(),
+                            sendThingMessageResponse.getDittoHeaders()
+                    ))
+                    .thenApply(aVoid -> messageCommandResponse);
+        } else if (messageDirection == MessageDirection.TO &&
+                messageCommandResponse instanceof SendFeatureMessageResponse<?> sendFeatureMessageResponse) {
+            final String featureId = sendFeatureMessageResponse.getFeatureId();
+            return resolveThingAndFeatureDefinition(featureId)
+                    .thenCompose(optDefinitionPair -> thingModelValidator.validateFeatureActionOutput(
+                            optDefinitionPair.first().orElse(null),
+                            optDefinitionPair.second().orElse(null),
+                            featureId,
+                            sendFeatureMessageResponse.getMessage().getSubject(),
+                            messageCommandPayload,
+                            sendFeatureMessageResponse.getResourcePath(),
+                            sendFeatureMessageResponse.getDittoHeaders()
+                    ))
+                    .thenApply(aVoid -> messageCommandResponse);
         } else {
             return CompletableFuture.completedFuture(messageCommandResponse);
         }
     }
 
-    private static boolean isJsonMessageContent(final Message<?> message) {
-        return message
-                .getInterpretedContentType()
-                .filter(ContentType::isJson)
-                .isPresent();
-    }
-
     private CompletionStage<Optional<ThingDefinition>> resolveThingDefinition() {
         return Patterns.ask(getContext().getParent(), SudoRetrieveThing.of(entityId,
                         JsonFieldSelector.newInstance("definition"),