propagate ditto headers with exception (e.g. containing the required …

…replyTo header) Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
eclipse-ditto · Apr 19, 2018 · 8b8a0dc · 8b8a0dc
1 parent 2cc5b30
commit 8b8a0dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.../java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessorActor.java b/.../java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessorActor.java
@@ -194,7 +194,7 @@ private void handle(final ExternalMessage externalMessage) {
                 commandRouter.tell(adjustedSignal, getSelf());
             });
         } catch (final DittoRuntimeException e) {
-            handleDittoRuntimeException(e);
+            handleDittoRuntimeException(e, DittoHeaders.of(externalMessage.getHeaders()));
         } catch (final Exception e) {
             log.warning("Got <{}> when message was processed: <{}>", e.getClass().getSimpleName(), e.getMessage());
         }
@@ -206,7 +206,14 @@ private void enhanceLogUtil(final WithDittoHeaders<?> signal) {
     }
 
     private void handleDittoRuntimeException(final DittoRuntimeException exception) {
-        final ThingErrorResponse errorResponse = ThingErrorResponse.of(exception);
+        handleDittoRuntimeException(exception, DittoHeaders.empty());
+    }
+
+    private void handleDittoRuntimeException(final DittoRuntimeException exception,
+            final DittoHeaders dittoHeaders) {
+        final DittoHeaders mergedHeaders =
+                DittoHeaders.newBuilder(exception.getDittoHeaders()).putHeaders(dittoHeaders).build();
+        final ThingErrorResponse errorResponse = ThingErrorResponse.of(exception, mergedHeaders);
 
         enhanceLogUtil(exception);
 

diff --git a/...a/org/eclipse/ditto/services/connectivity/messaging/rabbitmq/RabbitMQClientActorTest.java b/...a/org/eclipse/ditto/services/connectivity/messaging/rabbitmq/RabbitMQClientActorTest.java
@@ -69,16 +69,13 @@ public class RabbitMQClientActorTest {
     private final ConnectionStatus connectionStatus = ConnectionStatus.OPEN;
 
     @Mock
-    @SuppressWarnings("FieldMayBeFinal")
-    private ConnectionFactory mockConnectionFactory = Mockito.mock(ConnectionFactory.class);
+    private final ConnectionFactory mockConnectionFactory = Mockito.mock(ConnectionFactory.class);
     private final RabbitConnectionFactoryFactory
             rabbitConnectionFactoryFactory = (con, exHandler) -> mockConnectionFactory;
     @Mock
-    @SuppressWarnings("FieldMayBeFinal")
-    private com.rabbitmq.client.Connection mockConnection = Mockito.mock(com.rabbitmq.client.Connection.class);
+    private final com.rabbitmq.client.Connection mockConnection = Mockito.mock(com.rabbitmq.client.Connection.class);
     @Mock
-    @SuppressWarnings("FieldMayBeFinal")
-    private Channel mockChannel = Mockito.mock(Channel.class);
+    private final Channel mockChannel = Mockito.mock(Channel.class);
 
     @BeforeClass
     public static void setUp() {