dispatch signals to concierge without relying on type distinction

Signals are now delegated to an enforcer if it has a nonempty ID and to the dispatcher if it has an empty ID. Signed-off-by: Cai Yufei (INST/ECS1) <yufei.cai@bosch-si.com>
eclipse-ditto · Apr 13, 2018 · 30243ce · 30243ce
1 parent 4dddde1
commit 30243ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...oncierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeEnvelope.java b/...oncierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeEnvelope.java
@@ -44,7 +44,7 @@ public ConciergeEnvelope(final ActorRef pubSubMediator, final ActorRef enforcerS
     }
 
     public void dispatch(final Signal<?> signal, final ActorRef sender) {
-        if (signal instanceof ThingSearchCommand || signal instanceof RetrieveThings) {
+        if (signal.getId().isEmpty()) {
             pubSubMediator.tell(wrapForPubSub(signal), sender);
         } else {
             enforcerShardRegion.tell(wrapForEnforcer(signal), sender);

diff --git a/.../things/src/main/java/org/eclipse/ditto/signals/commands/things/query/RetrieveThings.java b/.../things/src/main/java/org/eclipse/ditto/signals/commands/things/query/RetrieveThings.java
@@ -216,7 +216,7 @@ public Optional<JsonFieldSelector> getSelectedFields() {
 
     @Override
     public String getThingId() {
-        return ":_";
+        return "";
     }
 
     @Override