Merge pull request #774 from bserdar/enum-validator-unit-test

dcrissman · web-flow · commit 86f03fe66ba9 · 2017-03-24T17:48:48.000-04:00
Fix #775 - simple array constraints
diff --git a/crud/src/main/java/com/redhat/lightblue/crud/ConstraintValidator.java b/crud/src/main/java/com/redhat/lightblue/crud/ConstraintValidator.java
@@ -231,7 +231,7 @@ private void checkConstraints(JsonDoc doc, Path currentValuePath, JsonNode curre
                     skip=currentFieldNode.getFullPath();
             } 
             if(skip==null) {
-                LOGGER.debug("checking field {}", currentFieldPath);
+                LOGGER.debug("checking field {} for {} - {}", currentFieldPath,currentFieldNode);
                 Error.push(currentFieldPath.toString());
                 try {
                     List<FieldConstraint> constraints = null;
@@ -240,6 +240,7 @@ private void checkConstraints(JsonDoc doc, Path currentValuePath, JsonNode curre
                     } else if (currentFieldNode instanceof SimpleArrayElement) {
                         constraints = ((SimpleArrayElement) currentFieldNode).getConstraints();
                     }
+                    LOGGER.debug("Constraints:{}",constraints);
                     if (constraints != null && !constraints.isEmpty()) {
                         checkFieldConstraints(doc, constraints, currentValuePath, currentValue);
                     }
diff --git a/crud/src/test/java/com/redhat/lightblue/crud/ConstraintValidatorTest.java b/crud/src/test/java/com/redhat/lightblue/crud/ConstraintValidatorTest.java
@@ -36,21 +36,15 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.redhat.lightblue.TestDataStoreParser;
-import com.redhat.lightblue.crud.validator.DefaultFieldConstraintValidators;
-import com.redhat.lightblue.crud.validator.EmptyEntityConstraintValidators;
-import com.redhat.lightblue.crud.validator.StringLengthChecker;
+import com.redhat.lightblue.crud.validator.*;
 import com.redhat.lightblue.metadata.EntityConstraint;
 import com.redhat.lightblue.metadata.CompositeMetadata;
 import com.redhat.lightblue.metadata.EntityMetadata;
 import com.redhat.lightblue.metadata.FieldConstraint;
 import com.redhat.lightblue.metadata.SimpleArrayElement;
 import com.redhat.lightblue.metadata.constraints.*;
 import com.redhat.lightblue.metadata.Type;
-import com.redhat.lightblue.metadata.parser.Extensions;
-import com.redhat.lightblue.metadata.parser.FieldConstraintParser;
-import com.redhat.lightblue.metadata.parser.StringLengthConstraintParser;
-import com.redhat.lightblue.metadata.parser.JSONMetadataParser;
-import com.redhat.lightblue.metadata.parser.MetadataParser;
+import com.redhat.lightblue.metadata.parser.*;
 import com.redhat.lightblue.metadata.types.DefaultTypes;
 import com.redhat.lightblue.util.DefaultRegistry;
 import com.redhat.lightblue.util.Error;
@@ -271,6 +265,27 @@ public void testSimpleArrayConstraint() throws IOException {
         Assert.assertTrue(validator.hasErrors());
     }
 
+    @Test
+    public void testSimpleArrayEnum() throws IOException {
+        JsonNode node = loadJsonNode("crud/validator/testSimpleArrayEnum.json");
+        Map<String, FieldConstraintParser<JsonNode>> fcp = new HashMap<>();
+        fcp.put(EnumConstraint.ENUM, new EnumConstraintParser<JsonNode>());
+        EntityMetadata md = createEntityMetadata(node, null, fcp);
+
+        Assert.assertEquals(1, ((SimpleArrayElement) md.resolve(new Path("array1.*"))).getConstraints().size());
+
+        Map<String, FieldConstraintChecker> fcc = new HashMap<>();
+        fcc.put(EnumConstraint.ENUM, new EnumChecker());
+        ConstraintValidator validator = createConstraintValidator(md, fcc, null);
+
+        JsonDoc doc = new JsonDoc(loadJsonNode("crud/validator/simple-array-enum-constraint-doc.json"));
+        validator.validateDoc(doc);
+        List<Error> errors=validator.getDocErrors().get(doc);
+        Assert.assertEquals(1,errors.size());
+        Assert.assertEquals("crud:InvalidEnum",errors.get(0).getErrorCode());
+        System.out.println(errors);
+    }
+
     /**
      * No {@link FieldConstraintChecker} exists for the {@link FieldConstraint}.
      * This causes the registry to return a null value. A {@link Error} is
diff --git a/crud/src/test/resources/crud/validator/simple-array-enum-constraint-doc.json b/crud/src/test/resources/crud/validator/simple-array-enum-constraint-doc.json
@@ -0,0 +1,3 @@
+{
+    "array1": [ "v1", "v2", "failure" ]
+}
diff --git a/crud/src/test/resources/crud/validator/testSimpleArrayEnum.json b/crud/src/test/resources/crud/validator/testSimpleArrayEnum.json
@@ -0,0 +1,42 @@
+{
+    "entityInfo": {
+        "name": "testEnum",
+        "datastore": {
+            "backend":"mongo",
+            "datasource":"mongodata",
+"collection":"testEnum"
+        },
+        "enums":[
+            {
+                "name":"testEnum",
+                "values":["v1","v2"]
+            }
+        ]
+    },
+    "schema": {
+        "access":{
+ "insert":["anyone"],
+ "find":["anyone"],
+"update":["anyone"]
+        },
+    	"name": "testEnum",
+    	"version": {
+            "value": "1.0.0-SNAPSHOT",
+            "changelog": "blahblah"
+        },
+        "status": {
+            "value": "active"
+        },
+        "fields": {
+            "array1": {
+                "type":"array",
+                "items" : {
+                    "type":"string",
+                    "constraints": {
+                        "enum":"testEnum"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/metadata/src/main/java/com/redhat/lightblue/metadata/CompositeMetadata.java b/metadata/src/main/java/com/redhat/lightblue/metadata/CompositeMetadata.java
@@ -444,7 +444,10 @@ private static void copyFields(Fields dest,
                                 gmd);
                         path.pop();
                     } else {
-                        newElement = new SimpleArrayElement(((SimpleArrayElement) sourceEl).getType());
+                        SimpleArrayElement simpleElement=new SimpleArrayElement(((SimpleArrayElement) sourceEl).getType());
+                        simpleElement.setConstraints(((SimpleArrayElement)sourceEl).getConstraints());
+                        LOGGER.debug("Constraints:{}",simpleElement.getConstraints());
+                        newElement=simpleElement;
                     }
                     newElement.getProperties().putAll(sourceEl.getProperties());
                     ArrayField newField = new ArrayField(field.getName(), newElement);
diff --git a/metadata/src/main/java/com/redhat/lightblue/metadata/parser/MetadataParser.java b/metadata/src/main/java/com/redhat/lightblue/metadata/parser/MetadataParser.java
@@ -1489,8 +1489,11 @@ private void convertArrayField(ArrayField field, T fieldObject) {
         putString(items, STR_TYPE, el.getType().getName());
         if (el instanceof ObjectArrayElement) {
             convertObjectArrayElement((ObjectArrayElement) el, items);
+        } else {
+            convertFieldConstraints(items, ((SimpleArrayElement)el).getConstraints());
         }
-    }
+        convertProperties(field, fieldObject);
+   }
 
     private void convertReferenceField(ReferenceField field, T fieldObject) {
         putString(fieldObject, STR_ENTITY, field.getEntityName());
diff --git a/metadata/src/test/java/com/redhat/lightblue/metadata/parser/JSONMetadataParserTest.java b/metadata/src/test/java/com/redhat/lightblue/metadata/parser/JSONMetadataParserTest.java
@@ -53,6 +53,8 @@
 import com.redhat.lightblue.metadata.Enums;
 import com.redhat.lightblue.metadata.MetadataConstants;
 import com.redhat.lightblue.metadata.SimpleField;
+import com.redhat.lightblue.metadata.SimpleArrayElement;
+import com.redhat.lightblue.metadata.ArrayField;
 import com.redhat.lightblue.metadata.ValueGenerator;
 import com.redhat.lightblue.metadata.EntitySchema;
 import com.redhat.lightblue.metadata.Fields;
@@ -630,6 +632,22 @@ public void testParseConvertValueGenerator() throws IOException {
         Assert.assertEquals("1000", props.get("initialValue").asText());
     }
 
+    @Test
+    public void testParseConvertArrayConstraints() throws IOException {
+        JsonNode object = loadJsonNode("JSONMetadataParserTest-array.json");
+        EntitySchema em = parser.parseEntitySchema(object);
+        ArrayField field = (ArrayField) em.resolve(new Path("name"));
+        Assert.assertNotNull(field);
+        Assert.assertEquals(1,((SimpleArrayElement)field.getElement()).getConstraints().size());
+
+        Fields fields=new Fields(null);
+        fields.put(field);
+
+        ObjectNode obj=(ObjectNode)parser.convert(fields);
+        System.out.println("array:"+obj);
+        Assert.assertTrue(obj.get("name").get("items").get("constraints").get("required").booleanValue());
+    }
+
     @Test
     public void testProperties() throws IOException {
         JsonNode object = loadJsonNode("JSONMetadataParserTest-properties.json");
diff --git a/metadata/src/test/resources/JSONMetadataParserTest-array.json b/metadata/src/test/resources/JSONMetadataParserTest-array.json
@@ -0,0 +1,30 @@
+{
+    "name": "test",
+    "version": {
+        "value": "1.0.0",
+        "changelog": "Initial version"
+    },
+    "status": {
+        "value": "active"
+    },
+    "access": {
+        "insert": ["admin"],
+        "find": ["admin", "all"],
+        "update": ["admin"],
+        "delete": ["admin"]
+    },
+    "datastore": {
+        "backend": "empty"
+    },
+    "fields": {
+        "name": {
+            "type": "array",
+            "items": {
+                "type":"string",
+                "constraints": {
+                    "required":true
+                }
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ private void checkConstraints(JsonDoc doc, Path currentValuePath, JsonNode curre`
`231`	`231`	`skip=currentFieldNode.getFullPath();`
`232`	`232`	`}`
`233`	`233`	`if(skip==null) {`
`234`		`- LOGGER.debug("checking field {}", currentFieldPath);`
	`234`	`+ LOGGER.debug("checking field {} for {} - {}", currentFieldPath,currentFieldNode);`
`235`	`235`	`Error.push(currentFieldPath.toString());`
`236`	`236`	`try {`
`237`	`237`	`List<FieldConstraint> constraints = null;`
`@@ -240,6 +240,7 @@ private void checkConstraints(JsonDoc doc, Path currentValuePath, JsonNode curre`
`240`	`240`	`} else if (currentFieldNode instanceof SimpleArrayElement) {`
`241`	`241`	`constraints = ((SimpleArrayElement) currentFieldNode).getConstraints();`
`242`	`242`	`}`
	`243`	`+ LOGGER.debug("Constraints:{}",constraints);`
`243`	`244`	`if (constraints != null && !constraints.isEmpty()) {`
`244`	`245`	`checkFieldConstraints(doc, constraints, currentValuePath, currentValue);`
`245`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "array1": [ "v1", "v2", "failure" ]`
	`3`	`+}`