From b8c6b80da1cb6118167a934daa480eb381c59e0e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 08:06:00 +0000
Subject: [PATCH] opendj-server-legacy maven module: Enabled "NeedBraces" checkstyle rule. This brings opendj-server-legacy's checkstyle rules closer to ForgeRock's checkstyle rules.
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
index ed65f35..4e7fa5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
@@ -78,37 +78,46 @@
* context evaluation.
*/
public EnumEvalResult evaluate(AciEvalContext evalCtx) {
- EnumEvalResult matched=EnumEvalResult.FALSE;
int currentSSF = evalCtx.getCurrentSSF();
- switch (type) {
- case EQUAL_BINDRULE_TYPE:
- case NOT_EQUAL_BINDRULE_TYPE:
- if (currentSSF == ssf)
- matched=EnumEvalResult.TRUE;
- break;
-
- case LESS_OR_EQUAL_BINDRULE_TYPE:
- if (currentSSF <= ssf)
- matched=EnumEvalResult.TRUE;
- break;
-
- case LESS_BINDRULE_TYPE:
- if (currentSSF < ssf)
- matched=EnumEvalResult.TRUE;
- break;
-
- case GREATER_OR_EQUAL_BINDRULE_TYPE:
- if (currentSSF >= ssf)
- matched=EnumEvalResult.TRUE;
- break;
-
- case GREATER_BINDRULE_TYPE:
- if (currentSSF > ssf)
- matched=EnumEvalResult.TRUE;
- }
+ EnumEvalResult matched = getMatched(currentSSF);
return matched.getRet(type, false);
}
+ private EnumEvalResult getMatched(int currentSSF) {
+ switch (type) {
+ case EQUAL_BINDRULE_TYPE:
+ case NOT_EQUAL_BINDRULE_TYPE:
+ if (currentSSF == ssf) {
+ return EnumEvalResult.TRUE;
+ }
+ break;
+
+ case LESS_OR_EQUAL_BINDRULE_TYPE:
+ if (currentSSF <= ssf) {
+ return EnumEvalResult.TRUE;
+ }
+ break;
+
+ case LESS_BINDRULE_TYPE:
+ if (currentSSF < ssf) {
+ return EnumEvalResult.TRUE;
+ }
+ break;
+
+ case GREATER_OR_EQUAL_BINDRULE_TYPE:
+ if (currentSSF >= ssf) {
+ return EnumEvalResult.TRUE;
+ }
+ break;
+
+ case GREATER_BINDRULE_TYPE:
+ if (currentSSF > ssf) {
+ return EnumEvalResult.TRUE;
+ }
+ }
+ return EnumEvalResult.FALSE;
+ }
+
/** {@inheritDoc} */
@Override
public String toString()
--
Gitblit v1.10.0