From da77c03cdb39cb82de04ab1951eb43075c47af1c Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Wed, 8 May 2019 08:30:30 +0100 Subject: [PATCH] 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 }