Review: rename left over conciergeForwarder references to commandForw…

…arder

Signed-off-by: David Schwilk <david.schwilk@bosch.io>

connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MessageMappingProcessorActorTest.java

@@ -191,7 +191,7 @@ public void testSignalEnrichment() {
     @Test
     public void testSignalEnrichmentWithPayloadMappedTargets() {
         resetActorSystemWithCachingSignalEnrichmentProvider();
-        final TestProbe proxyActorProbe = TestProbe.apply("mockConciergeForwarder", actorSystem);
+        final TestProbe proxyActorProbe = TestProbe.apply("mockEdgeForwarder", actorSystem);
         setUpProxyActor(proxyActorProbe.ref());
 
         new TestKit(actorSystem) {{

connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MockProxyActor.java

@@ -30,7 +30,7 @@ private MockProxyActor(final ActorRef notificationRecipient) {
     }
 
     /**
-     * Create a mock /connectivityRoot/conciergeForwarder actor that forwards everything to the last ActorRef message it
+     * Create a mock /connectivityRoot/edgeCommandForwarder actor that forwards everything to the last ActorRef message it
      * received.
      *
      * @param actorSystem the actor system where the mock concierge forwarder is to be created.

internal/utils/search/src/test/java/org/eclipse/ditto/internal/utils/search/SearchSourceBuilderTest.java

@@ -47,7 +47,7 @@ public void succeedsWithMandatoryFields() {
     }
 
     @Test(expected = NullPointerException.class)
-    public void failWithMissingConciergeForwarder() {
+    public void failWithMissingCommandForwarder() {
         system = ActorSystem.create();
         SearchSource.newBuilder()
                 .dittoHeaders(DittoHeaders.empty())

policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcement.java

@@ -29,13 +29,8 @@
 import org.eclipse.ditto.internal.utils.akka.logging.ThreadSafeDittoLoggingAdapter;
 import org.eclipse.ditto.internal.utils.cacheloaders.EnforcementCacheKey;
 import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
-import org.eclipse.ditto.policies.api.Permission;
-import org.eclipse.ditto.policies.model.ResourceKey;
-import org.eclipse.ditto.policies.model.enforcers.Enforcer;
-import org.eclipse.ditto.things.model.ThingConstants;
 
 import akka.actor.ActorRef;
-import akka.pattern.AskTimeoutException;
 
 /**
  * Contains self-type requirements for aspects of enforcer actor dealing with specific commands.
@@ -164,37 +159,6 @@ protected DittoInternalErrorException reportUnknownResponse(final String hint, f
         return DittoInternalErrorException.newBuilder().dittoHeaders(dittoHeaders()).build();
     }
 
-    /**
-     * Extend a signal by subject headers given with granted and revoked READ access.
-     * The subjects are provided by the given enforcer for the resource type {@link ThingConstants#ENTITY_TYPE}.
-     *
-     * @param signal the signal to extend.
-     * @param enforcer the enforcer.
-     * @return the extended signal.
-     */
-    protected static <T extends Signal<T>> T addEffectedReadSubjectsToThingSignal(final Signal<T> signal,
-            final Enforcer enforcer) {
-
-        final var resourceKey = ResourceKey.newInstance(ThingConstants.ENTITY_TYPE, signal.getResourcePath());
-        final var authorizationSubjects = enforcer.getSubjectsWithUnrestrictedPermission(resourceKey, Permission.READ);
-        final var newHeaders = DittoHeaders.newBuilder(signal.getDittoHeaders())
-                .readGrantedSubjects(authorizationSubjects)
-                .build();
-
-        return signal.setDittoHeaders(newHeaders);
-    }
-
-    /**
-     * Check whether response or error from a future is {@code AskTimeoutException}.
-     *
-     * @param response response from a future.
-     * @param error error thrown in a future.
-     * @return whether either is {@code AskTimeoutException}.
-     */
-    protected static boolean isAskTimeoutException(final Object response, @Nullable final Throwable error) {
-        return error instanceof AskTimeoutException || response instanceof AskTimeoutException;
-    }
-
     /**
      * @return the configuration of "ask with retry" pattern during enforcement.
      */
@@ -321,11 +285,4 @@ protected DittoHeaders dittoHeaders() {
         return signal().getDittoHeaders();
     }
 
-    /**
-     * @return the {@code ConciergeForwarderActor} reference
-     */
-    protected ActorRef commandForwarder() {
-        return context.getCommandForwarder();
-    }
-
 }

policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/Contextual.java

@@ -90,7 +90,7 @@ private Contextual(@Nullable final T message,
     static <T extends WithDittoHeaders> Contextual<T> forActor(final ActorRef self,
             final ActorSystem actorSystem,
             final ActorRef pubSubMediator,
-            final ActorRef conciergeForwarder,
+            final ActorRef commandForwarder,
             final AskWithRetryConfig askWithRetryConfig,
             final ThreadSafeDittoLoggingAdapter log) {
 
@@ -100,7 +100,7 @@ static <T extends WithDittoHeaders> Contextual<T> forActor(final ActorRef self,
                 actorSystem.getScheduler(),
                 actorSystem.dispatchers().lookup(POLICY_ENFORCER_CACHE_DISPATCHER),
                 pubSubMediator,
-                conciergeForwarder,
+                commandForwarder,
                 askWithRetryConfig,
                 log,
                 null,

policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/placeholders/references/PolicyIdReferencePlaceholderResolver.java

@@ -168,7 +168,7 @@ private PlaceholderReferenceNotSupportedException notSupportedException(
      * Creates a new {@link PolicyIdReferencePlaceholderResolver} responsible for resolving a policy id of a referenced
      * entity.
      *
-     * @param commandForwarderActor the ActorRef of the {@code ConciergeForwarderActor} which to ask for "retrieve"
+     * @param commandForwarderActor the ActorRef of the {@code EdgeCommandForwarderActor} which to ask for "retrieve"
      * commands.
      * @param askWithRetryConfig the configuration for the "ask with retry" pattern applied when asking for retrieves.
      * @param actorSystem the actorSystem to load scheduler and dispatcher to use for the "ask with retry" pattern from.

policies/enforcement/src/test/java/org/eclipse/ditto/policies/enforcement/EnforcementSchedulerTest.java

@@ -61,7 +61,7 @@ public void setup() {
     public void testOrdering() {
         final var testKit = ACTOR_SYSTEM_RESOURCE.newTestKit();
         final var pubSubProbe = ACTOR_SYSTEM_RESOURCE.newTestProbe();
-        final var conciergeForwarderProbe = ACTOR_SYSTEM_RESOURCE.newTestProbe();
+        final var commandForwarderProbe = ACTOR_SYSTEM_RESOURCE.newTestProbe();
         final var receiver = ACTOR_SYSTEM_RESOURCE.newTestKit();
         final var mockLogger = mock(ThreadSafeDittoLoggingAdapter.class);
         doAnswer(invocation -> mockLogger).when(mockLogger).withCorrelationId(any(DittoHeaders.class));
@@ -70,7 +70,7 @@ public void testOrdering() {
         final Contextual<WithDittoHeaders> baseContextual = Contextual.forActor(testKit.getRef(),
                 ACTOR_SYSTEM_RESOURCE.getActorSystem(),
                 pubSubProbe.ref(),
-                conciergeForwarderProbe.ref(),
+                commandForwarderProbe.ref(),
                 DefaultAskWithRetryConfig.of(ConfigFactory.empty(), "test"),
                 mockLogger);
         final var thingId = ThingId.of("busy", "thing");