fix #775: two problems: composite metadata doesn't copy simple array element constraints, metadata parser doesn't save those constraints

Author: Burak Serdar

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);
                     }

crud/src/test/resources/crud/validator/testSimpleArrayEnum.json

@@ -1,9 +1,10 @@
 {
     "entityInfo": {
-        "name": "test",
+        "name": "testEnum",
         "datastore": {
             "backend":"mongo",
-            "collection": "test"
+            "datasource":"mongodata",
+"collection":"testEnum"
         },
         "enums":[
             {
@@ -13,9 +14,14 @@
         ]
     },
     "schema": {
-    	"name": "validationTest",
+        "access":{
+ "insert":["anyone"],
+ "find":["anyone"],
+"update":["anyone"]
+        },
+    	"name": "testEnum",
     	"version": {
-            "value": "1.0",
+            "value": "1.0.0-SNAPSHOT",
             "changelog": "blahblah"
         },
         "status": {

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

@@ -445,6 +445,8 @@ private static void copyFields(Fields dest,
                         path.pop();
                     } else {
                         newElement = new SimpleArrayElement(((SimpleArrayElement) sourceEl).getType());
+                        ((SimpleArrayElement)newElement).setConstraints( ((SimpleArrayElement)sourceEl).getConstraints());
+                        LOGGER.debug("Constraints:{}",((SimpleArrayElement)newElement).getConstraints());
                     }
                     newElement.getProperties().putAll(sourceEl.getProperties());
                     ArrayField newField = new ArrayField(field.getName(), newElement);

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());

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");

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
+                }
+            }
+        }
+    }
+}