renamed ConciergeForwarderActor to EdgeCommandForwarderActor

* removed DispatcherActor.java * prepared EdgeCommandForwarderActor also to handle ThingSearchCommands * Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · May 19, 2022 · 22a5355 · 22a5355
1 parent 6c32831
commit 22a5355
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 405 deletions.
diff --git a/...y/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java b/...y/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java
@@ -27,7 +27,7 @@
 import org.eclipse.ditto.connectivity.service.messaging.persistence.ConnectionPersistenceOperationsActor;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.ConnectionPersistenceStreamingActorCreator;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.ConnectionSupervisorActor;
-import org.eclipse.ditto.edge.api.dispatching.ConciergeForwarderActor;
+import org.eclipse.ditto.edge.api.dispatching.EdgeCommandForwarderActor;
 import org.eclipse.ditto.edge.api.dispatching.ShardRegions;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.cluster.ClusterUtil;
@@ -178,8 +178,8 @@ private ActorRef getHealthCheckingActor(final ConnectivityConfig connectivityCon
 
     private ActorRef getCommandForwarder(final ClusterConfig clusterConfig, final ActorRef pubSubMediator) {
 
-        return startChildActor(ConciergeForwarderActor.ACTOR_NAME,
-                ConciergeForwarderActor.props(pubSubMediator,
+        return startChildActor(EdgeCommandForwarderActor.ACTOR_NAME,
+                EdgeCommandForwarderActor.props(pubSubMediator,
                         ShardRegions.of(getContext().getSystem(), clusterConfig)));
     }
 

diff --git a/edge/api/pom.xml b/edge/api/pom.xml
@@ -56,14 +56,14 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-connectivity-model</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-things-api</artifactId>
+            <artifactId>ditto-thingsearch-model</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-thingsearch-api</artifactId> <!-- required for DispatcherActor - TODO CR-11297 check if this is wanted here -->
+            <artifactId>ditto-thingsearch-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/edge/api/src/main/java/org/eclipse/ditto/edge/api/dispatching/DispatcherActor.java b/edge/api/src/main/java/org/eclipse/ditto/edge/api/dispatching/DispatcherActor.java