use Error.get

Author: dcrissman

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

@@ -73,6 +73,7 @@
 import com.unboundid.ldap.sdk.ResultCode;
 import com.unboundid.ldap.sdk.SearchRequest;
 import com.unboundid.ldap.sdk.SearchResult;
+import com.unboundid.ldap.sdk.SearchResultEntry;
 import com.unboundid.ldap.sdk.SearchScope;
 import com.unboundid.ldap.sdk.controls.ServerSideSortRequestControl;
 import com.unboundid.ldap.sdk.controls.VirtualListViewRequestControl;
@@ -104,21 +105,13 @@ public CRUDInsertionResponse insert(CRUDOperationContext ctx,
         EntityMetadata md = ctx.getEntityMetadata(ctx.getEntityName());
         LdapDataStore store = getLdapDataStore(md);
 
-        LDAPConnection connection = null;
-        try {
-            connection = dbResolver.get(store);
-        }
-        catch (LDAPException e) {
-            //TODO: throw more relevant exception.
-            throw new RuntimeException("Unable to establish connection to LDAP", e);
-        }
-
         FieldAccessRoleEvaluator roles = new FieldAccessRoleEvaluator(md, ctx.getCallerRoles());
         EntryBuilder entryBuilder = new EntryBuilder(md);
 
         //Create Entry instances for each document.
         List<com.unboundid.ldap.sdk.Entry> entries = new ArrayList<com.unboundid.ldap.sdk.Entry>();
         Map<DocCtx, String> documentToDnMap = new HashMap<DocCtx, String>();
+        boolean hasError = false;
         for(DocCtx document : documents){
             List<Path> paths = roles.getInaccessibleFields_Insert(document);
             if((paths != null) && !paths.isEmpty()){
@@ -137,10 +130,20 @@ public CRUDInsertionResponse insert(CRUDOperationContext ctx,
 
             String dn = createDN(store, uniqueNode.asText());
             documentToDnMap.put(document, dn);
-            entries.add(entryBuilder.build(dn, document));
+            try{
+                entries.add(entryBuilder.build(dn, document));
+            }
+            catch(Exception e){
+                document.addError(Error.get(e));
+                hasError = true;
+            }
+        }
+        if(hasError){
+            return response;
         }
 
         //Persist each Entry.
+        LDAPConnection connection = getNewLdapConnection(store);
         for(com.unboundid.ldap.sdk.Entry entry : entries){
             InsertCommand command = new InsertCommand(connection, entry);
 
@@ -198,9 +201,9 @@ public CRUDFindResponse find(CRUDOperationContext ctx,
         CRUDFindResponse response = new CRUDFindResponse();
         response.setSize(0);
 
-        try {
-            LDAPConnection connection = dbResolver.get(store);
+        LDAPConnection connection = getNewLdapConnection(store);
 
+        try {
             //TODO: Support scopes other than SUB
             SearchRequest request = new SearchRequest(
                     store.getBaseDN(),
@@ -218,7 +221,19 @@ public CRUDFindResponse find(CRUDOperationContext ctx,
             SearchResult result = connection.search(request);
 
             response.setSize(result.getEntryCount());
-            ctx.setDocuments(new ResultTranslator(ctx.getFactory().getNodeFactory()).translate(result, md));
+            ResultTranslator resultTranslator = new ResultTranslator(ctx.getFactory().getNodeFactory());
+            List<DocCtx> translatedDocs = new ArrayList<DocCtx>();
+            for(SearchResultEntry entry : result.getSearchEntries()){
+                try{
+                    translatedDocs.add(resultTranslator.translate(entry, md));
+                }
+                catch(Exception e){
+                    DocCtx erroredDoc = new DocCtx(null);
+                    erroredDoc.addError(Error.get(e));
+                    translatedDocs.add(erroredDoc);
+                }
+            }
+            ctx.setDocuments(translatedDocs);
 
             Projector projector = Projector.getInstance(
                     Projection.add(
@@ -387,4 +402,22 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
         }
     }
 
+    /**
+     * Returns a new connection to ldap.
+     * @param store - {@link LdapDataStore} to connect too.
+     * @return a new connection to ldap
+     * @throws RuntimeException when unable to connect to ldap.
+     */
+    private LDAPConnection getNewLdapConnection(LdapDataStore store) {
+        LDAPConnection connection = null;
+        try {
+            connection = dbResolver.get(store);
+        }
+        catch (LDAPException e) {
+            //TODO: throw more relevant exception.
+            throw new RuntimeException("Unable to establish connection to LDAP", e);
+        }
+        return connection;
+    }
+
 }

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

@@ -18,9 +18,6 @@
  */
 package com.redhat.lightblue.crud.ldap.translator;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -44,7 +41,6 @@
 import com.redhat.lightblue.metadata.types.StringType;
 import com.redhat.lightblue.util.JsonDoc;
 import com.unboundid.ldap.sdk.Attribute;
-import com.unboundid.ldap.sdk.SearchResult;
 import com.unboundid.ldap.sdk.SearchResultEntry;
 
 /**
@@ -60,14 +56,6 @@ public ResultTranslator(JsonNodeFactory factory){
         this.factory = factory;
     }
 
-    public List<DocCtx> translate(SearchResult result, EntityMetadata md){
-        List<DocCtx> docs = new ArrayList<DocCtx>();
-        for(SearchResultEntry entry : result.getSearchEntries()){
-            docs.add(translate(entry, md));
-        }
-        return docs;
-    }
-
     public DocCtx translate(SearchResultEntry entry, EntityMetadata md){
         FieldCursor cursor = md.getFieldCursor();
         String entityName = md.getEntityInfo().getName();
@@ -143,7 +131,7 @@ else if(type instanceof BinaryType){
         }
 
         if(value == null){
-            throw new NullPointerException("Unable to convert LDAP attribute to json resulting in a null value: " + attr);
+            throw new NullPointerException("Unable to convert LDAP attribute to json resulting in a null value: " + attr.getName());
         }
 
         return field.getType().toJson(factory, value);