From a5409044c573b0e28feef26661f35efc254e4fd5 Mon Sep 17 00:00:00 2001
From: rwetherall <roy.wetherall@alfresco.com>
Date: Tue, 27 Jun 2017 13:13:25 +1000
Subject: [PATCH] Transaction cache on BaseEvaluator.evaluate method

---
 .../rm-ui-evaluators-context.xml              |  1 +
 .../jscript/app/BaseEvaluator.java            | 35 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 3d8ea5c7e4..daccb826a1 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -38,6 +38,7 @@
       <property name="filePlanService" ref="FilePlanService" />
       <property name="dispositionService" ref="DispositionService" />
       <property name="recordFolderService" ref="RecordFolderService" />
+      <property name="transactionalResourceHelper" ref="rm.transactionalResourceHelper" />
    </bean>
 
    <bean id="jsonConversionComponent.baseIndicator"
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
index 2e734b6c2d..ec417b988a 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
@@ -40,6 +40,7 @@ import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
+import org.alfresco.module.org_alfresco_module_rm.util.TransactionalResourceHelper;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -84,6 +85,9 @@ public abstract class BaseEvaluator implements RecordsManagementModel
 
     /** Record folder service */
     protected RecordFolderService recordFolderService;
+    
+    /** transactional resource helper */
+    protected TransactionalResourceHelper transactionalResourceHelper; 
 
     /**
      * @param jsonConversionComponent   json conversion component
@@ -148,6 +152,14 @@ public abstract class BaseEvaluator implements RecordsManagementModel
     {
         this.recordFolderService = recordFolderService;
     }
+    
+    /**
+     * @param transactionalResourceHelper   transactional resource helper
+     */
+    public void setTransactionalResourceHelper(TransactionalResourceHelper transactionalResourceHelper)
+    {
+        this.transactionalResourceHelper = transactionalResourceHelper;
+    }
 
     /**
      * @param name
@@ -217,17 +229,24 @@ public abstract class BaseEvaluator implements RecordsManagementModel
      */
     public boolean evaluate(NodeRef nodeRef)
     {
-        boolean result = false;
-
-        // Check that we are dealing with the correct kind of RM object
-        if ((kinds == null || checkKinds(nodeRef)) &&
-                // Check we have the required capabilities
-                (capabilities == null || checkCapabilities(nodeRef)))
+        Map<NodeRef, Boolean> results = transactionalResourceHelper.getMap("BaseEvaluator.evaluate");
+        
+        if (!results.containsKey(nodeRef))
         {
-            result = evaluateImpl(nodeRef);
+            boolean result = false;
+            
+            // Check that we are dealing with the correct kind of RM object
+            if ((kinds == null || checkKinds(nodeRef)) &&
+                    // Check we have the required capabilities
+                    (capabilities == null || checkCapabilities(nodeRef)))
+            {
+                result = evaluateImpl(nodeRef);
+            }
+            
+            results.put(nodeRef, result);
         }
 
-        return result;
+        return results.get(nodeRef);
     }
 
     /**