From 86a0340297b2c7e047e295230c49a5b8cd8f30e7 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 11:40:11 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
index f9ac6c7..78ff303 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
@@ -71,35 +71,38 @@
* the undefined field and the bind rule type enumeration.
*/
public EnumEvalResult getRet(EnumBindRuleType type, boolean undefined) {
- EnumEvalResult ret=this;
- if(this.equals(EnumEvalResult.TRUE) || !undefined) {
- if(type.equals(EnumBindRuleType.NOT_EQUAL_BINDRULE_TYPE))
- if(this.equals(EnumEvalResult.TRUE))
- ret=EnumEvalResult.FALSE;
- else
- ret=EnumEvalResult.TRUE;
- } else
- ret=EnumEvalResult.FAIL;
- return ret;
+ if (equals(EnumEvalResult.TRUE) || !undefined) {
+ if (EnumBindRuleType.NOT_EQUAL_BINDRULE_TYPE.equals(type)) {
+ return negate(this);
+ }
+ } else {
+ return EnumEvalResult.FAIL;
+ }
+ return this;
}
/**
* This method is used to possibly negate the result of a simple bind rule
* evaluation. If the boolean is true than the result is negated.
* @param v The enumeration result of the simple bind rule evaluation.
- * @param n If true the result should be negated (TRUE->FALSE, FALSE->TRUE).
+ * @param negate If true the result should be negated (TRUE->FALSE, FALSE->TRUE).
* @return A possibly negated enumeration result.
*/
- public static EnumEvalResult negateIfNeeded(EnumEvalResult v, boolean n) {
- if(n) {
- if(v.equals(EnumEvalResult.TRUE))
- v=EnumEvalResult.FALSE;
- else
- v=EnumEvalResult.TRUE;
+ public static EnumEvalResult negateIfNeeded(EnumEvalResult v, boolean negate) {
+ if (negate) {
+ return negate(v);
}
return v;
}
+ private static EnumEvalResult negate(EnumEvalResult v) {
+ if (EnumEvalResult.TRUE.equals(v)) {
+ return EnumEvalResult.FALSE;
+ } else {
+ return EnumEvalResult.TRUE;
+ }
+ }
+
/**
* Helper method that converts this enumeration to a boolean. Usually the
* FAIL enumeration has been handled before this is called.
--
Gitblit v1.10.0