adjustments to better utilize the tools provided by core

Author: dcrissman

lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java

@@ -29,7 +29,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.redhat.lightblue.common.ldap.DBResolver;
 import com.redhat.lightblue.common.ldap.LdapConstant;
 import com.redhat.lightblue.common.ldap.LdapDataStore;
@@ -376,9 +375,9 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
 
             // If only dn is in the projection, then no need to query LDAP.
             if((requiredAttributeNames.size() == 1) && requiredAttributeNames.contains(LdapConstant.ATTRIBUTE_DN)){
-                ObjectNode node = factory.objectNode();
-                node.set(dnFieldPath.toString(), StringType.TYPE.toJson(factory, dn));
-                projectionResponseJson = new DocCtx(new JsonDoc(node));
+                JsonDoc jdoc = new JsonDoc(factory.objectNode());
+                jdoc.modify(dnFieldPath, StringType.TYPE.toJson(factory, dn), true);
+                projectionResponseJson = new DocCtx(jdoc);
             }
             //TODO: else fetch entity from LDAP and project results.
             //TODO: Probably want to batch fetch as opposed to individual fetches.

lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapMetadataListener.java

@@ -20,8 +20,6 @@
 
 import com.redhat.lightblue.common.ldap.LdapConstant;
 import com.redhat.lightblue.common.ldap.LdapFieldNameTranslator;
-import com.redhat.lightblue.common.ldap.LightblueUtil;
-import com.redhat.lightblue.metadata.ArrayElement;
 import com.redhat.lightblue.metadata.ArrayField;
 import com.redhat.lightblue.metadata.EntityInfo;
 import com.redhat.lightblue.metadata.EntityMetadata;
@@ -33,9 +31,9 @@
 import com.redhat.lightblue.metadata.MetadataListener;
 import com.redhat.lightblue.metadata.ObjectArrayElement;
 import com.redhat.lightblue.metadata.ObjectField;
+import com.redhat.lightblue.metadata.PredefinedFields;
 import com.redhat.lightblue.metadata.SimpleArrayElement;
 import com.redhat.lightblue.metadata.SimpleField;
-import com.redhat.lightblue.metadata.types.IntegerType;
 import com.redhat.lightblue.metadata.types.StringType;
 import com.redhat.lightblue.util.Error;
 import com.redhat.lightblue.util.Path;
@@ -72,36 +70,17 @@ public void beforeCreateNewSchema(Metadata m, EntityMetadata md) {
 
         ensureDnField(md, ldapNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN));
 
-        Path objectClassFieldPath = ensureObjectClassField(md,
+        ensureObjectClassField(md,
                 ldapNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_OBJECT_CLASS));
 
-        ensureObjectClassCountField(md,
-                objectClassFieldPath.mutableCopy().pop().push(LightblueUtil.createArrayCountFieldName(objectClassFieldPath.getLast())));
-    }
-
-    /**
-     * Ensures the objectClass count field is present on the entity. If not, then it will added. If so, but
-     * is defined incorrectly, then an {@link Error} will be thrown.
-     */
-    private void ensureObjectClassCountField(EntityMetadata md, Path objectClassCountFieldPath) {
-        FieldTreeNode objectClassCountNode;
-        try{
-            objectClassCountNode = md.resolve(objectClassCountFieldPath);
-        }
-        catch(Error e){
-            addFieldToParent(md, objectClassCountFieldPath,
-                    (Field)(objectClassCountNode = new SimpleField(objectClassCountFieldPath.getLast(), IntegerType.TYPE)));
-        }
-        if((!(objectClassCountNode instanceof SimpleField)) || (!(objectClassCountNode.getType() instanceof IntegerType))){
-            throw Error.get(MetadataConstants.ERR_FIELD_WRONG_TYPE, objectClassCountNode.getFullPath().toString());
-        }
+        PredefinedFields.ensurePredefinedFields(md);
     }
 
     /**
      * Ensures the objectClass field is present on the entity. If not, then it will added. If so, but
      * is defined incorrectly, then an {@link Error} will be thrown.
      */
-    private Path ensureObjectClassField(EntityMetadata md, Path objectClassFieldPath) {
+    private void ensureObjectClassField(EntityMetadata md, Path objectClassFieldPath) {
         FieldTreeNode objectClassNode;
         try{
             objectClassNode = md.resolve(objectClassFieldPath);
@@ -114,11 +93,9 @@ private Path ensureObjectClassField(EntityMetadata md, Path objectClassFieldPath
             throw Error.get(MetadataConstants.ERR_FIELD_WRONG_TYPE, objectClassNode.getFullPath().toString());
         }
         ArrayField objectClassField = (ArrayField) objectClassNode;
-        ArrayElement arrayElement = objectClassField.getElement();
-        if((!(arrayElement instanceof SimpleArrayElement)) || (!(arrayElement.getType() instanceof StringType))){
+        if(!(objectClassField.getElement().getType() instanceof StringType)){
             throw Error.get(MetadataConstants.ERR_FIELD_WRONG_TYPE, objectClassField.getFullPath().toString());
         }
-        return objectClassFieldPath;
     }
 
     /**
@@ -134,7 +111,7 @@ private void ensureDnField(EntityMetadata md, Path dnFieldPath) {
             addFieldToParent(md, dnFieldPath,
                     (Field)(dnNode = new SimpleField(dnFieldPath.getLast(), StringType.TYPE)));
         }
-        if((!(dnNode instanceof SimpleField)) || (!(dnNode.getType() instanceof StringType))){
+        if(!(dnNode.getType() instanceof StringType)){
             throw Error.get(MetadataConstants.ERR_FIELD_WRONG_TYPE, dnNode.getFullPath().toString());
         }
     }

lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/translator/ResultTranslator.java

@@ -71,9 +71,9 @@ public DocCtx translate(SearchResultEntry entry){
         Fields fields = md.getFields();
 
         if (cursor.firstChild()) {
-            ObjectNode node = toJson(entry, cursor, fields);
-            node.set(dnPath.toString(), StringType.TYPE.toJson(factory, entry.getDN()));
-            return new DocCtx(new JsonDoc(node));
+            JsonDoc jdoc = new JsonDoc(toJson(entry, cursor, fields));
+            jdoc.modify(dnPath, StringType.TYPE.toJson(factory, entry.getDN()), true);
+            return new DocCtx(jdoc);
         }
 
         //TODO: What to do in case of a null value here?