start working on crud and hystrix

dcrissman · dcrissman · commit 6e37b6e0e93f · 2014-12-15T16:29:28.000-05:00
diff --git a/lightblue-ldap-common/src/main/java/com/redhat/lightblue/common/ldap/DBResolver.java b/lightblue-ldap-common/src/main/java/com/redhat/lightblue/common/ldap/DBResolver.java
@@ -1,14 +1,18 @@
 package com.redhat.lightblue.common.ldap;
 
+import com.redhat.lightblue.metadata.DataStore;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPException;
 
 
 public interface DBResolver {
 
     /**
-     * Returns a {@link LDAPConnection} based on the backend definition
+     * Returns a {@link LDAPConnection} based on the backend definition.<br>
+     * <b>NOTE:</b> A connection pool may be being used behind the scenes, so if
+     * this method is called multiple times you might get a different connection instance
+     * to the same database.
      */
-    LDAPConnection get(LdapDataStore store) throws LDAPException;
+    LDAPConnection get(DataStore store) throws LDAPException;
 
 }
diff --git a/lightblue-ldap-config/src/main/java/com/redhat/lightblue/config/ldap/LdapDBResolver.java b/lightblue-ldap-config/src/main/java/com/redhat/lightblue/config/ldap/LdapDBResolver.java
@@ -4,6 +4,7 @@
 
 import com.redhat.lightblue.common.ldap.DBResolver;
 import com.redhat.lightblue.common.ldap.LdapDataStore;
+import com.redhat.lightblue.metadata.DataStore;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPException;
 
@@ -15,8 +16,12 @@ public LdapDBResolver(Map<String, LdapDataSourceConfiguration> ldapDataSources){
         this.ldapDataSources = ldapDataSources;
     }
 
