Add error push/pop to TranslatorFromJson

Author: dcrissman

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

@@ -33,6 +33,7 @@
 import com.redhat.lightblue.metadata.Type;
 import com.redhat.lightblue.metadata.types.BinaryType;
 import com.redhat.lightblue.metadata.types.DateType;
+import com.redhat.lightblue.util.Error;
 import com.redhat.lightblue.util.JsonDoc;
 import com.redhat.lightblue.util.JsonNodeCursor;
 import com.unboundid.ldap.sdk.Entry;
@@ -53,8 +54,10 @@ public EntryBuilder(EntityMetadata md, LdapFieldNameTranslator fieldNameTranslat
     }
 
     public Entry build(String dn, JsonDoc document){
+        Error.push(LdapConstant.ATTRIBUTE_DN + "=" + dn);
         Entry entry = new Entry(dn);
         translate(document, entry);
+        Error.pop();
         return entry;
     }
 
@@ -123,7 +126,7 @@ protected void translateSimpleArray(ArrayField field, List<Object> items, Entry
 
     @Override
     protected void translateObjectArray(ArrayField field, JsonNodeCursor cursor, Entry target) {
-        throw new UnsupportedOperationException("Object ArrayField type is not currently supported.");
+        throw Error.get("Unsupported Feature: object array", field.getFullPath().toString());
     }
 
 }

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

@@ -33,6 +33,7 @@
 import com.redhat.lightblue.metadata.SimpleArrayElement;
 import com.redhat.lightblue.metadata.SimpleField;
 import com.redhat.lightblue.metadata.Type;
+import com.redhat.lightblue.util.Error;
 import com.redhat.lightblue.util.JsonDoc;
 import com.redhat.lightblue.util.JsonNodeCursor;
 import com.redhat.lightblue.util.Path;
@@ -102,6 +103,8 @@ protected void translate(JsonNodeCursor cursor, T target){
             throw new NullPointerException("No Metadata field found for: " + path.toString());
         }
 
+        Error.push(fieldNode.getFullPath().getLast());
+
         if (fieldNode instanceof SimpleField) {
             translate((SimpleField) fieldNode, node, target);
         }
@@ -117,6 +120,8 @@ else if (fieldNode instanceof ReferenceField) {
         else{
             throw new UnsupportedOperationException("Field type is not supported: " + fieldNode.getClass().getName());
         }
+
+        Error.pop();
     }
 
     private void translate(ArrayField field, JsonNodeCursor cursor, T target){
@@ -149,6 +154,7 @@ protected void translate(ObjectField field, JsonNodeCursor cursor, T target){
             //TODO: throw exception?
             return;
         }
+
         do {
             translate(cursor, target);
         } while (cursor.nextSibling());

lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/EntryBuilderTest.java

@@ -32,7 +32,9 @@
 
 import javax.xml.bind.DatatypeConverter;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -76,6 +78,9 @@ protected static String quote(String text){
 
     public static class SpecializedTests {
 
+        @Rule
+        public ExpectedException expectedEx = ExpectedException.none();
+
         @Test
         public void testFieldIsObjectType() throws Exception{
             Entry entry = buildEntry(LightblueUtil.FIELD_OBJECT_TYPE, "{\"type\": \"string\"}", quote("someEntity"));
@@ -115,17 +120,18 @@ public void testFieldIsArrayFieldWithoutMatchArray() throws Exception{
          * it requires two fields.
          * ObjectFields are not currently supported in LDAP, an exception should be thrown indicating as such.
          */
-        @Test(expected = UnsupportedOperationException.class)
+        @Test
         public void testObjectArrayField_ThrowsException() throws Exception{
             String arrayFieldName = "someObjectArray";
             String arrayCountFieldName = LightblueUtil.createArrayCountFieldName(arrayFieldName);
-            Entry entry = buildEntry(
+
+            expectedEx.expect(com.redhat.lightblue.util.Error.class);
+            expectedEx.expectMessage("{\"objectType\":\"error\",\"context\":\"dn=uid=someuid,dc=example,dc=com/" + arrayFieldName + "\",\"errorCode\":\"Unsupported Feature: object array\",\"msg\":\"" + arrayFieldName + "\"}");
+
+            buildEntry(
                     arrayCountFieldName,
                     "{\"type\": \"integer\"}, " + quote(arrayFieldName) + ": {\"type\": \"array\", \"items\": {\"type\": \"object\",\"fields\": {\"someField\": {\"type\": \"string\"}}}}",
                     "1," + quote(arrayFieldName) + ":[{\"someField\":\"hello\"}]");
-
-            assertNotNull(entry);
-            assertNull(entry.getAttribute(arrayFieldName));
         }
 
         @Test(expected = IllegalArgumentException.class)