don't add all externalMessage headers in DittoMessageMapper

* this must be done explicitly in header mapping of connection sources Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Nov 15, 2019 · 7b9592d · 7b9592d
1 parent 83350f4
commit 7b9592d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/...ing/src/main/java/org/eclipse/ditto/services/connectivity/mapping/DittoMessageMapper.java b/...ing/src/main/java/org/eclipse/ditto/services/connectivity/mapping/DittoMessageMapper.java
@@ -75,7 +75,7 @@ public List<Adaptable> map(final ExternalMessage message) {
                 ProtocolFactory.jsonifiableAdaptableFromJson(JsonFactory.newObject(payload))
         );
 
-        final DittoHeaders mergedHeaders = mergeHeaders(message, jsonifiableAdaptable);
+        final DittoHeaders mergedHeaders = jsonifiableAdaptable.getDittoHeaders();
         return singletonList(
                 ProtocolFactory.newAdaptableBuilder(jsonifiableAdaptable).withHeaders(mergedHeaders).build());
     }
@@ -125,17 +125,4 @@ private static Charset determineCharset(final Map<String, String> messageHeaders
         return CharsetDeterminer.getInstance().apply(messageHeaders.get(ExternalMessage.CONTENT_TYPE_HEADER));
     }
 
-    /**
-     * Merge message headers of message and adaptable. Adaptable headers do override message headers!
-     *
-     * @param message the message
-     * @param adaptable the adaptable
-     * @return the merged headers
-     */
-    private static DittoHeaders mergeHeaders(final ExternalMessage message, final Adaptable adaptable) {
-        final Map<String, String> headers = new HashMap<>(message.getHeaders());
-        adaptable.getHeaders().ifPresent(headers::putAll);
-        return DittoHeaders.of(headers);
-    }
-
 }
diff --git a/...src/test/java/org/eclipse/ditto/services/connectivity/mapping/DittoMessageMapperTest.java b/...src/test/java/org/eclipse/ditto/services/connectivity/mapping/DittoMessageMapperTest.java
@@ -102,7 +102,9 @@ private static Map.Entry<ExternalMessage, List<Adaptable>> valid1() {
                         .build())
                 .build());
 
-        final ExternalMessage message = ExternalMessageFactory.newExternalMessageBuilder(headers)
+        // by default, the DittoMessageMapper should not automatically use all headers from the ExternalMessage
+        //  those would have to be mapped by an explicit header mapping
+        final ExternalMessage message = ExternalMessageFactory.newExternalMessageBuilder(Collections.emptyMap())
                 .withTopicPath(adaptable.getTopicPath())
                 .withText(adaptable.toJsonString())
                 .build();
@@ -123,7 +125,6 @@ private static Map.Entry<ExternalMessage, List<Adaptable>> valid2() {
 
         final List<Adaptable> expected = Collections.singletonList(
                 ProtocolFactory.newAdaptableBuilder(ProtocolFactory.jsonifiableAdaptableFromJson(json))
-                        .withHeaders(DittoHeaders.of(headers))
                         .build());
         final ExternalMessage message = ExternalMessageFactory.newExternalMessageBuilder(headers)
                 .withText(json.toString())