Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java

@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PersonService;
 import org.apache.commons.logging.Log;
@@ -164,10 +165,21 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
             if (dispositionActions != null && !dispositionActions.isEmpty())
             {
+                boolean hasMore = true;
+                int skipCount = 0;
+                while(hasMore)
+                {
+                    SearchParameters params = new SearchParameters();
+                    params.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+                    params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+                    params.setQuery(getQuery());
+                    params.setSkipCount(skipCount);
+
                     // execute search
-                ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+                    ResultSet results = searchService.query(params);
-                            SearchService.LANGUAGE_FTS_ALFRESCO, getQuery());
                     List<NodeRef> resultNodes = results.getNodeRefs();
+                    hasMore = results.hasMore();
+                    skipCount += results.length();
                     results.close();
 
                     if (logger.isDebugEnabled())
@@ -178,19 +190,40 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
                     // process search results
                     for (NodeRef node : resultNodes)
                     {
-                    final NodeRef currentNode = node;
+                        executeAction(node);
+                    }
+                }
+            }
 
+            logger.debug("Job Finished");
+        }
+        catch (AlfrescoRuntimeException exception)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(exception);
+            }
+        }
+    }
+
+    /**
+     * Helper method that executes a disposition action
+     *
+     * @param actionNode - the disposition action to execute
+     */
+    private void executeAction(final NodeRef actionNode)
+    {
         RetryingTransactionCallback<Boolean> processTranCB = new RetryingTransactionCallback<Boolean>()
         {
             public Boolean execute()
             {
-                            final String dispAction = (String) nodeService.getProperty(currentNode,
+                final String dispAction = (String) nodeService.getProperty(actionNode,
                             RecordsManagementModel.PROP_DISPOSITION_ACTION);
 
                 // Run disposition action
                 if (dispAction != null && dispositionActions.contains(dispAction))
                 {
-                                ChildAssociationRef parent = nodeService.getPrimaryParent(currentNode);
+                    ChildAssociationRef parent = nodeService.getPrimaryParent(actionNode);
                     if (parent.getTypeQName().equals(RecordsManagementModel.ASSOC_NEXT_DISPOSITION_ACTION))
                     {
                         Map<String, Serializable> props = new HashMap<String, Serializable>(1);
@@ -223,23 +256,11 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
         };
 
         // if exists
-                    if (nodeService.exists(currentNode))
+        if (nodeService.exists(actionNode))
         {
             retryingTransactionHelper.doInTransaction(processTranCB);
         }
     }
-            }
-
-            logger.debug("Job Finished");
-        }
-        catch (AlfrescoRuntimeException exception)
-        {
-            if (logger.isDebugEnabled())
-            {
-                logger.debug(exception);
-            }
-        }
-    }
 
     public PersonService getPersonService()
     {

rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java

@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateQName;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyMap;
 import static org.mockito.Matchers.anyString;
@@ -39,6 +40,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 import java.util.Collections;
 import java.util.List;
@@ -50,9 +52,11 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
@@ -92,7 +96,8 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         executer.setDispositionActions(dispositionActions);
 
         // setup interactions
-        doReturn(mockedResultSet).when(mockedSearchService).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_FTS_ALFRESCO), anyString());
+        doReturn(mockedResultSet).when(mockedSearchService).query(any(SearchParameters.class));
+        when(mockedResultSet.hasMore()).thenReturn(false);
     }
 
     /**
@@ -100,7 +105,9 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
      */
     private void verifyQuery()
     {
-        verify(mockedSearchService, times(1)).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_FTS_ALFRESCO), contains(QUERY));
+        ArgumentCaptor<SearchParameters> paramsCaptor = ArgumentCaptor.forClass(SearchParameters.class);
+        verify(mockedSearchService, times(1)).query(paramsCaptor.capture());
+        assertTrue(paramsCaptor.getValue().getQuery().contains(QUERY));
         verify(mockedResultSet, times(1)).getNodeRefs();
         verify(mockedResultSet, times(1)).close();
     }