Move warning log into fallback of ditto runtime exception extraction

* This will log the warning if neither the exception nor its cause was a ditto runtime exception Signed-off-by: Yannic Klem <Yannic.Klem@bosch.io>
eclipse-ditto · May 16, 2022 · 00e0364 · 00e0364
1 parent 62cbbd9
commit 00e0364
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/...java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/...java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -277,7 +277,8 @@ protected CompletionStage<Object> askTargetActor(final Object message) {
                         targetWithMessage.message(),
                         targetWithMessage.messageTimeout()
                 ).exceptionally(throwable -> {
-                    if (throwable instanceof AskTimeoutException askTimeoutException && targetWithMessage.internalErrorOnMessageTimeout()) {
+                    if (throwable instanceof AskTimeoutException askTimeoutException &&
+                            targetWithMessage.internalErrorOnMessageTimeout()) {
                         throw DittoRuntimeException.asDittoRuntimeException(askTimeoutException, cause ->
                                 DittoInternalErrorException.newBuilder()
                                         .cause(cause)
@@ -461,18 +462,16 @@ private void enforceAndForwardToTargetActor(final Object message) {
                 enforceSignalAndForwardToTargetActor((S) signal)
                         .whenComplete((response, throwable) -> {
                             if (null != throwable) {
-                                if (!(throwable instanceof DittoRuntimeException)) {
-                                    log.withCorrelationId(signal)
-                                            .warning("Encountered Throwable when interacting with enforcer or " +
-                                                    "target actor, telling sender: {}", throwable);
-                                }
-
                                 final DittoRuntimeException dre =
-                                        DittoRuntimeException.asDittoRuntimeException(throwable, t ->
-                                                DittoInternalErrorException.newBuilder()
-                                                        .dittoHeaders(signal.getDittoHeaders())
-                                                        .cause(t)
-                                                        .build());
+                                        DittoRuntimeException.asDittoRuntimeException(throwable, t -> {
+                                            log.withCorrelationId(signal)
+                                                    .warning("Encountered Throwable when interacting with enforcer " +
+                                                            "or target actor, telling sender: {}", throwable);
+                                            return DittoInternalErrorException.newBuilder()
+                                                    .dittoHeaders(signal.getDittoHeaders())
+                                                    .cause(t)
+                                                    .build();
+                                        });
                                 log.withCorrelationId(dre)
                                         .info("Received DittoRuntimeException during enforcement or " +
                                                 "forwarding to target actor, telling sender: {}", dre);
@@ -629,11 +628,11 @@ public enum Control {
     }
 
     public record DistributedPubWithMessage(DistributedPub<?> pub,
-                                               Object wrappedSignalForPublication,
-                                               Signal<?> signal) {}
+                                            Object wrappedSignalForPublication,
+                                            Signal<?> signal) {}
 
     public record TargetActorWithMessage(ActorRef targetActor,
-                                            Object message,
+                                         Object message,
                                          Duration messageTimeout,
                                          boolean internalErrorOnMessageTimeout) {}