Merge pull request #677 from bserdar/671

671

Author: dcrissman

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

@@ -44,7 +44,11 @@ public StepResult<ResultDocument> getResults(ExecutionContext ctx) {
             public Stream<ResultDocument> stream() {
                 // Create new documents for each document in the source. This will
                 // create the correct slots based on this execution block
-                return super.stream().map(d -> new ResultDocument(block, d.getDoc()));
+                return super.stream().map(d -> {
+                        if(recordResultSetSize)
+                            ctx.incMatchCount();
+                        return new ResultDocument(block, d.getDoc());
+                    });
             }
         };
     }

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

@@ -55,6 +55,10 @@ public void setMatchCount(int c) {
         matchCount = c;
     }
 
+    public void incMatchCount() {
+        matchCount++;
+    }
+
     public void close() {
         executor.shutdown();
     }

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

@@ -592,6 +592,16 @@ public void rev_search_with_arraycond() throws Exception {
         Assert.assertEquals(2, response.getEntityData().get(0).get("us").size());
     }
 
+   @Test
+    public void rev_search_with_arraycond_matchcount() throws Exception {
+        FindRequest fr = new FindRequest();
+        fr.setQuery(query("{'array':'us.*.authentications','elemMatch':{ '$and':[ { 'field':'principal','op':'$in','values':['a']}, {'field':'providerName','op':'$eq','rvalue':'p'} ] } }"));
+        fr.setProjection(projection("[{'field':'*','recursive':1},{'field':'us','recursive':1}]"));
+        fr.setEntityVersion(new EntityVersion("L", "0.0.1"));
+        Response response = mediator.find(fr);
+        Assert.assertEquals(1, response.getMatchCount());
+    }
+    
     @Test
     public void elem_match_forward() throws Exception {
         FindRequest fr = new FindRequest();