[#1228] fixed classCastException in usage of CommandHeaderRestoration

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Dec 14, 2021 · d55cfd9 · d55cfd9
1 parent 75d98da
commit d55cfd9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/CommandResponse.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/CommandResponse.java
@@ -51,8 +51,7 @@ default JsonSchemaVersion getImplementedSchemaVersion() {
 
     /**
      * Indicates whether this response is of a type contained in
-     * {@link org.eclipse.ditto.base.model.headers.DittoHeaderDefinition#EXPECTED_RESPONSE_TYPES} header or whether it
-     * was a {@code "live"} response which always is expected.
+     * {@link org.eclipse.ditto.base.model.headers.DittoHeaderDefinition#EXPECTED_RESPONSE_TYPES} header.
      *
      * @return true if this response is expected, false if not.
      * @since 1.2.0

diff --git a/...rc/main/java/org/eclipse/ditto/concierge/service/enforcement/ThingCommandEnforcement.java b/...rc/main/java/org/eclipse/ditto/concierge/service/enforcement/ThingCommandEnforcement.java
@@ -384,15 +384,15 @@ static boolean isLiveQueryCommandWithTimeoutStrategy(final Signal<?> command) {
                 SignalInformationPoint.isChannelLive(command);
     }
 
-    private static <T extends DittoHeadersSettable<T>> T setAdditionalHeaders(final DittoHeadersSettable<T> settable,
+    private static <T extends DittoHeadersSettable<?>> T setAdditionalHeaders(final T settable,
             final DittoHeaders commandHeaders) {
         // TODO: ensure pre-enforcer headers in responses
-        final T dittoHeadersSettable =
-                CommandHeaderRestoration.restoreCommandConnectivityHeaders(settable, commandHeaders);
-        return dittoHeadersSettable.setDittoHeaders(dittoHeadersSettable.getDittoHeaders()
+        final DittoHeaders dittoHeaders = settable.getDittoHeaders();
+        final DittoHeadersSettable<?> theSettable = settable.setDittoHeaders(dittoHeaders
                 .toBuilder()
-                .putHeaders(getAdditionalLiveResponseHeaders(dittoHeadersSettable.getDittoHeaders()))
+                .putHeaders(getAdditionalLiveResponseHeaders(dittoHeaders))
                 .build());
+        return (T) CommandHeaderRestoration.restoreCommandConnectivityHeaders(theSettable, commandHeaders);
     }
 
     private static CompletionStage<ThingQueryCommandResponse<?>> applyTimeoutStrategy(

diff --git a/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java b/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java
@@ -460,7 +460,11 @@ private int dispatchIncomingSignal(final IncomingSignal incomingSignal) {
                                 return ConnectivityErrorResponse.of(dre, originalHeaders);
                             }
                         })
-                        .thenAccept(response -> sender.tell(response, ActorRef.noSender()));
+                        .thenAccept(response -> sender.tell(response, ActorRef.noSender()))
+                        .exceptionally(throwable -> {
+                            logger.warn("Error during dispatching incoming signal <{}>", incomingSignal, throwable);
+                            return null;
+                        });
             } else {
                 proxyActor.tell(signal, sender);
             }

diff --git a/...s/src/main/java/org/eclipse/ditto/internal/models/acks/AcknowledgementForwarderActor.java b/...s/src/main/java/org/eclipse/ditto/internal/models/acks/AcknowledgementForwarderActor.java
@@ -96,11 +96,11 @@ public Receive createReceive() {
                 .build();
     }
 
-    private void forwardCommandResponse(final WithDittoHeaders acknowledgement) {
-        log.withCorrelationId(acknowledgement)
+    private void forwardCommandResponse(final WithDittoHeaders acknowledgementOrResponse) {
+        log.withCorrelationId(acknowledgementOrResponse)
                 .debug("Received Acknowledgement / live CommandResponse, forwarding to original requester <{}>: " +
-                        "<{}>", acknowledgementRequester, acknowledgement);
-        acknowledgementRequester.tell(acknowledgement, getSender());
+                        "<{}>", acknowledgementRequester, acknowledgementOrResponse);
+        acknowledgementRequester.tell(acknowledgementOrResponse, getSender());
     }
 
     private void handleReceiveTimeout(final ReceiveTimeout receiveTimeout) {

diff --git a/...gnal/src/main/java/org/eclipse/ditto/internal/models/signal/CommandHeaderRestoration.java b/...gnal/src/main/java/org/eclipse/ditto/internal/models/signal/CommandHeaderRestoration.java
@@ -35,7 +35,7 @@ private CommandHeaderRestoration() {
      */
     @SuppressWarnings("unchecked")
     public static <T extends DittoHeadersSettable<?>> T restoreCommandConnectivityHeaders(
-            final DittoHeadersSettable<?> signal,
+            final T signal,
             final DittoHeaders headersToRestoreFrom) {
 
         final var signalDittoHeaders = signal.getDittoHeaders();