Print more info, fix resultset return

Author: Burak Serdar

crud/src/main/java/com/redhat/lightblue/mediator/Mediator.java

@@ -527,13 +527,21 @@ public Response explain(FindRequest req) {
             finder.explain(ctx, req.getCRUDFindRequest());
 
             List<JsonDoc> foundDocuments = ctx.getOutputDocumentsWithoutErrors();
-            if (foundDocuments != null && foundDocuments.size() == ctx.getDocuments().size()) {
+            if (foundDocuments != null && !foundDocuments.isEmpty()) {
                 ctx.setStatus(OperationStatus.COMPLETE);
-            } else if (foundDocuments != null && !foundDocuments.isEmpty()) {
-                ctx.setStatus(OperationStatus.PARTIAL);
+                List<DocCtx> documents = ctx.getDocuments();
+                response.setMatchCount(documents.size());
+                if (documents != null) {
+                    List<JsonDoc> resultList = new ArrayList<>(documents.size());
+                    for (DocCtx doc : documents) {
+                        resultList.add(doc.getOutputDocument());
+                    }
+                    response.setEntityData(JsonDoc.listToDoc(resultList, factory.getNodeFactory()));
+                }
             } else {
                 ctx.setStatus(OperationStatus.ERROR);
-            }            
+            }
+            
             response.setStatus(ctx.getStatus());
             response.getErrors().addAll(ctx.getErrors());
             response.getDataErrors().addAll(ctx.getDataErrors());

crud/src/main/java/com/redhat/lightblue/mediator/SimpleFindImpl.java

@@ -22,6 +22,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+
 import com.redhat.lightblue.OperationStatus;
 
 import com.redhat.lightblue.crud.CRUDController;
@@ -33,6 +35,7 @@
 import com.redhat.lightblue.metadata.EntityMetadata;
 
 import com.redhat.lightblue.util.JsonDoc;
+import com.redhat.lightblue.util.Path;
 
 public class SimpleFindImpl implements Finder {
 
@@ -65,13 +68,24 @@ public void explain(OperationContext ctx,
                         CRUDFindRequest req) {
         if(controller instanceof ExplainQuerySupport) {
             JsonDoc doc=new JsonDoc(ctx.getFactory().getNodeFactory().objectNode());
+            if(req.getQuery()!=null)
+                doc.modify(new Path("request.query"),req.getQuery().toJson(),true);
+            if(req.getProjection()!=null) 
+                doc.modify(new Path("request.projection"),req.getProjection().toJson(),true);
+            if(req.getSort()!=null)
+                doc.modify(new Path("request.sort"),req.getSort().toJson(),true);
+            if(req.getFrom()!=null)
+                doc.modify(new Path("request.from"),JsonNodeFactory.instance.numberNode(req.getFrom()),true);
+            if(req.getTo()!=null)
+                doc.modify(new Path("request.to"),JsonNodeFactory.instance.numberNode(req.getTo()),true);
             ((ExplainQuerySupport)controller).explain(ctx,
                                                       req.getQuery(),
                                                       req.getProjection(),
                                                       req.getSort(),
                                                       req.getFrom(),
                                                       req.getTo(),
                                                       doc);
+            LOGGER.debug("Adding explain doc:{}",doc);
             ctx.addDocument(doc);
         }
     }