Fix #631: arrayElement.this should resolve to the array element, and thus should allow removing it in update

Author: Burak Serdar

crud/src/test/java/com/redhat/lightblue/eval/UpdaterTest.java

@@ -192,6 +192,17 @@ public void array_foreach_removeone() throws Exception {
         Assert.assertEquals(3, jsonDoc.get(new Path("field7")).size());
     }
 
+    @Test
+    public void array_foreach_removethis() throws Exception {
+        UpdateExpression expr = EvalTestContext.updateExpressionFromJson("{ '$foreach' : { 'field6.nf5' : { 'field':'$this','op':'=','rvalue':10} , '$update' : '$remove' } }");
+        Updater updater = Updater.getInstance(JSON_NODE_FACTORY, md, expr);
+        Assert.assertEquals(4, jsonDoc.get(new Path("field6.nf5")).size());
+        Assert.assertEquals(10, jsonDoc.get(new Path("field6.nf5.1")).asInt());
+        updater.update(jsonDoc, md.getFieldTreeRoot(), new Path());
+        Assert.assertEquals(3, jsonDoc.get(new Path("field6.nf5")).size());
+        Assert.assertEquals(15, jsonDoc.get(new Path("field6.nf5.1")).asInt());
+    }
+
     @Test
     public void array_foreach_modone() throws Exception {
         UpdateExpression expr = EvalTestContext.updateExpressionFromJson("{ '$foreach' : { 'field7' : { 'field':'elemf1','op':'=','rvalue':'elvalue0_1'} , '$update' : {'$set': { 'elemf1':'test'}} } }");

metadata/src/main/java/com/redhat/lightblue/metadata/SimpleArrayElement.java

@@ -69,6 +69,8 @@ public FieldTreeNode resolve(Path p, int level) {
             return this;
         } else if (p.head(level).equals(Path.PARENT)) {
             return this.getParent().getParent().resolve(p, level + 1);
+        } else if (p.head(level).equals(Path.THIS)) {
+            return this.resolve(p,level+1);
         } else {
             throw Error.get(MetadataConstants.ERR_INVALID_ARRAY_REFERENCE);
         }

metadata/src/main/java/com/redhat/lightblue/metadata/SimpleField.java

@@ -69,6 +69,8 @@ public FieldTreeNode resolve(Path p, int level) {
             return this;
         } else if (Path.PARENT.equals(p.head(level))) {
             return this.getParent().resolve(p, level + 1);
+        } if (p.head(level).equals(Path.THIS)) {
+            return this.resolve(p,level+1);
         } else {
             throw Error.get(MetadataConstants.ERR_INVALID_FIELD_REFERENCE, p.head(level) + " in " + p.toString());
         }