RM-6836 adding review comments

This commit is contained in:
Ross Gale
2019-05-08 08:30:30 +01:00
parent 747280acdf
commit da77c03cdb
5 changed files with 33 additions and 9 deletions

View File

@@ -130,11 +130,17 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra
public boolean equals(Object o) public boolean equals(Object o)
{ {
if (this == o) if (this == o)
{
return true; return true;
}
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
{
return false; return false;
}
if (!super.equals(o)) if (!super.equals(o))
{
return false; return false;
}
AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o; AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(filePlanRoleService, that.filePlanRoleService); && Objects.equals(filePlanRoleService, that.filePlanRoleService);

View File

@@ -82,11 +82,17 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor
public boolean equals(Object o) public boolean equals(Object o)
{ {
if (this == o) if (this == o)
{
return true; return true;
}
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
{
return false; return false;
}
if (!super.equals(o)) if (!super.equals(o))
{
return false; return false;
}
FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o; FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o;
return Objects.equals(nodeService, that.nodeService); return Objects.equals(nodeService, that.nodeService);
} }

View File

@@ -132,11 +132,17 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
public boolean equals(Object o) public boolean equals(Object o)
{ {
if (this == o) if (this == o)
{
return true; return true;
}
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
{
return false; return false;
}
if (!super.equals(o)) if (!super.equals(o))
{
return false; return false;
}
FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o; FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(ruleService, that.ruleService); && Objects.equals(ruleService, that.ruleService);

View File

@@ -118,11 +118,17 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto
public boolean equals(Object o) public boolean equals(Object o)
{ {
if (this == o) if (this == o)
{
return true; return true;
}
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
{
return false; return false;
}
if (!super.equals(o)) if (!super.equals(o))
{
return false; return false;
}
FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o; FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(ruleService, that.ruleService); && Objects.equals(ruleService, that.ruleService);

View File

@@ -280,10 +280,10 @@ public class RMEntryVoter extends RMSecurityCommon
// abstain denies // abstain denies
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_GRANTED: case AccessDecisionVoter.ACCESS_GRANTED:
{ {
break; break;
} }
default: default:
{ {
//do nothing //do nothing
@@ -317,11 +317,11 @@ public class RMEntryVoter extends RMSecurityCommon
// abstain denies // abstain denies
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_GRANTED: case AccessDecisionVoter.ACCESS_GRANTED:
{ {
break; break;
} }
default: default:
{ {
//do nothing //do nothing
} }