re-enable enrichment of ThingDeleted events

* to do that, also retrieve "policyId" in ThingEnforcerActor for already "marked as deleted" things using the existing DittoHeader "DITTO_RETRIEVE_DELETED" Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Aug 10, 2022 · 37dd1e5 · 37dd1e5
1 parent ef44705
commit 37dd1e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/...java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -40,8 +40,8 @@
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformers;
 import org.eclipse.ditto.internal.utils.akka.actors.AbstractActorWithStashWithTimers;
-import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.internal.utils.akka.logging.ThreadSafeDittoLoggingAdapter;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.metrics.DittoMetrics;
 import org.eclipse.ditto.internal.utils.metrics.instruments.counter.Counter;
@@ -105,7 +105,7 @@ public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extend
 
     protected static final String PERSISTENCE_ACTOR_NAME = "pa";
 
-    protected final DittoDiagnosticLoggingAdapter log = DittoLoggerFactory.getDiagnosticLoggingAdapter(this);
+    protected final ThreadSafeDittoLoggingAdapter log = DittoLoggerFactory.getThreadSafeDittoLoggingAdapter(this);
 
     private final SupervisorStrategy supervisorStrategy;
 

diff --git a/...ervice/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java b/...ervice/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
@@ -25,6 +25,7 @@
 import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
 import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.namespaces.NamespaceBlockedException;
 import org.eclipse.ditto.base.model.signals.Signal;
@@ -397,6 +398,8 @@ protected CompletionStage<PolicyId> providePolicyIdForEnforcement(final Signal<?
                         JsonFieldSelector.newInstance("policyId"),
                         DittoHeaders.newBuilder()
                                 .correlationId("sudoRetrieveThingFromThingEnforcerActor-" + UUID.randomUUID())
+                                .putHeader(DittoHeaderDefinition.DITTO_RETRIEVE_DELETED.getKey(),
+                                        Boolean.TRUE.toString())
                                 .build()
                 ), DEFAULT_LOCAL_ASK_TIMEOUT
         ).thenApply(response -> extractPolicyIdFromSudoRetrieveThingResponse(response).orElse(null));