Merge pull request #653 from bserdar/simple-array-element-projection

Make sure simple array elements are included in projections

Author: dcrissman

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

@@ -43,6 +43,7 @@
 import com.redhat.lightblue.metadata.ArrayField;
 import com.redhat.lightblue.metadata.ArrayElement;
 import com.redhat.lightblue.metadata.ObjectArrayElement;
+import com.redhat.lightblue.metadata.SimpleArrayElement;
 import com.redhat.lightblue.metadata.ReferenceField;
 import com.redhat.lightblue.metadata.FieldTreeNode;
 import com.redhat.lightblue.metadata.FieldCursor;
@@ -404,6 +405,8 @@ public static Set<Path> getIncludedFieldsOfEntityForProjection(ExecutionBlock bl
                         || (node instanceof ArrayField && ((ArrayField) node).getElement() instanceof ObjectArrayElement)
                         || (node instanceof ArrayElement)) {
                     // include its member fields
+                } else if(node instanceof ArrayField && ((ArrayField) node).getElement() instanceof SimpleArrayElement) {
+                    fields.add(new Path(localField,Path.ANYPATH));
                 } else {
                     if (localProjection != null && localProjection.isFieldRequiredToEvaluateProjection(localField)) {
                         LOGGER.debug("{}: required", localField);

crud/src/test/java/com/redhat/lightblue/mediator/CompositeFinderTest.java

@@ -534,6 +534,19 @@ public void elemMatchTopLevelArr() throws Exception {
         Assert.assertEquals("l1", JsonDoc.get(response.getEntityData().get(0), new Path("legalEntities.0.legalEntity.0.name")).asText());
     }
 
+    @Test
+    public void projectSimpleArrayElements() throws Exception {
+        FindRequest fr = new FindRequest();
+        fr.setQuery(query("{'field':'_id','op':'=','rvalue':'1'}"));
+        fr.setProjection(projection("[{'field':'*','recursive':1},{'field':'legalEntities.*.legalEntity' }]"));
+        fr.setEntityVersion(new EntityVersion("U", "0.0.1"));
+
+        Response response = mediator.find(fr);
+        Assert.assertEquals(1, response.getEntityData().size());
+        Assert.assertEquals("l1", JsonDoc.get(response.getEntityData().get(0), new Path("legalEntities.0.legalEntity.0.name")).asText());
+        Assert.assertEquals("arr0", JsonDoc.get(response.getEntityData().get(0), new Path("legalEntities.0.legalEntity.0.arr.0")).asText());
+    }
+
     @Test
     public void updateWithAssocq() throws Exception {
         UpdateRequest urq = new UpdateRequest();

crud/src/test/resources/composite/L.json

@@ -50,6 +50,12 @@
             "name": {
                 "type": "string"
             },
+            "arr": {
+                "type":"array",
+                "items": {
+                    "type":"string"
+                }
+            },
             "us": {
                 "type":"reference",
                 "entity":"U",

crud/src/test/resources/composite/L_data.json

@@ -1,3 +1,3 @@
-[ { "_id":1, "status":"active","name":"l1","objectType":"L"},
+[ { "_id":1, "status":"active","name":"l1","objectType":"L","arr":["arr0","arr1"]},
   { "_id":2, "status":"active","name":"l2","objectType":"L"} ]