Skip to content

Fix for #783 #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for #783 #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800a639
Fix for #783? Unit test needed.
May 18, 2017
36ad1d3
Allow referenced fields to be set to null and only null
Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions crud/src/main/java/com/redhat/lightblue/eval/SetExpressionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.redhat.lightblue.crud.CrudConstants;
import com.redhat.lightblue.metadata.ArrayField;
import com.redhat.lightblue.metadata.FieldTreeNode;
import com.redhat.lightblue.metadata.ObjectArrayElement;
import com.redhat.lightblue.metadata.ObjectField;
import com.redhat.lightblue.metadata.ReferenceField;
import com.redhat.lightblue.metadata.SimpleArrayElement;
import com.redhat.lightblue.metadata.SimpleField;
import com.redhat.lightblue.metadata.Type;
Expand Down Expand Up @@ -134,12 +135,23 @@ public SetExpressionEvaluator(JsonNodeFactory factory, FieldTreeNode context, Se

if (mdNode instanceof SimpleField || mdNode instanceof SimpleArrayElement) {
data = initializeSimple(rvalue, refMdNode, mdNode, field, refPath);
setValues.add(data);
} else if (mdNode instanceof ReferenceField) {
if (rvalue.getValue() != null) {
throw new EvaluationError(CrudConstants.ERR_ASSIGNMENT + field +" can't assign values to referenced fields");
} else {
// ignore if null
}
} else if (mdNode instanceof ObjectField || mdNode instanceof ObjectArrayElement) {
data = initializeObject(rvalue, refMdNode, mdNode, field, refPath);
setValues.add(data);
} else if (mdNode instanceof ArrayField) {
data = initializeArray(rvalue, refMdNode, mdNode, field, refPath);
setValues.add(data);
} else {
throw new EvaluationError(CrudConstants.ERR_ASSIGNMENT + field + " field type "+mdNode.getClass()+" is not recognized!");
}
setValues.add(data);

}
}

Expand Down
16 changes: 16 additions & 0 deletions crud/src/test/java/com/redhat/lightblue/eval/SetExpressionEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,20 @@ public void assign_arr_to_field() throws Exception {
Assert.assertEquals("[1,2]", jsonDoc.get(new Path("field6.nf10")).toString());

}

@Test
public void setting_reference_to_null_is_ignored() throws Exception {
UpdateExpression expr = EvalTestContext.updateExpressionFromJson("{'$set': {'ref': null } }");
Updater updater = Updater.getInstance(JSON_NODE_FACTORY, md, expr);
Assert.assertFalse(updater.update(jsonDoc, md.getFieldTreeRoot(), new Path()));

}

@Test(expected=EvaluationError.class)
public void setting_reference_to_non_null_throws_exception() throws Exception {
UpdateExpression expr = EvalTestContext.updateExpressionFromJson("{'$set': {'ref': 'foo' } }");
Updater updater = Updater.getInstance(JSON_NODE_FACTORY, md, expr);
Assert.assertFalse(updater.update(jsonDoc, md.getFieldTreeRoot(), new Path()));

}
}
5 changes: 5 additions & 0 deletions crud/src/test/resources/testMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@
}
}
}
},
"ref" : {
"type":"reference",
"entity":"referenced_entity",
"query": { "field":"field1","op":"=","rfield":"$parent.field1"}
}
}
}
Expand Down