always use 'application/json' as content-type for NormalizedMessageMa…

…pper; adapt content-type in NormalizedMessageMapperTest test; Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Mar 31, 2021 · 855b2cd · 855b2cd
1 parent c8c2d07
commit 855b2cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...rc/main/java/org/eclipse/ditto/services/connectivity/mapping/NormalizedMessageMapper.java b/...rc/main/java/org/eclipse/ditto/services/connectivity/mapping/NormalizedMessageMapper.java
@@ -29,6 +29,7 @@
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
+import org.eclipse.ditto.model.base.headers.contenttype.ContentType;
 import org.eclipse.ditto.model.things.Thing;
 import org.eclipse.ditto.model.things.ThingId;
 import org.eclipse.ditto.protocoladapter.Adaptable;
@@ -121,7 +122,7 @@ private ExternalMessage flattenAsThingChange(final Adaptable adaptable) {
                 : builder.build().get(jsonFieldSelector);
 
         final JsonObject result;
-        if (topicPath.getAction().isPresent() && topicPath.getAction().get() == TopicPath.Action.MERGED) {
+        if (topicPath.getAction().filter(TopicPath.Action.MERGED::equals).isPresent()) {
             result = filterNullValuesAndEmptyObjects(jsonObject);
         } else {
             result = jsonObject;
@@ -136,12 +137,13 @@ private ExternalMessage flattenAsThingChange(final Adaptable adaptable) {
     private static JsonObject abridgeMessage(final Adaptable adaptable) {
         final Payload payload = adaptable.getPayload();
         final JsonObjectBuilder builder = JsonObject.newBuilder();
+        final DittoHeaders dittoHeaders =
+                DittoHeaders.newBuilder(adaptable.getDittoHeaders()).contentType(ContentType.APPLICATION_JSON).build();
         // add fields of an event protocol message excluding "value" and "status"
         builder.set(JsonifiableAdaptable.JsonFields.TOPIC, adaptable.getTopicPath().getPath());
         builder.set(Payload.JsonFields.PATH, payload.getPath().toString());
         payload.getFields().ifPresent(fields -> builder.set(Payload.JsonFields.FIELDS, fields.toString()));
-        builder.set(JsonifiableAdaptable.JsonFields.HEADERS,
-                dittoHeadersToJson(adaptable.getDittoHeaders()));
+        builder.set(JsonifiableAdaptable.JsonFields.HEADERS, dittoHeadersToJson(dittoHeaders));
 
         return builder.build();
     }

diff --git a/...est/java/org/eclipse/ditto/services/connectivity/mapping/NormalizedMessageMapperTest.java b/...est/java/org/eclipse/ditto/services/connectivity/mapping/NormalizedMessageMapperTest.java
@@ -148,7 +148,7 @@ public void thingMerged() {
                         "    \"path\": \"/\",\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
-                        "      \"content-type\": \"application/merge-patch+json\"\n" +
+                        "      \"content-type\": \"application/json\"\n" +
                         "    }\n" +
                         "  }\n" +
                         "}"));
@@ -192,7 +192,7 @@ public void thingMergedWithNullValues() {
                         "    \"path\": \"/\",\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
-                        "      \"content-type\": \"application/merge-patch+json\"\n" +
+                        "      \"content-type\": \"application/json\"\n" +
                         "    }\n" +
                         "  }\n" +
                         "}"));
@@ -225,7 +225,7 @@ public void thingMergedWithOnlyNullValues() {
                         "    \"path\": \"/\",\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
-                        "      \"content-type\": \"application/merge-patch+json\"\n" +
+                        "      \"content-type\": \"application/json\"\n" +
                         "    }\n" +
                         "  }\n" +
                         "}"));