From b0a00d248d3f6ae91627490e7a177d9ad5184331 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 15:59:49 +0000
Subject: [PATCH] AutoRefactor: booleans
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index f2dc050..560970a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -423,9 +423,7 @@
public static boolean isTargetFilterApplicable(Aci aci,
AciTargetMatchContext matchCtx) {
TargetFilter targetFilter=aci.getTargets().getTargetFilter();
- if(targetFilter != null)
- return targetFilter.isApplicable(matchCtx);
- return true;
+ return targetFilter == null || targetFilter.isApplicable(matchCtx);
}
/**
@@ -439,9 +437,7 @@
public static boolean isTargetControlApplicable(Aci aci,
AciTargetMatchContext matchCtx) {
TargetControl targetControl=aci.getTargets().getTargetControl();
- if(targetControl != null)
- return targetControl.isApplicable(matchCtx);
- return false;
+ return targetControl != null && targetControl.isApplicable(matchCtx);
}
/**
@@ -455,9 +451,7 @@
public static boolean isExtOpApplicable(Aci aci,
AciTargetMatchContext matchCtx) {
ExtOp extOp=aci.getTargets().getExtOp();
- if(extOp != null)
- return extOp.isApplicable(matchCtx);
- return false;
+ return extOp != null && extOp.isApplicable(matchCtx);
}
@@ -515,13 +509,13 @@
setEvalAttributes(targetMatchCtx,targetAttr,ret);
} else if (attrType != null || targetAttr != null) {
if (aci.hasRights(skipRights)
- && skipRightsHasRights(targetMatchCtx.getRights()))
+ && skipRightsHasRights(targetMatchCtx.getRights())) {
ret = true;
- else if (attrType == null && targetAttr != null
- && aci.hasRights(ACI_WRITE))
- ret = true;
- else
- ret = false;
+ } else {
+ ret = attrType == null
+ && targetAttr != null
+ && aci.hasRights(ACI_WRITE);
+ }
}
if (isFirstAttr && targetAttr == null
&& aci.getTargets().getTargAttrFilters() == null)
--
Gitblit v1.10.0