-    public LDAPConnection get(LdapDataStore store) throws LDAPException {
-        return get(store.getDatabase());
+    public LDAPConnection get(DataStore store) throws LDAPException {
+        if(!(store instanceof LdapDataStore)){
+            throw new IllegalArgumentException("DataStore of type " + store.getClass() + " is not supported.");
+        }
+
+        return get(((LdapDataStore)store).getDatabase());
     }
 
     public LDAPConnection get(String database) throws LDAPException{
diff --git a/lightblue-ldap-config/src/main/java/com/redhat/lightblue/config/ldap/LdapDataSourceConfiguration.java b/lightblue-ldap-config/src/main/java/com/redhat/lightblue/config/ldap/LdapDataSourceConfiguration.java
@@ -42,6 +42,14 @@ public class LdapDataSourceConfiguration implements DataSourceConfiguration{
     private static final long serialVersionUID = 3276072662352275664L;
     private static final Logger LOGGER = LoggerFactory.getLogger(LdapDataSourceConfiguration.class);
 
+    private static final String LDAP_CONFIG_DATABASE = "database";
+    private static final String LDAP_CONFIG_BINDABLE_DB = "bindableDn";
+    private static final String LDAP_CONFIG_PASSWORD = "password";
+    private static final String LDAP_CONFIG_NUMBER_OF_INITIAL_CONNECTIONS = "numberOfInitialConnections";
+    private static final String LDAP_CONFIG_MAX_NUMBER_OF_CONNECTIONS = "maxNumberOfConnections";
+    private static final String LDAP_SERVER_CONFIG_HOST = "host";
+    private static final String LDAP_SERVER_CONFIG_PORT = "port";
+
     private static final int DEFAULT_NUMBER_OF_INITIAL_CONNECTIONS = 5;
     private static final int DEFAULT_MAX_NUMBER_OF_CONNECTIONS = 10;
 
@@ -63,21 +71,21 @@ public void initializeFromJson(JsonNode node) {
             return;
         }
 
-        databaseName = parseJsonNode(node, "database", true).asText();
+        databaseName = parseJsonNode(node, LDAP_CONFIG_DATABASE, true).asText();
 
         //TODO Add functionality for other BindRequest Types
         BindRequest bindRequest = new SimpleBindRequest(
-                parseJsonNode(node, "bindableDn", true).asText(),
-                parseJsonNode(node, "password", true).asText());
+                parseJsonNode(node, LDAP_CONFIG_BINDABLE_DB, true).asText(),
+                parseJsonNode(node, LDAP_CONFIG_PASSWORD, true).asText());
 
         int initialConnections = DEFAULT_NUMBER_OF_INITIAL_CONNECTIONS;
-        JsonNode initialConnectionsNode = parseJsonNode(node, "numberOfInitialConnections", false);
+        JsonNode initialConnectionsNode = parseJsonNode(node, LDAP_CONFIG_NUMBER_OF_INITIAL_CONNECTIONS, false);
         if(initialConnectionsNode != null){
             initialConnections = initialConnectionsNode.asInt(DEFAULT_NUMBER_OF_INITIAL_CONNECTIONS);
         }
 
         int maxConnections = DEFAULT_MAX_NUMBER_OF_CONNECTIONS;
-        JsonNode maxConnectionsNode = parseJsonNode(node, "maxNumberOfConnections", false);
+        JsonNode maxConnectionsNode = parseJsonNode(node, LDAP_CONFIG_MAX_NUMBER_OF_CONNECTIONS, false);
         if(maxConnectionsNode != null){
             maxConnections = maxConnectionsNode.asInt(DEFAULT_MAX_NUMBER_OF_CONNECTIONS);
         }
@@ -89,8 +97,8 @@ public void initializeFromJson(JsonNode node) {
             while(serversIterator.hasNext()){
                 JsonNode serverNode = serversIterator.next();
                 hostPortMap.put(
-                        parseJsonNode(serverNode, "host", true).asText(),
-                        parseJsonNode(serverNode, "port", true).asInt());
+                        parseJsonNode(serverNode, LDAP_SERVER_CONFIG_HOST, true).asText(),
+                        parseJsonNode(serverNode, LDAP_SERVER_CONFIG_PORT, true).asInt());
             }
         }
         else{
diff --git a/lightblue-ldap-crud/pom.xml b/lightblue-ldap-crud/pom.xml
@@ -35,10 +35,21 @@
             <groupId>com.redhat.lightblue</groupId>
             <artifactId>crud</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>com.redhat.lightblue.ldap</groupId>
             <artifactId>lightblue-ldap-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.redhat.lightblue.ldap</groupId>
+            <artifactId>lightblue-ldap-hystrix</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.redhat.lightblue.ldap</groupId>
+            <artifactId>lightblue-ldap-test</artifactId>
+            <scope>test</scope>
+       </dependency>
     </dependencies>
   
 </project>
diff --git a/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java b/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java
@@ -18,6 +18,11 @@
  */
 package com.redhat.lightblue.crud.ldap;
 
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.redhat.lightblue.common.ldap.DBResolver;
 import com.redhat.lightblue.crud.CRUDController;
 import com.redhat.lightblue.crud.CRUDDeleteResponse;
@@ -26,15 +31,27 @@
 import com.redhat.lightblue.crud.CRUDOperationContext;
 import com.redhat.lightblue.crud.CRUDSaveResponse;
 import com.redhat.lightblue.crud.CRUDUpdateResponse;
+import com.redhat.lightblue.crud.DocCtx;
+import com.redhat.lightblue.eval.FieldAccessRoleEvaluator;
+import com.redhat.lightblue.eval.Projector;
+import com.redhat.lightblue.hystrix.ldap.InsertCommand;
+import com.redhat.lightblue.metadata.EntityMetadata;
 import com.redhat.lightblue.metadata.MetadataListener;
 import com.redhat.lightblue.query.Projection;
 import com.redhat.lightblue.query.QueryExpression;
 import com.redhat.lightblue.query.Sort;
 import com.redhat.lightblue.query.UpdateExpression;
 import com.redhat.lightblue.util.JsonDoc;
+import com.unboundid.ldap.sdk.Entry;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPResult;
+import com.unboundid.ldap.sdk.ResultCode;
 
 public class LdapCRUDController implements CRUDController{
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(LdapCRUDController.class);
+
     private final DBResolver dbResolver;
 
     public LdapCRUDController(DBResolver dbResolver){
@@ -43,8 +60,46 @@ public LdapCRUDController(DBResolver dbResolver){
 
     public CRUDInsertionResponse insert(CRUDOperationContext ctx,
             Projection projection) {
-        // TODO Auto-generated method stub
-        return null;
+        CRUDInsertionResponse response = new CRUDInsertionResponse();
+        List<DocCtx> documents = ctx.getDocumentsWithoutErrors();
+        if (documents == null || documents.isEmpty()) {
+            response.setNumInserted(0);
+            return response;
+        }
+
+        EntityMetadata md = ctx.getEntityMetadata(ctx.getEntityName());
+
+        FieldAccessRoleEvaluator roleEval = new FieldAccessRoleEvaluator(md, ctx.getCallerRoles());
+        Projection combinedProjection = Projection.add(
+                projection,
+                roleEval.getExcludedFields(FieldAccessRoleEvaluator.Operation.insert));
+
+        Projector projector = null;
+        if(combinedProjection != null){
+            projector = Projector.getInstance(combinedProjection, md);
+        }
+
+        try {
+            LDAPConnection connection = dbResolver.get(md.getDataStore());
+
+            for(DocCtx document : documents){
+                Entry entry = new Entry(""); //TODO populate Entry
+
+                InsertCommand command = new InsertCommand(connection, entry);
+
+                LDAPResult result = command.execute();
+                if(result.getResultCode() != ResultCode.SUCCESS){
+                    //TODO: Do something to indicate unsuccessful status
+                }
+
+            }
+        }
+        catch (LDAPException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        return response;
     }
 
     public CRUDSaveResponse save(CRUDOperationContext ctx, boolean upsert,
@@ -75,11 +130,9 @@ public CRUDFindResponse find(CRUDOperationContext ctx,
 
     public void updatePredefinedFields(CRUDOperationContext ctx, JsonDoc doc) {
         // TODO Auto-generated method stub
-
     }
 
     public MetadataListener getMetadataListener() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/lightblue-ldap-hystrix/pom.xml b/lightblue-ldap-hystrix/pom.xml
@@ -35,5 +35,16 @@
             <groupId>com.netflix.hystrix</groupId>
             <artifactId>hystrix-core</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>com.unboundid</groupId>
+            <artifactId>unboundid-ldapsdk</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.redhat.lightblue.ldap</groupId>
+            <artifactId>lightblue-ldap-test</artifactId>
+            <scope>test</scope>
+       </dependency>
     </dependencies>
 </project>
diff --git a/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/AbstractLdapHystrixCommand.java b/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/AbstractLdapHystrixCommand.java
@@ -0,0 +1,25 @@
+package com.redhat.lightblue.hystrix.ldap;
+
+import com.netflix.hystrix.HystrixCommand;
+import com.netflix.hystrix.HystrixCommandGroupKey;
+import com.netflix.hystrix.HystrixCommandKey;
+import com.unboundid.ldap.sdk.LDAPConnection;
+
+public abstract class AbstractLdapHystrixCommand<T> extends HystrixCommand<T>{
+
+    public static final String GROUPKEY = "ldap";
+
+    private final LDAPConnection connection;
+
+    public LDAPConnection getConnection(){
+        return connection;
+    }
+
+    public AbstractLdapHystrixCommand(LDAPConnection connection, String commandKey){
+        super(HystrixCommand.Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GROUPKEY)).
+                andCommandKey(HystrixCommandKey.Factory.asKey(GROUPKEY + ":" + commandKey)));
+
+        this.connection = connection;
+    }
+
+}
diff --git a/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/InsertCommand.java b/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/InsertCommand.java
@@ -0,0 +1,22 @@
+package com.redhat.lightblue.hystrix.ldap;
+
+import com.unboundid.ldap.sdk.Entry;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPResult;
+
+public class InsertCommand extends AbstractLdapHystrixCommand<LDAPResult>{
+
+    private final Entry entry;
+
+    public InsertCommand(LDAPConnection connection, Entry entry) {
+        super(connection, InsertCommand.class.getSimpleName());
+
+        this.entry = entry;
+    }
+
+    @Override
+    protected LDAPResult run() throws Exception {
+        return getConnection().add(entry);
+    }
+
+}
diff --git a/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/SearchCommand.java b/lightblue-ldap-hystrix/src/main/java/com/redhat/lightblue/hystrix/ldap/SearchCommand.java
@@ -0,0 +1,22 @@
+package com.redhat.lightblue.hystrix.ldap;
+
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.SearchRequest;
+import com.unboundid.ldap.sdk.SearchResult;
+
+public class SearchCommand extends AbstractLdapHystrixCommand<SearchResult>{
+
+    private final SearchRequest searchRequest;
+
+    public SearchCommand(LDAPConnection connection, SearchRequest searchRequest) {
+        super(connection, SearchCommand.class.getSimpleName());
+
+        this.searchRequest = searchRequest;
+    }
+
+    @Override
+    protected SearchResult run() throws Exception {
+        return getConnection().search(searchRequest);
+    }
+
+}
diff --git a/lightblue-ldap-hystrix/src/test/java/com/redhat/lightblue/hystrix/ldap/InsertCommandTest.java b/lightblue-ldap-hystrix/src/test/java/com/redhat/lightblue/hystrix/ldap/InsertCommandTest.java
@@ -0,0 +1,56 @@
+package com.redhat.lightblue.hystrix.ldap;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.LinkedHashMap;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.redhat.lightblue.ldap.test.LdapServerExternalResource;
+import com.redhat.lightblue.ldap.test.LdapServerExternalResource.InMemoryLdapServer;
+import com.unboundid.ldap.sdk.Attribute;
+import com.unboundid.ldap.sdk.Entry;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPResult;
+import com.unboundid.ldap.sdk.ResultCode;
+
+@InMemoryLdapServer
+public class InsertCommandTest {
+
+    @SuppressWarnings("serial")
+    @Rule
+    public LdapServerExternalResource ldapServer = new LdapServerExternalResource(new LinkedHashMap<String, Attribute[]>(){{
+        put("dc=com", new Attribute[]{
+                new Attribute("objectClass", "top"),
+                new Attribute("objectClass", "domain"),
+                new Attribute("dc", "com")});
+        put("dc=example,dc=com", new Attribute[]{
+                new Attribute("objectClass", "top"),
+                new Attribute("objectClass", "domain"),
+                new Attribute("dc", "example")});
+    }});
+
+    @Test
+    public void testExecute() throws LDAPException{
+        LDAPConnection connection = new LDAPConnection("localhost", LdapServerExternalResource.DEFAULT_PORT);
+
+        Entry entry = new Entry("uid=john.doe,dc=example,dc=com",
+                new Attribute("objectClass", "top", "person", "organizationalPerson", "inetOrgPerson"),
+                new Attribute("uid", "john.doe"),
+                new Attribute("givenName", "John"),
+                new Attribute("sn", "Doe"),
+                new Attribute("cn", "John Doe")
+                );
+
+        InsertCommand command = new InsertCommand(connection, entry);
+
+        LDAPResult result = command.execute();
+
+        assertNotNull(result);
+        assertEquals(ResultCode.SUCCESS, result.getResultCode());
+    }
+
+}
diff --git a/lightblue-ldap-hystrix/src/test/java/com/redhat/lightblue/hystrix/ldap/SearchCommandTest.java b/lightblue-ldap-hystrix/src/test/java/com/redhat/lightblue/hystrix/ldap/SearchCommandTest.java
diff --git a/lightblue-ldap-metadata/pom.xml b/lightblue-ldap-metadata/pom.xml
diff --git a/lightblue-ldap-metadata/src/main/java/com/redhat/lightblue/metadata/ldap/parser/LdapDataStoreParser.java b/lightblue-ldap-metadata/src/main/java/com/redhat/lightblue/metadata/ldap/parser/LdapDataStoreParser.java
