Review: Ensure dittoHeadersForMerge of UpdateTwinWithLiveResonseMessa…

…geMapper is non-null; add assertion that the channel header is not set after mapping. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Nov 25, 2021 · de171ee · de171ee
1 parent 977b95e
commit de171ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...g/eclipse/ditto/connectivity/service/mapping/UpdateTwinWithLiveResponseMessageMapper.java b/...g/eclipse/ditto/connectivity/service/mapping/UpdateTwinWithLiveResponseMessageMapper.java
@@ -86,11 +86,10 @@ public class UpdateTwinWithLiveResponseMessageMapper extends AbstractMessageMapp
 
     static final String CORRELATION_ID_SUFFIX = "-merge-into-twin";
 
-    private DittoHeaders dittoHeadersForMerge;
+    private DittoHeaders dittoHeadersForMerge = DEFAULT_DITTO_HEADERS_FOR_MERGE;
 
     @Override
     public void doConfigure(final MappingConfig mappingConfig, final MessageMapperConfiguration configuration) {
-        dittoHeadersForMerge = DEFAULT_DITTO_HEADERS_FOR_MERGE;
         configuration.findProperty(DITTO_HEADERS_FOR_MERGE, JsonValue::isObject, JsonValue::asObject)
                 .ifPresent(
                         configuredHeaders -> dittoHeadersForMerge = DittoHeaders.newBuilder(configuredHeaders).build());

diff --git a/...lipse/ditto/connectivity/service/mapping/UpdateTwinWithLiveResponseMessageMapperTest.java b/...lipse/ditto/connectivity/service/mapping/UpdateTwinWithLiveResponseMessageMapperTest.java
@@ -168,6 +168,7 @@ public void mapRetrieveThingLiveResponseToExpectedMergeThingMappingResult() {
                 .build());
         assertThat(mergeThing.getDittoHeaders().getCorrelationId())
                 .contains(correlationId + UpdateTwinWithLiveResponseMessageMapper.CORRELATION_ID_SUFFIX);
+        assertThat(mergeThing.getDittoHeaders().getChannel()).isEmpty();
     }
 
     @Test