Merge pull request #2136 from beyonnex-io/fix-thingDefinitionMigration-dryRun-valitation-issue

fix MigrateThingDefinition wot validation issue

Author: thjaeckle

internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java

@@ -817,7 +817,7 @@ public void onStagedQuery(final Command<?> command, final CompletionStage<WithDi
         if (command.getDittoHeaders().isResponseRequired()) {
             final ActorRef sender = getSender();
             response.whenComplete((r, throwable) -> {
-                if (throwable instanceof DittoRuntimeException dittoRuntimeException) {
+                if (unwrapThrowable(throwable) instanceof DittoRuntimeException dittoRuntimeException) {
                     notifySender(sender, dittoRuntimeException);
                 } else {
                     notifySender(sender, r);
@@ -840,6 +840,21 @@ public void onError(final DittoRuntimeException error, final Command<?> errorCau
         }
     }
 
+    /**
+     * Unwraps the root cause of the given {@link Throwable} if it is wrapped inside a {@link CompletionException}.
+     *
+     * @param throwable The throwable to unwrap.
+     * @return The unwrapped cause if the throwable is a {@link CompletionException} and has a cause,
+     *         otherwise returns the original throwable.
+     */
+    protected static Throwable unwrapThrowable(final Throwable throwable) {
+        if (throwable != null && throwable instanceof CompletionException) {
+            return throwable.getCause() != null ? throwable.getCause() : throwable;
+        }
+        return throwable;
+    }
+
+
     /**
      * Send a reply and increment access counter.
      *

things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java

@@ -24,6 +24,7 @@
 import org.apache.pekko.japi.pf.ReceiveBuilder;
 import org.apache.pekko.persistence.RecoveryCompleted;
 import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.LiveChannelTimeoutStrategy;
@@ -151,14 +152,19 @@ public void onQuery(final Command<?> command, final WithDittoHeaders response) {
     public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response,
             @Nullable final StartedSpan startedSpan) {
         final ActorRef sender = getSender();
-        response.thenAccept(r -> {
-            doOnQuery(command, r, sender);
+        response.whenComplete((r, throwable) -> {
+            if (unwrapThrowable(throwable) instanceof DittoRuntimeException dittoRuntimeException) {
+                notifySender(sender, dittoRuntimeException);
+            } else {
+                doOnQuery(command, r, sender);
+            }
             if (startedSpan != null) {
                 startedSpan.finish();
             }
         });
     }
 
+
     private void doOnQuery(final Command<?> command, final WithDittoHeaders response, final ActorRef sender) {
         if (response.getDittoHeaders().didLiveChannelConditionMatch()) {
             final var liveChannelTimeoutStrategy = response.getDittoHeaders()