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/UserDN.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
index d5fd820..dc1df74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
@@ -191,9 +191,14 @@
//Handle anonymous checks here
if(isAnonUser) {
if(dnTypeURL.getUserDNType() == EnumUserDNType.ANYONE)
- matched = EnumEvalResult.TRUE;
- } else
- matched=evalNonAnonymous(evalCtx, dnTypeURL);
+ {
+ matched = EnumEvalResult.TRUE;
+ }
+ }
+ else
+ {
+ matched=evalNonAnonymous(evalCtx, dnTypeURL);
+ }
}
return matched.getRet(type, undefined);
}
@@ -227,7 +232,10 @@
}
case SELF:
{
- if (clientDN.equals(resDN)) matched = EnumEvalResult.TRUE;
+ if (clientDN.equals(resDN))
+ {
+ matched = EnumEvalResult.TRUE;
+ }
break;
}
case PARENT:
@@ -235,7 +243,9 @@
DN parentDN = resDN.parent();
if ((parentDN != null) &&
(parentDN.equals(clientDN)))
- matched = EnumEvalResult.TRUE;
+ {
+ matched = EnumEvalResult.TRUE;
+ }
break;
}
case ALL:
@@ -254,7 +264,9 @@
{
DN dn = url.getBaseDN();
if (clientDN.equals(dn))
- matched = EnumEvalResult.TRUE;
+ {
+ matched = EnumEvalResult.TRUE;
+ }
else {
//This code handles the case where a root dn entry does
//not have bypass-acl privilege and the ACI bind rule
@@ -263,11 +275,17 @@
DN clientActualDN=
DirectoryServer.getActualRootBindDN(clientDN);
if(actualDN != null)
- dn=actualDN;
+ {
+ dn=actualDN;
+ }
if(clientActualDN != null)
- clientDN=clientActualDN;
+ {
+ clientDN=clientActualDN;
+ }
if(clientDN.equals(dn))
- matched=EnumEvalResult.TRUE;
+ {
+ matched=EnumEvalResult.TRUE;
+ }
}
} catch (DirectoryException ex) {
//TODO add message
@@ -319,11 +337,15 @@
SearchScope scope=url.getScope();
if(scope == SearchScope.WHOLE_SUBTREE) {
if(!evalCtx.getClientDN().isDescendantOf(urlDN))
- return EnumEvalResult.FALSE;
+ {
+ return EnumEvalResult.FALSE;
+ }
} else if(scope == SearchScope.SINGLE_LEVEL) {
DN parent=evalCtx.getClientDN().parent();
if((parent != null) && !parent.equals(urlDN))
- return EnumEvalResult.FALSE;
+ {
+ return EnumEvalResult.FALSE;
+ }
} else if(scope == SearchScope.SUBORDINATES) {
DN userDN = evalCtx.getClientDN();
if ((userDN.size() <= urlDN.size()) ||
@@ -332,11 +354,15 @@
}
} else {
if(!evalCtx.getClientDN().equals(urlDN))
- return EnumEvalResult.FALSE;
+ {
+ return EnumEvalResult.FALSE;
+ }
}
try {
if(filter.matchesEntry(evalCtx.getClientEntry()))
- ret=EnumEvalResult.TRUE;
+ {
+ ret=EnumEvalResult.TRUE;
+ }
} catch (DirectoryException ex) {
return EnumEvalResult.FALSE;
}
--
Gitblit v1.10.0