output more info for assemble

Author: Burak Serdar

crud/src/main/java/com/redhat/lightblue/assoc/ep/Assemble.java

@@ -198,8 +198,13 @@ public JsonNode toJson() {
         ArrayNode array = JsonNodeFactory.instance.arrayNode();
         a.set("right", array);
         for (ExecutionBlock b : destinationBlocks) {
-            array.add(b.toJson());
+            ObjectNode detail=JsonNodeFactory.instance.objectNode();
+            AssociationQuery aq = b.getAssociationQueryForEdge(block);
+            detail.set("associationQuery",aq.getQuery().toJson());
+            detail.set("source",b.toJson());
+            array.add(detail);
         }
         return o;
     }
+
 }

crud/src/test/java/com/redhat/lightblue/assoc/ep/ExecutionPlanTest.java

@@ -108,7 +108,7 @@ public void retrieveAandBonly() throws Exception {
         Assert.assertNotNull(left1.get("search"));
 
         JsonNode right1 = assemble1.get("right");
-        JsonNode assemble2 = right1.get(0).get("assemble");
+        JsonNode assemble2 = right1.get(0).get("source").get("assemble");
         Assert.assertEquals("B", assemble2.get("entity").asText());
     }
 
@@ -143,8 +143,8 @@ public void retrieveABC() throws Exception {
         Assert.assertNotNull(left1.get("copy"));
         JsonNode right1 = assemble1.get("right");
         Assert.assertEquals(2, right1.size());
-        JsonNode assemble2 = right1.get(0).get("assemble");
-        JsonNode assemble3 = right1.get(1).get("assemble");
+        JsonNode assemble2 = right1.get(0).get("source").get("assemble");
+        JsonNode assemble3 = right1.get(1).get("source").get("assemble");
         Assert.assertTrue(assemble2.get("entity").asText().equals("C") || assemble3.get("entity").asText().equals("C"));
         Assert.assertTrue(assemble2.get("entity").asText().equals("B") || assemble3.get("entity").asText().equals("B"));
     }
@@ -191,7 +191,7 @@ public void retrieveAandConly_CFirst() throws Exception {
 
         JsonNode right1 = assemble1.get("right");
         Assert.assertEquals(1, right1.size());
-        Assert.assertEquals("C", right1.get(0).get("assemble").get("entity").asText());
+        Assert.assertEquals("C", right1.get(0).get("source").get("assemble").get("entity").asText());
     }
 
     @Test