From f983fc4bc7a4dc0e9d175e77cfaf8a2127aaeb2d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Feb 2015 14:16:50 +0000
Subject: [PATCH] AutoRefactor: fix boolean usage
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
index 01b7ee9..e58e28e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
@@ -451,8 +451,7 @@
* needed to match ACI targets.
* @return True if this ACI targets are applicable or match.
*/
- public static boolean
- isApplicable(Aci aci, AciTargetMatchContext matchCtx) {
+ public static boolean isApplicable(Aci aci, AciTargetMatchContext matchCtx) {
if(matchCtx.hasRights(ACI_EXT_OP)) {
//Extended operation is being evaluated.
return AciTargets.isTargetApplicable(aci, matchCtx) &&
@@ -465,18 +464,21 @@
//If an ACI has extOp or targetControl targets skip it because the
//matchCtx right does not contain either ACI_EXT_OP or ACI_CONTROL at
//this point.
- if(aci.getTargets().getExtOp() != null
- || aci.getTargets().getTargetControl() != null) {
- return false;
- }
- return haveSimilarRights(aci, matchCtx) &&
- AciTargets.isTargetApplicable(aci, matchCtx) &&
- AciTargets.isTargetFilterApplicable(aci, matchCtx) &&
- AciTargets.isTargAttrFiltersApplicable(aci, matchCtx) &&
- AciTargets.isTargetAttrApplicable(aci, matchCtx);
+ return hasNoExtOpOrTargetControl(aci.getTargets())
+ && haveSimilarRights(aci, matchCtx)
+ && AciTargets.isTargetApplicable(aci, matchCtx)
+ && AciTargets.isTargetFilterApplicable(aci, matchCtx)
+ && AciTargets.isTargAttrFiltersApplicable(aci, matchCtx)
+ && AciTargets.isTargetAttrApplicable(aci, matchCtx);
}
}
+ private static boolean hasNoExtOpOrTargetControl(AciTargets aciTargets)
+ {
+ return aciTargets.getExtOp() == null
+ && aciTargets.getTargetControl() == null;
+ }
+
private static boolean haveSimilarRights(Aci aci,
AciTargetMatchContext matchCtx)
{
--
Gitblit v1.10.0