From 15a00fa939fabc018d9fbeb99928328509bfdff7 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Sun, 22 Jun 2014 15:53:31 +0000 Subject: [PATCH] Fixed major bugs (Visibility modifier) reported in Sonar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@74412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...tActionConditionEvaluatorAbstractBase.java | 24 ++++++++-- .../RecordsManagementActionServiceImpl.java | 30 +++++++++--- .../action/evaluator/IsKindEvaluator.java | 4 +- .../impl/CopyMoveLinkFileToBaseAction.java | 28 +++++++++-- .../action/impl/CopyToAction.java | 3 +- .../action/impl/FileToAction.java | 3 +- .../action/impl/LinkToAction.java | 3 +- .../action/impl/MoveToAction.java | 3 +- .../audit/event/AuditEvent.java | 48 +++++++++---------- .../audit/event/CreateObjectAuditEvent.java | 4 +- .../audit/event/CreatePersonAuditEvent.java | 4 +- .../audit/event/DeleteObjectAuditEvent.java | 8 ++-- .../audit/event/UpdateObjectAuditEvent.java | 4 +- .../capability/policy/AbstractBasePolicy.java | 29 +++++++---- .../capability/policy/AssocPolicy.java | 8 ++-- .../capability/policy/CapabilityPolicy.java | 8 ++-- .../capability/policy/CreatePolicy.java | 10 ++-- .../capability/policy/DeclarePolicy.java | 8 ++-- .../capability/policy/DeletePolicy.java | 8 ++-- .../capability/policy/MovePolicy.java | 6 +-- .../capability/policy/ReadPolicy.java | 10 ++-- .../capability/policy/ReadPropertyPolicy.java | 8 ++-- .../capability/policy/UpdatePolicy.java | 2 +- .../policy/UpdatePropertiesPolicy.java | 8 ++-- .../capability/policy/WriteContentPolicy.java | 6 +-- .../RecordsManagementNodeFormFilter.java | 34 ++++++++++--- .../model/rma/type/FilePlanType.java | 48 +++++++++++++++---- 27 files changed, 235 insertions(+), 124 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java index 9f0f25cc87..17fdb52cfa 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java @@ -41,19 +41,35 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte BeanNameAware { /** records management action service */ - protected RecordsManagementActionService recordsManagementActionService; + private RecordsManagementActionService recordsManagementActionService; /** File Plan Service */ - protected FilePlanService filePlanService; + private FilePlanService filePlanService; /** bean name */ private String name; /** public condition */ - protected boolean publicCondition = true; + private boolean publicCondition = true; private RetryingTransactionHelper retryingTransactionHelper; + /** + * @return Records management action service + */ + protected RecordsManagementActionService getRecordsManagementActionService() + { + return this.recordsManagementActionService; + } + + /** + * @return File plan service + */ + protected FilePlanService getFilePlanService() + { + return this.filePlanService; + } + /** * @param recordsManagementActionService records management action service */ @@ -95,7 +111,7 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte { public Void execute() { - recordsManagementActionService.register(RecordsManagementActionConditionEvaluatorAbstractBase.this); + getRecordsManagementActionService().register(RecordsManagementActionConditionEvaluatorAbstractBase.this); return null; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index ad57844141..219aeb6b9d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -60,15 +60,31 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi private Map dispositionActions = new HashMap(5); /** Policy component */ - PolicyComponent policyComponent; + private PolicyComponent policyComponent; /** Node service */ - NodeService nodeService; + private NodeService nodeService; /** Policy delegates */ private ClassPolicyDelegate beforeRMActionExecutionDelegate; private ClassPolicyDelegate onRMActionExecutionDelegate; + /** + * @return Policy component + */ + protected PolicyComponent getPolicyComponent() + { + return this.policyComponent; + } + + /** + * @return Node Service + */ + protected NodeService getNodeService() + { + return this.nodeService; + } + /** * Set the policy component * @@ -95,8 +111,8 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public void init() { // Register the various policies - beforeRMActionExecutionDelegate = policyComponent.registerClassPolicy(BeforeRMActionExecution.class); - onRMActionExecutionDelegate = policyComponent.registerClassPolicy(OnRMActionExecution.class); + beforeRMActionExecutionDelegate = getPolicyComponent().registerClassPolicy(BeforeRMActionExecution.class); + onRMActionExecutionDelegate = getPolicyComponent().registerClassPolicy(OnRMActionExecution.class); } /** @@ -133,7 +149,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi protected void invokeBeforeRMActionExecution(NodeRef nodeRef, String name, Map parameters) { // get qnames to invoke against - Set qnames = PoliciesUtil.getTypeAndAspectQNames(nodeService, nodeRef); + Set qnames = PoliciesUtil.getTypeAndAspectQNames(getNodeService(), nodeRef); // execute policy for node type and aspects BeforeRMActionExecution policy = beforeRMActionExecutionDelegate.get(qnames); policy.beforeRMActionExecution(nodeRef, name, parameters); @@ -149,7 +165,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi protected void invokeOnRMActionExecution(NodeRef nodeRef, String name, Map parameters) { // get qnames to invoke against - Set qnames = PoliciesUtil.getTypeAndAspectQNames(nodeService, nodeRef); + Set qnames = PoliciesUtil.getTypeAndAspectQNames(getNodeService(), nodeRef); // execute policy for node type and aspects OnRMActionExecution policy = onRMActionExecutionDelegate.get(qnames); policy.onRMActionExecution(nodeRef, name, parameters); @@ -260,7 +276,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi // Execute action invokeBeforeRMActionExecution(nodeRef, name, parameters); RecordsManagementActionResult result = rmAction.execute(nodeRef, parameters); - if (nodeService.exists(nodeRef)) + if (getNodeService().exists(nodeRef)) { invokeOnRMActionExecution(nodeRef, name, parameters); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java index 19f737e550..72f2780f40 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java @@ -34,7 +34,7 @@ import org.alfresco.service.namespace.QName; /** * Records management IsKind evaluator that evaluates according to the file plan * component kind passed in. - * + * * @author Craig Tan * @since 2.1 */ @@ -55,7 +55,7 @@ public class IsKindEvaluator extends RecordsManagementActionConditionEvaluatorAb boolean result = false; String kind = ((QName) actionCondition.getParameterValue(PARAM_KIND)).getLocalName(); - FilePlanComponentKind filePlanComponentKind = filePlanService.getFilePlanComponentKind(actionedUponNodeRef); + FilePlanComponentKind filePlanComponentKind = getFilePlanService().getFilePlanComponentKind(actionedUponNodeRef); if (filePlanComponentKind != null && filePlanComponentKind.toString().equals(kind)) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java index e1ad3c0cca..55fb6adf81 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java @@ -51,7 +51,27 @@ public abstract class CopyMoveLinkFileToBaseAction extends RMActionExecuterAbstr { COPY, MOVE, LINK }; - protected CopyMoveLinkFileToActionMode mode; + + /** Action Mode */ + private CopyMoveLinkFileToActionMode mode; + + /** + * @return Action Mode + */ + protected CopyMoveLinkFileToActionMode getMode() + { + return this.mode; + } + + /** + * Sets the action mode + * + * @param mode Action mode + */ + protected void setMode(CopyMoveLinkFileToActionMode mode) + { + this.mode = mode; + } /** * @param fileFolderService file folder service @@ -120,15 +140,15 @@ public abstract class CopyMoveLinkFileToBaseAction extends RMActionExecuterAbstr { try { - if(mode == CopyMoveLinkFileToActionMode.MOVE) + if(getMode() == CopyMoveLinkFileToActionMode.MOVE) { fileFolderService.move(actionedUponNodeRef, finalRecordFolder, null); } - else if(mode == CopyMoveLinkFileToActionMode.COPY) + else if(getMode() == CopyMoveLinkFileToActionMode.COPY) { fileFolderService.copy(actionedUponNodeRef, finalRecordFolder, null); } - else if(mode == CopyMoveLinkFileToActionMode.LINK) + else if(getMode() == CopyMoveLinkFileToActionMode.LINK) { recordService.link(actionedUponNodeRef, finalRecordFolder); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyToAction.java index 11d2a1653d..cb2686cd12 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyToAction.java @@ -1,6 +1,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl; - /** * File To action implementation. * @@ -16,6 +15,6 @@ public class CopyToAction extends CopyMoveLinkFileToBaseAction public void init() { super.init(); - this.mode = CopyMoveLinkFileToActionMode.COPY; + setMode(CopyMoveLinkFileToActionMode.COPY); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java index 3f6e61ee15..6e15273974 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java @@ -1,6 +1,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl; - /** * File To action implementation. * @@ -16,6 +15,6 @@ public class FileToAction extends CopyMoveLinkFileToBaseAction public void init() { super.init(); - this.mode = CopyMoveLinkFileToActionMode.MOVE; + setMode(CopyMoveLinkFileToActionMode.MOVE); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/LinkToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/LinkToAction.java index 707e7295c6..e5254d9c73 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/LinkToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/LinkToAction.java @@ -1,6 +1,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl; - /** * Link To action implementation. * @@ -16,6 +15,6 @@ public class LinkToAction extends CopyMoveLinkFileToBaseAction public void init() { super.init(); - this.mode = CopyMoveLinkFileToActionMode.LINK; + setMode(CopyMoveLinkFileToActionMode.LINK); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/MoveToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/MoveToAction.java index 429c6353d8..c3ff161ee4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/MoveToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/MoveToAction.java @@ -1,6 +1,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl; - /** * File To action implementation. * @@ -16,6 +15,6 @@ public class MoveToAction extends CopyMoveLinkFileToBaseAction public void init() { super.init(); - this.mode = CopyMoveLinkFileToActionMode.MOVE; + setMode(CopyMoveLinkFileToActionMode.MOVE); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java index 2bf7cce32e..3d45466ba3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java @@ -21,9 +21,9 @@ package org.alfresco.module.org_alfresco_module_rm.audit.event; import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.util.ParameterCheck; +import org.apache.commons.lang.StringUtils; import org.springframework.extensions.surf.util.I18NUtil; - /** * Class to represent an audit event * @@ -34,14 +34,14 @@ import org.springframework.extensions.surf.util.I18NUtil; public class AuditEvent implements RecordsManagementModel, Comparable { /** Name */ - protected String name; - + private String name; + /** Label */ - protected String label; - + private String label; + /** Records management audit service */ - protected RecordsManagementAuditService recordsManagementAuditService; - + protected RecordsManagementAuditService recordsManagementAuditService; + /** * @param recordsManagementAuditService records management audit service */ @@ -49,18 +49,18 @@ public class AuditEvent implements RecordsManagementModel, Comparable before, Map after) { - recordsManagementAuditService.auditEvent(nodeRef, name, before, after, false, true); + recordsManagementAuditService.auditEvent(nodeRef, getName(), before, after, false, true); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java index aadbdc2d8a..b0422e7466 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java @@ -28,8 +28,6 @@ import org.alfresco.repo.security.permissions.impl.acegi.ACLEntryVoterException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.aopalliance.intercept.MethodInvocation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Abstract base policy implementation @@ -40,17 +38,14 @@ import org.apache.commons.logging.LogFactory; public abstract class AbstractBasePolicy extends RMSecurityCommon implements Policy { - /** Logger */ - protected static Log logger = LogFactory.getLog(AbstractBasePolicy.class); - /** Capability service */ - protected CapabilityService capabilityService; + private CapabilityService capabilityService; /** Policy register */ - protected PolicyRegister policyRegister; + private PolicyRegister policyRegister; /** Policy name */ - protected String name; + private String name; /** * @param name policy name @@ -69,6 +64,22 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon return name; } + /** + * @return Capability service + */ + protected CapabilityService getCapabilityService() + { + return this.capabilityService; + } + + /** + * @return Policy register + */ + protected PolicyRegister getPolicyRegister() + { + return this.policyRegister; + } + /** * @param capabilityService capability service */ @@ -90,7 +101,7 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon */ public void init() { - policyRegister.registerPolicy(this); + getPolicyRegister().registerPolicy(this); } /** diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java index 110ddabeb6..657831e395 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java @@ -26,13 +26,13 @@ public class AssocPolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") - public int evaluate( - MethodInvocation invocation, - Class[] params, + public int evaluate( + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef testNodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability(RMPermissionModel.VIEW_RECORDS).evaluate(testNodeRef); + return getCapabilityService().getCapability(RMPermissionModel.VIEW_RECORDS).evaluate(testNodeRef); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java index e421212269..6f60fd7f67 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java @@ -23,7 +23,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.aopalliance.intercept.MethodInvocation; /** - * + * * @author Roy Wetherall * @since 2.1 */ @@ -35,12 +35,12 @@ public class CapabilityPolicy extends AbstractBasePolicy @Override @SuppressWarnings("rawtypes") public int evaluate( - MethodInvocation invocation, - Class[] params, + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef testNodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability(RMPermissionModel.MANAGE_ACCESS_CONTROLS).evaluate(testNodeRef); + return getCapabilityService().getCapability(RMPermissionModel.MANAGE_ACCESS_CONTROLS).evaluate(testNodeRef); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java index 373dabdaf3..1021ae6f17 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java @@ -27,13 +27,13 @@ public class CreatePolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") public int evaluate( - MethodInvocation invocation, - Class[] params, + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef linkee = null; QName assocType = null; - + // get the destination node NodeRef destination = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); @@ -41,7 +41,7 @@ public class CreatePolicy extends AbstractBasePolicy { // get the linkee when present linkee = getTestNode(invocation, params, cad.getParameters().get(1), cad.isParent()); - + // get the assoc type if(cad.getParameters().size() > 2) { @@ -49,7 +49,7 @@ public class CreatePolicy extends AbstractBasePolicy } } - return ((CreateCapability)capabilityService.getCapability("Create")).evaluate(destination, linkee, assocType); + return ((CreateCapability) getCapabilityService().getCapability("Create")).evaluate(destination, linkee, assocType); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java index 2e4ab677a3..ec52708380 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java @@ -25,13 +25,13 @@ public class DeclarePolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") - public int evaluate( - MethodInvocation invocation, - Class[] params, + public int evaluate( + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef declaree = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability("Declare").evaluate(declaree); + return getCapabilityService().getCapability("Declare").evaluate(declaree); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java index 19e8e3cf07..ef6dd7256c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java @@ -27,9 +27,9 @@ public class DeletePolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") - public int evaluate( - MethodInvocation invocation, - Class[] params, + public int evaluate( + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef deletee = null; @@ -40,7 +40,7 @@ public class DeletePolicy extends AbstractBasePolicy if (deletee != null) { - return capabilityService.getCapability("Delete").evaluate(deletee); + return getCapabilityService().getCapability("Delete").evaluate(deletee); } else diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java index f737d6053a..f802ed6302 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java @@ -28,8 +28,8 @@ public class MovePolicy extends AbstractBasePolicy @SuppressWarnings("rawtypes") public int evaluate( - MethodInvocation invocation, - Class[] params, + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { @@ -47,7 +47,7 @@ public class MovePolicy extends AbstractBasePolicy if ((movee != null) && (destination != null)) { - return capabilityService.getCapability("Move").evaluate(movee, destination); + return getCapabilityService().getCapability("Move").evaluate(movee, destination); } else { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java index 3e6c7483f5..decc5e51e2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java @@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation; /** * Read method security policy. - * + * * @author Roy Wetherall * @since 2.1 */ @@ -33,11 +33,11 @@ public class ReadPolicy extends AbstractBasePolicy @SuppressWarnings("rawtypes") public int evaluate( - MethodInvocation invocation, - Class[] params, + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { - NodeRef testNodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability(RMPermissionModel.VIEW_RECORDS).evaluate(testNodeRef); + NodeRef testNodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); + return getCapabilityService().getCapability(RMPermissionModel.VIEW_RECORDS).evaluate(testNodeRef); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java index 124a6910e3..67e60e8aa8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java @@ -30,16 +30,16 @@ public class ReadPropertyPolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") - public int evaluate( - MethodInvocation invocation, - Class[] params, + public int evaluate( + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef nodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); QName propertyQName = getQName(invocation, params, cad.getParameters().get(1)); if(propertyQName.equals(RecordsManagementModel.PROP_HOLD_REASON)) { - return capabilityService.getCapability(RMPermissionModel.VIEW_UPDATE_REASONS_FOR_FREEZE).evaluate(nodeRef); + return getCapabilityService().getCapability(RMPermissionModel.VIEW_UPDATE_REASONS_FOR_FREEZE).evaluate(nodeRef); } else { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java index 312f673f95..85a4413098 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java @@ -47,7 +47,7 @@ public class UpdatePolicy extends AbstractBasePolicy properties = getProperties(invocation, params, cad.getParameters().get(2)); } - UpdateCapability updateCapability = (UpdateCapability)capabilityService.getCapability("Update"); + UpdateCapability updateCapability = (UpdateCapability) getCapabilityService().getCapability("Update"); return updateCapability.evaluate(updatee, aspectQName, properties); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java index 13b8b724f5..4cfa0cbca1 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java @@ -24,13 +24,13 @@ import org.aopalliance.intercept.MethodInvocation; public class UpdatePropertiesPolicy extends AbstractBasePolicy { @SuppressWarnings("rawtypes") - public int evaluate( - MethodInvocation invocation, - Class[] params, + public int evaluate( + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef nodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability("UpdateProperties").evaluate(nodeRef); + return getCapabilityService().getCapability("UpdateProperties").evaluate(nodeRef); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java index 606b21c24f..a9fc180400 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java @@ -26,12 +26,12 @@ public class WriteContentPolicy extends AbstractBasePolicy @SuppressWarnings("rawtypes") public int evaluate( - MethodInvocation invocation, - Class[] params, + MethodInvocation invocation, + Class[] params, ConfigAttributeDefinition cad) { NodeRef updatee = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent()); - return capabilityService.getCapability("WriteContent").evaluate(updatee); + return getCapabilityService().getCapability("WriteContent").evaluate(updatee); } } \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java index a5b9f470b1..389fb05a39 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java @@ -69,10 +69,30 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter protected static final String TRANSIENT_DISPOSITION_INSTRUCTIONS = "rmDispositionInstructions"; /** Disposition service */ - protected DispositionService dispositionService; + private DispositionService dispositionService; /** File Plan Service */ - protected FilePlanService filePlanService; + private FilePlanService filePlanService; + + /** + * Returns the disposition service + * + * @return Disposition service + */ + protected DispositionService getDispositionService() + { + return this.dispositionService; + } + + /** + * Returns the file plan service + * + * @return File plan service + */ + protected FilePlanService getFilePlanService() + { + return this.filePlanService; + } /** * Sets the disposition service @@ -103,12 +123,12 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter Form form, Map context) { - if (filePlanService.isFilePlanComponent(nodeRef)) + if (getFilePlanService().isFilePlanComponent(nodeRef)) { // add all the custom properties addCustomPropertyFieldsToGroup(form, nodeRef); - FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef); + FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef); if (FilePlanComponentKind.RECORD.equals(kind)) { // add all the record meta-data aspect properties @@ -143,7 +163,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter // schedule to determine whether the disposition level can be changed i.e. record // level or folder level. DispositionSchedule schedule = new DispositionScheduleImpl(this.rmServiceRegistry, this.nodeService, nodeRef); - if (dispositionService.hasDisposableItems(schedule)) + if (getDispositionService().hasDisposableItems(schedule)) { protectRecordLevelDispositionPropertyField(form); } @@ -245,7 +265,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter addTransientPropertyField(form, TRANSIENT_DECLARED, DataTypeDefinition.BOOLEAN, recordService.isDeclared(nodeRef)); } - DispositionSchedule ds = dispositionService.getDispositionSchedule(nodeRef); + DispositionSchedule ds = getDispositionService().getDispositionSchedule(nodeRef); if (ds != null) { String instructions = ds.getDispositionInstructions(); @@ -254,7 +274,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter addTransientPropertyField(form, TRANSIENT_DISPOSITION_INSTRUCTIONS, DataTypeDefinition.TEXT, instructions); } - NodeRef recordCategory = dispositionService.getAssociatedRecordsManagementContainer(ds); + NodeRef recordCategory = getDispositionService().getAssociatedRecordsManagementContainer(ds); if (recordCategory != null) { String categoryId = (String)nodeService.getProperty(recordCategory, PROP_IDENTIFIER); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java index d5210f7d25..b0217a063f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java @@ -52,16 +52,48 @@ public class FilePlanType extends BaseBehaviourBean NodeServicePolicies.OnDeleteNodePolicy { /** file plan service */ - protected FilePlanService filePlanService; + private FilePlanService filePlanService; /** record folder service */ - protected RecordFolderService recordFolderService; + private RecordFolderService recordFolderService; /** identifier service */ - protected IdentifierService identifierService; + private IdentifierService identifierService; /** file plan role service */ - protected FilePlanRoleService filePlanRoleService; + private FilePlanRoleService filePlanRoleService; + + /** + * @return File plan service + */ + protected FilePlanService getFilePlanService() + { + return this.filePlanService; + } + + /** + * @return Record folder service + */ + protected RecordFolderService getRecordFolderService() + { + return this.recordFolderService; + } + + /** + * @return Identifier service + */ + protected IdentifierService getIdentifierService() + { + return this.identifierService; + } + + /** + * @return File plan role service + */ + protected FilePlanRoleService getFilePlanRoleService() + { + return this.filePlanRoleService; + } /** * @param filePlanService file plan service @@ -114,7 +146,7 @@ public class FilePlanType extends BaseBehaviourBean // ensure we are not trying to put a record folder in the root of the file plan NodeRef parent = childAssocRef.getParentRef(); - if (filePlanService.isFilePlan(parent) && recordFolderService.isRecordFolder(nodeRef)) + if (getFilePlanService().isFilePlan(parent) && getRecordFolderService().isRecordFolder(nodeRef)) { throw new AlfrescoRuntimeException("Operation failed, because you can not place a record folder in the root of the file plan."); } @@ -141,7 +173,7 @@ public class FilePlanType extends BaseBehaviourBean if (nodeService.hasAspect(filePlan, ASPECT_FILE_PLAN_COMPONENT) && nodeService.getProperty(filePlan, PROP_IDENTIFIER) == null) { - String id = identifierService.generateIdentifier(filePlan); + String id = getIdentifierService().generateIdentifier(filePlan); nodeService.setProperty(filePlan, RecordsManagementModel.PROP_IDENTIFIER, id); } @@ -150,7 +182,7 @@ public class FilePlanType extends BaseBehaviourBean }); // setup the file plan roles - filePlanRoleService.setupFilePlanRoles(filePlan); + getFilePlanRoleService().setupFilePlanRoles(filePlan); } /** @@ -165,6 +197,6 @@ public class FilePlanType extends BaseBehaviourBean public void onDeleteNode(ChildAssociationRef childAssocRef, boolean archived) { // tear down the file plan roles - filePlanRoleService.tearDownFilePlanRoles(childAssocRef.getChildRef()); + getFilePlanRoleService().tearDownFilePlanRoles(childAssocRef.getChildRef()); } }