Merge branch '2036-async-grant' into 4.2.3 #2036

IQSS · Jan 6, 2016 · 8a42890 · 8a42890
2 parents 36ad26c + 1770995
commit 8a42890
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.authorization.RoleAssignmentSet;
+import edu.harvard.iq.dataverse.search.IndexAsync;
 import edu.harvard.iq.dataverse.search.IndexResponse;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
@@ -36,6 +37,7 @@ public class DataverseRoleServiceBean implements java.io.Serializable {
     @EJB RoleAssigneeServiceBean roleAssigneeService;
     @EJB IndexServiceBean indexService;   
     @EJB SolrIndexServiceBean solrIndexService;
+    @EJB IndexAsync indexAsync;
 
 	public DataverseRole save( DataverseRole aRole ) {
 		if ( aRole.getId() == null ) {
@@ -67,8 +69,7 @@ public RoleAssignment save( RoleAssignment assignment ) {
             /**
              * @todo update permissionModificationTime here.
              */
-            IndexResponse indexDefinitionPountResult = indexDefinitionPoint(assignment.getDefinitionPoint());
-            logger.fine("output from indexing operations: " + indexDefinitionPountResult);
+            indexAsync.indexRole(assignment);
                 return assignment;
 	}
 
@@ -134,8 +135,7 @@ public void revoke( RoleAssignment ra ) {
             /**
              * @todo update permissionModificationTime here.
              */
-            IndexResponse indexDefinitionPointResult = indexDefinitionPoint(ra.getDefinitionPoint());
-            logger.fine("indexing operation results: " + indexDefinitionPointResult);
+            indexAsync.indexRole(ra);
 	}
 
 	public RoleAssignmentSet roleAssignments( User user, Dataverse dv ) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java
@@ -0,0 +1,23 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.RoleAssignment;
+import java.util.logging.Logger;
+import javax.ejb.Asynchronous;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+
+@Stateless
+public class IndexAsync {
+
+    private static final Logger logger = Logger.getLogger(IndexAsync.class.getCanonicalName());
+
+    @EJB
+    SolrIndexServiceBean solrIndexService;
+
+    @Asynchronous
+    public void indexRole(RoleAssignment roleAssignment) {
+        IndexResponse indexResponse = solrIndexService.indexPermissionsOnSelfAndChildren(roleAssignment.getDefinitionPoint());
+        logger.fine("output from indexing operations: " + indexResponse);
+    }
+
+}