From c99fa9b4216333dc9f756499b2085fc1770737a5 Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Fri, 3 May 2019 14:04:01 +0100 Subject: [PATCH 1/9] RM-6836 updating variable beanname --- .../action/RecordsManagementActionCondition.java | 2 +- ...mentActionConditionEvaluatorAbstractBase.java | 16 ++++++++-------- .../RecordsManagementActionServiceImpl.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java index e671096fc9..81755f456e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java @@ -43,7 +43,7 @@ public interface RecordsManagementActionCondition * * @return String action condition name */ - String getName(); + String getBeanName(); /** * Get the label of the action condition diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java index ab3c4ada31..657599334c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java @@ -55,8 +55,8 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte /** File Plan Service */ private FilePlanService filePlanService; - /** bean name */ - private String name; + /** bean beanName */ + private String beanName; /** public condition */ private boolean publicCondition = true; @@ -145,16 +145,16 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte @Override public void setBeanName(String name) { - this.name = name; + this.beanName = name; super.setBeanName(name); } /** - * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getName() + * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getBeanName() */ - public String getName() + public String getBeanName() { - return this.name; + return this.beanName; } /** @@ -184,11 +184,11 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte { if (this.actionConditionDefinition == null) { - this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(name); + this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setTitleKey(getTitleKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setDescriptionKey(getDescriptionKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed()); - ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(name); + ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setLocalizedParameterDefinitions(getLocalizedParameterDefinitions()); } return this.actionConditionDefinition; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index b86ea5e3b9..016bafafec 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -142,9 +142,9 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public void register(RecordsManagementActionCondition rmCondition) { - if (!rmConditions.containsKey(rmCondition.getName())) + if (!rmConditions.containsKey(rmCondition.getBeanName())) { - rmConditions.put(rmCondition.getName(), rmCondition); + rmConditions.put(rmCondition.getBeanName(), rmCondition); } } From 665c579560394b2fa022327c9c184e74ce4b26aa Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Fri, 3 May 2019 14:57:12 +0100 Subject: [PATCH 2/9] Removing severe sonar warnings --- .../HasDispositionDateCapabilityCondition.java | 11 ----------- .../condition/HasEventsCapabilityCondition.java | 11 ----------- .../condition/IsClassifiedCapabilityCondition.java | 11 ----------- .../condition/IsScheduledCapabilityCondition.java | 11 ----------- .../condition/LastDispositionActionCondition.java | 6 ------ .../condition/MayBeScheduledCapabilityCondition.java | 11 ----------- .../model/rma/aspect/FilePlanComponentAspect.java | 11 ----------- .../model/rma/aspect/QShareAspect.java | 7 ------- 8 files changed, 79 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java index 9fcf4f04be..948a9b6abc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java @@ -39,17 +39,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class HasDispositionDateCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java index 5702c03beb..e0940f6905 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java @@ -39,17 +39,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class HasEventsCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java index 40bca0db1d..eeb560db7c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java @@ -40,17 +40,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class IsClassifiedCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java index 1499f80f61..b95554d231 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java @@ -42,9 +42,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition /** Disposition action */ private String dispositionAction; - /** Disposition service */ - private DispositionService dispositionService; - /** * @param dispositionAction disposition action */ @@ -53,14 +50,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition this.dispositionAction = dispositionAction; } - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java index dfda81bcde..06337ca5ec 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java @@ -39,15 +39,9 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class LastDispositionActionCondition extends AbstractCapabilityCondition { - private DispositionService dispositionService; private String dispositionActionName; - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - public void setDispositionActionName(String dispositionActionName) { this.dispositionActionName = dispositionActionName; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java index 894b618119..5d980b4e6c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java @@ -43,9 +43,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi /** Disposition action */ private String dispositionAction; - /** Disposition service */ - private DispositionService dispositionService; - /** * @param dispositionAction disposition action */ @@ -54,14 +51,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi this.dispositionAction = dispositionAction; } - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java index 7accbb46f9..697a53d725 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java @@ -83,9 +83,6 @@ public class FilePlanComponentAspect extends BaseBehaviourBean /** file plan service */ private FilePlanService filePlanService; - /** rendition service */ - private RenditionService renditionService; - /** * @param scriptService set script service */ @@ -110,14 +107,6 @@ public class FilePlanComponentAspect extends BaseBehaviourBean this.filePlanService = filePlanService; } - /** - * @param renditionService rendition service - */ - public void setRenditionService(RenditionService service) - { - this.renditionService = service; - } - /** * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java index d39e02a2f8..3acca82457 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java @@ -49,13 +49,6 @@ import org.alfresco.service.namespace.QName; @BehaviourBean(defaultType = "qshare:shared") public class QShareAspect extends BaseBehaviourBean implements NodeServicePolicies.BeforeAddAspectPolicy { - private NodeService nodeService; - - public void setNodeService(NodeService nodeService) - { - this.nodeService = nodeService; - } - /** * Behaviour to prevent sharing a record * From 86f66dbd8548e4fa519222f33132d65c18d844df Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Mon, 6 May 2019 14:06:21 +0100 Subject: [PATCH 3/9] Removing sonar warnings --- .../org_alfresco_module_rm/caveat/ScriptConstraint.java | 4 ++-- .../audit/RecordsManagementAuditQueryParameters.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java index fa9a09b475..d31c2ddde1 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java @@ -171,7 +171,7 @@ public class ScriptConstraint implements Serializable */ public void deleteAuthority(String authority) { - + //Do nothing } /** @@ -180,7 +180,7 @@ public class ScriptConstraint implements Serializable */ public void deleteValue(String value) { - + //Do nothing } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java index 20712b9af7..b9a671967d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java @@ -55,6 +55,7 @@ public final class RecordsManagementAuditQueryParameters */ public RecordsManagementAuditQueryParameters() { + //Default constructor } /** From 9f2336d487ac0c51a067e1c39971a2fc885bda44 Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Tue, 7 May 2019 17:23:11 +0100 Subject: [PATCH 4/9] RM-6836 adding the severe and serious sonar fixes --- .../AuthenticatedUserRolesDataExtractor.java | 21 +++++++++++++++++++ .../FilePlanIdentifierDataExtractor.java | 20 ++++++++++++++++++ .../FilePlanNamePathDataExtractor.java | 21 +++++++++++++++++++ .../FilePlanNodeRefPathDataExtractor.java | 21 +++++++++++++++++++ .../capability/RMAfterInvocationProvider.java | 1 + .../capability/RMEntryVoter.java | 9 ++++++++ .../disposition/DispositionScheduleImpl.java | 2 +- .../rest/api/model/RecordCategoryChild.java | 1 + .../rm/rest/api/model/TargetContainer.java | 1 + .../alfresco/rm/rest/api/model/Transfer.java | 1 + .../rm/rest/api/model/TransferChild.java | 1 + .../rm/rest/api/model/TransferContainer.java | 1 + .../java/org/alfresco/util/SortDirection.java | 2 +- 13 files changed, 100 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java index f2f29675dd..a3387f7902 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java @@ -28,6 +28,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; +import java.util.Objects; import java.util.Set; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; @@ -124,4 +125,24 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra // Done return sb.toString(); } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(filePlanRoleService, that.filePlanRoleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, filePlanRoleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java index 2847504a6e..698236b92c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java @@ -28,6 +28,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; +import java.util.Objects; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.audit.extractor.AbstractDataExtractor; @@ -76,4 +77,23 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor // Done return identifier; } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o; + return Objects.equals(nodeService, that.nodeService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java index a0adcd0a68..70e1c546fd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java @@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; import java.util.List; +import java.util.Objects; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; @@ -126,4 +127,24 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor return extractedData; } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(ruleService, that.ruleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, ruleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java index 6e536d1811..006988b06c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java @@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; import java.util.List; +import java.util.Objects; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; @@ -112,4 +113,24 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto return extractedData; } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(ruleService, that.ruleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, ruleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 264915f9c6..8a959bd593 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -98,6 +98,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon public void afterPropertiesSet() { + //Do nothing } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java index bfe7ae2f58..f43b3181ee 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java @@ -284,6 +284,10 @@ public class RMEntryVoter extends RMSecurityCommon { break; } + default: + { + //do nothing + } } } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM)) @@ -317,6 +321,10 @@ public class RMEntryVoter extends RMSecurityCommon { break; } + default: + { + //do nothing + } } } } @@ -385,6 +393,7 @@ public class RMEntryVoter extends RMSecurityCommon */ public void afterPropertiesSet() { + //Do nothing } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java index eec7f3db4e..adff94ce9b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java @@ -118,7 +118,7 @@ public class DispositionScheduleImpl implements DispositionSchedule, { return value.booleanValue(); } - return null; + return false; } }); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java index 8619a42c99..cd35c889ff 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java @@ -48,6 +48,7 @@ public class RecordCategoryChild extends RMNode public RecordCategoryChild() { + //Default constructor } public Boolean getIsRecordCategory() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java index 124896d6a5..bc810cbb45 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java @@ -39,6 +39,7 @@ public class TargetContainer public TargetContainer() { + //Default constructor } public String getTargetParentId() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java index 57a5eb34f7..2bd605ee06 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java @@ -67,6 +67,7 @@ public class Transfer public Transfer() { + //Default constructor } @JsonProperty ("id") diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java index 812107c990..8f2ef1d3e7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java @@ -45,6 +45,7 @@ public class TransferChild extends RMNode public TransferChild() { + //Default constructor } public Boolean getIsClosed() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java index 77677120d4..e51e7948c7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java @@ -60,6 +60,7 @@ public class TransferContainer public TransferContainer() { + //Default constructor } @JsonProperty ("id") diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java index 6be0c21d74..72282d6279 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java @@ -72,7 +72,7 @@ public enum SortDirection if (sortDirection == null) { - throw new AlfrescoRuntimeException("Sort direction '" + sortDirection +"' unknown."); + throw new AlfrescoRuntimeException("Sort direction unknown."); } return sortDirection; From 07d4c451caf1a953f76cdf8d502d8d0267c8ca53 Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 08:30:30 +0100 Subject: [PATCH 5/9] RM-6836 adding review comments --- .../AuthenticatedUserRolesDataExtractor.java | 6 ++++++ .../FilePlanIdentifierDataExtractor.java | 6 ++++++ .../FilePlanNamePathDataExtractor.java | 6 ++++++ .../FilePlanNodeRefPathDataExtractor.java | 6 ++++++ .../capability/RMEntryVoter.java | 18 +++++++++--------- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java index a3387f7902..fcbe2deeac 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java @@ -130,11 +130,17 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra public boolean equals(Object o) { if (this == o) + { return true; + } if (o == null || getClass() != o.getClass()) + { return false; + } if (!super.equals(o)) + { return false; + } AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o; return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) && Objects.equals(filePlanRoleService, that.filePlanRoleService); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java index 698236b92c..2ef6fbce78 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java @@ -82,11 +82,17 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor public boolean equals(Object o) { if (this == o) + { return true; + } if (o == null || getClass() != o.getClass()) + { return false; + } if (!super.equals(o)) + { return false; + } FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o; return Objects.equals(nodeService, that.nodeService); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java index 70e1c546fd..67e6bd68fc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java @@ -132,11 +132,17 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor public boolean equals(Object o) { if (this == o) + { return true; + } if (o == null || getClass() != o.getClass()) + { return false; + } if (!super.equals(o)) + { return false; + } FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o; return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) && Objects.equals(ruleService, that.ruleService); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java index 006988b06c..0f9d85c0d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java @@ -118,11 +118,17 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto public boolean equals(Object o) { if (this == o) + { return true; + } if (o == null || getClass() != o.getClass()) + { return false; + } if (!super.equals(o)) + { return false; + } FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o; return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) && Objects.equals(ruleService, that.ruleService); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java index f43b3181ee..bd0c98ac8b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java @@ -280,10 +280,10 @@ public class RMEntryVoter extends RMSecurityCommon // abstain denies return AccessDecisionVoter.ACCESS_DENIED; } - case AccessDecisionVoter.ACCESS_GRANTED: - { - break; - } + case AccessDecisionVoter.ACCESS_GRANTED: + { + break; + } default: { //do nothing @@ -317,11 +317,11 @@ public class RMEntryVoter extends RMSecurityCommon // abstain denies return AccessDecisionVoter.ACCESS_DENIED; } - case AccessDecisionVoter.ACCESS_GRANTED: - { - break; - } - default: + case AccessDecisionVoter.ACCESS_GRANTED: + { + break; + } + default: { //do nothing } From 05c70ede63487c03510ff56e7f8bfa1966143625 Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 09:06:08 +0100 Subject: [PATCH 6/9] RM-6836 formatting change --- .../capability/RMEntryVoter.java | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java index bd0c98ac8b..f7ef9f800e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java @@ -258,28 +258,28 @@ public class RMEntryVoter extends RMSecurityCommon } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM_CAP)) { - switch(checkCapability(invocation, params, cad)) - { - case AccessDecisionVoter.ACCESS_DENIED: - { - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_ABSTAIN: - { - if(logger.isDebugEnabled()) - { - if(logger.isTraceEnabled()) - { - logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException()); - } - else - { - logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod()); - } - } - // abstain denies - return AccessDecisionVoter.ACCESS_DENIED; - } + switch (checkCapability(invocation, params, cad)) + { + case AccessDecisionVoter.ACCESS_DENIED: + { + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_ABSTAIN: + { + if (logger.isDebugEnabled()) + { + if (logger.isTraceEnabled()) + { + logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException()); + } + else + { + logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod()); + } + } + // abstain denies + return AccessDecisionVoter.ACCESS_DENIED; + } case AccessDecisionVoter.ACCESS_GRANTED: { break; @@ -292,31 +292,31 @@ public class RMEntryVoter extends RMSecurityCommon } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM)) { - switch(checkPolicy(invocation, params, cad)) - { - case AccessDecisionVoter.ACCESS_DENIED: - { - // log message - RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied."); + switch (checkPolicy(invocation, params, cad)) + { + case AccessDecisionVoter.ACCESS_DENIED: + { + // log message + RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied."); - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_ABSTAIN: - { - if(logger.isDebugEnabled()) - { - if(logger.isTraceEnabled()) - { - logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException()); - } - else - { - logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod()); - } - } - // abstain denies - return AccessDecisionVoter.ACCESS_DENIED; - } + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_ABSTAIN: + { + if (logger.isDebugEnabled()) + { + if (logger.isTraceEnabled()) + { + logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException()); + } + else + { + logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod()); + } + } + // abstain denies + return AccessDecisionVoter.ACCESS_DENIED; + } case AccessDecisionVoter.ACCESS_GRANTED: { break; From a000f99c040c118c7254eb32180749f1e6e42dda Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 09:17:19 +0100 Subject: [PATCH 7/9] RM-6836 formatting change --- .../RecordsManagementActionConditionEvaluatorAbstractBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java index 657599334c..30e4f4c0b3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java @@ -55,7 +55,7 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte /** File Plan Service */ private FilePlanService filePlanService; - /** bean beanName */ + /** bean name */ private String beanName; /** public condition */ From f0fe989822d0d2c38d89ac8e81bdfbdc82b6f5df Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 09:25:19 +0100 Subject: [PATCH 8/9] RM-6836 formatting change --- .../org_alfresco_module_rm/capability/RMEntryVoter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java index f7ef9f800e..6618796a71 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java @@ -288,10 +288,10 @@ public class RMEntryVoter extends RMSecurityCommon { //do nothing } - } + } } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM)) - { + { switch (checkPolicy(invocation, params, cad)) { case AccessDecisionVoter.ACCESS_DENIED: @@ -325,8 +325,8 @@ public class RMEntryVoter extends RMSecurityCommon { //do nothing } - } - } + } + } } } finally From 8515b9c2f815056ae71257428e5f57c191003ac2 Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 10:27:13 +0100 Subject: [PATCH 9/9] RM-6836 remove unused imports --- .../condition/HasDispositionDateCapabilityCondition.java | 1 - .../declarative/condition/HasEventsCapabilityCondition.java | 1 - .../declarative/condition/IsClassifiedCapabilityCondition.java | 1 - .../declarative/condition/IsScheduledCapabilityCondition.java | 1 - .../declarative/condition/LastDispositionActionCondition.java | 1 - .../declarative/condition/MayBeScheduledCapabilityCondition.java | 1 - .../org_alfresco_module_rm/model/rma/aspect/QShareAspect.java | 1 - 7 files changed, 7 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java index 948a9b6abc..a2cf48c900 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java index e0940f6905..e75db13930 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java index eeb560db7c..e4bfd3cbd6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java index b95554d231..f94913536d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java index 06337ca5ec..975ca5a4da 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java index 5d980b4e6c..f3ce7cf02d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java @@ -30,7 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java index 3acca82457..a5e2fe56eb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java @@ -36,7 +36,6 @@ import org.alfresco.repo.policy.annotation.Behaviour; import org.alfresco.repo.policy.annotation.BehaviourBean; import org.alfresco.repo.policy.annotation.BehaviourKind; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; /**