fixed Search response which was in wrong format after modifications

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Aug 29, 2018 · 1f1d545 · 1f1d545
1 parent 3b6339b
commit 1f1d545
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/...rc/main/java/org/eclipse/ditto/services/gateway/proxy/actors/AbstractThingProxyActor.java b/...rc/main/java/org/eclipse/ditto/services/gateway/proxy/actors/AbstractThingProxyActor.java
@@ -16,14 +16,17 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.eclipse.ditto.json.JsonCollectors;
 import org.eclipse.ditto.model.things.Thing;
+import org.eclipse.ditto.model.thingsearch.SearchResult;
 import org.eclipse.ditto.services.models.things.commands.sudo.SudoRetrieveThings;
 import org.eclipse.ditto.services.utils.aggregator.ThingsAggregatorProxyActor;
 import org.eclipse.ditto.services.utils.akka.LogUtil;
 import org.eclipse.ditto.signals.base.Signal;
 import org.eclipse.ditto.signals.commands.base.Command;
 import org.eclipse.ditto.signals.commands.devops.DevOpsCommand;
 import org.eclipse.ditto.signals.commands.things.query.RetrieveThings;
+import org.eclipse.ditto.signals.commands.things.query.RetrieveThingsResponse;
 import org.eclipse.ditto.signals.commands.thingsearch.query.QueryThings;
 import org.eclipse.ditto.signals.commands.thingsearch.query.QueryThingsResponse;
 
@@ -76,16 +79,36 @@ protected void addCommandBehaviour(final ReceiveBuilder receiveBuilder) {
                 })
                 .match(QueryThingsResponse.class, qtr -> {
                     final QueryThingsHolder queryThingsHolder =
-                            queryThingsRequests.remove(qtr.getDittoHeaders().getCorrelationId().orElse(""));
+                            queryThingsRequests.get(qtr.getDittoHeaders().getCorrelationId().orElse(""));
+
+                    queryThingsHolder.queryThingsResponse = qtr;
 
                     final List<String> thingIds = qtr.getSearchResult().stream()
                             .map(val -> val.asObject().getValue(Thing.JsonFields.ID).orElse(null))
                             .collect(Collectors.toList());
-                    final RetrieveThings retrieveThings = RetrieveThings.getBuilder(thingIds)
-                            .dittoHeaders(qtr.getDittoHeaders())
-                            .selectedFields(queryThingsHolder.queryThings.getFields())
-                            .build();
-                    aggregatorProxy.tell(retrieveThings, queryThingsHolder.originatingSender);
+
+                    if (thingIds.isEmpty()) {
+                        queryThingsHolder.originatingSender.tell(qtr, getSelf());
+                    } else {
+                        final RetrieveThings retrieveThings = RetrieveThings.getBuilder(thingIds)
+                                .dittoHeaders(qtr.getDittoHeaders())
+                                .selectedFields(queryThingsHolder.queryThings.getFields())
+                                .build();
+                        aggregatorProxy.tell(retrieveThings, getSelf());
+                    }
+                })
+                .match(RetrieveThingsResponse.class, rtr -> {
+                    final QueryThingsHolder queryThingsHolder =
+                            queryThingsRequests.remove(rtr.getDittoHeaders().getCorrelationId().orElse(""));
+
+                    final QueryThingsResponse queryThingsResponse = QueryThingsResponse.of(SearchResult.newBuilder()
+                                    .addAll(rtr.getThings().stream().map(Thing::toJson).collect(JsonCollectors.valuesToArray()))
+                                    .nextPageOffset(queryThingsHolder.queryThingsResponse.getSearchResult().getNextPageOffset())
+                                    .build(),
+                            rtr.getDittoHeaders()
+                    );
+
+                    queryThingsHolder.originatingSender.tell(queryThingsResponse, getSelf());
                 })
 
                 /* send all other Commands to Concierge Service */
@@ -112,6 +135,7 @@ private void forwardToConciergeService(final Signal<?> signal) {
     private static final class QueryThingsHolder {
         private final QueryThings queryThings;
         private final ActorRef originatingSender;
+        private QueryThingsResponse queryThingsResponse;
 
         private QueryThingsHolder(final QueryThings queryThings, final ActorRef originatingSender) {
             this.queryThings = queryThings;