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/AciTargets.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 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 001e366..f2b86ee 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
@@ -398,13 +398,21 @@
     private static SearchScope createScope(String expression)
     throws AciException {
         if(expression.equalsIgnoreCase("base"))
-                return SearchScope.BASE_OBJECT;
+        {
+          return SearchScope.BASE_OBJECT;
+        }
         else if(expression.equalsIgnoreCase("onelevel"))
-            return SearchScope.SINGLE_LEVEL;
+        {
+          return SearchScope.SINGLE_LEVEL;
+        }
         else if(expression.equalsIgnoreCase("subtree"))
-            return SearchScope.WHOLE_SUBTREE;
+        {
+          return SearchScope.WHOLE_SUBTREE;
+        }
         else if(expression.equalsIgnoreCase("subordinate"))
-            return SearchScope.SUBORDINATES;
+        {
+          return SearchScope.SUBORDINATES;
+        }
         else {
             LocalizableMessage message =
                 WARN_ACI_SYNTAX_INVALID_TARGETSCOPE_EXPRESSION.get(expression);
@@ -472,12 +480,16 @@
                 targAttrFilters.hasMask(TARGATTRFILTERS_ADD)) ||
               (matchCtx.hasRights(ACI_DELETE) &&
                targAttrFilters.hasMask(TARGATTRFILTERS_DELETE)))
-                ret=targAttrFilters.isApplicableAddDel(matchCtx);
+            {
+              ret=targAttrFilters.isApplicableAddDel(matchCtx);
+            }
             else if((matchCtx.hasRights(ACI_WRITE_ADD) &&
                      targAttrFilters.hasMask(TARGATTRFILTERS_ADD)) ||
                     (matchCtx.hasRights(ACI_WRITE_DELETE) &&
                     targAttrFilters.hasMask(TARGATTRFILTERS_DELETE)))
-                ret=targAttrFilters.isApplicableMod(matchCtx, aci);
+            {
+              ret=targAttrFilters.isApplicableMod(matchCtx, aci);
+            }
         }
         return ret;
     }
@@ -519,7 +531,9 @@
             }
             if (isFirstAttr && targetAttr == null
                 && aci.getTargets().getTargAttrFilters() == null)
-                targetMatchCtx.setEntryTestRule(true);
+            {
+              targetMatchCtx.setEntryTestRule(true);
+            }
         }
         return ret;
     }
@@ -583,13 +597,17 @@
                 (!targets.getTarget().isPattern())) {
             EnumTargetOperator op=targets.getTarget().getOperator();
             if(op != EnumTargetOperator.NOT_EQUALITY)
-                targetDN=targets.getTarget().getDN();
+            {
+              targetDN=targets.getTarget().getDN();
+            }
         }
         //Check if the scope is correct.
         switch(targets.getTargetScope().asEnum()) {
         case BASE_OBJECT:
             if(!targetDN.equals(entryDN))
-                return false;
+            {
+              return false;
+            }
             break;
         case SINGLE_LEVEL:
             /*
@@ -599,11 +617,15 @@
              * Non-standard interpretation of onelevel in ACI targetScope.
              */
             if(!targetDN.equals(entryDN.parent()))
-                return false;
+            {
+              return false;
+            }
             break;
         case WHOLE_SUBTREE:
             if(!entryDN.isDescendantOf(targetDN))
-                return false;
+            {
+              return false;
+            }
             break;
         case SUBORDINATES:
             if ((entryDN.size() <= targetDN.size()) ||
@@ -625,7 +647,9 @@
             if(op == EnumTargetOperator.NOT_EQUALITY) {
                 DN tmpDN=targets.getTarget().getDN();
                 if(entryDN.isDescendantOf(tmpDN))
-                    return false;
+                {
+                  return false;
+                }
             }
         }
         /*
@@ -638,7 +662,9 @@
             final boolean ret = targets.getTarget().matchesPattern(entryDN);
             EnumTargetOperator op=targets.getTarget().getOperator();
             if(op == EnumTargetOperator.NOT_EQUALITY)
-                return !ret;
+            {
+              return !ret;
+            }
             return ret;
         }
         return true;
@@ -676,14 +702,22 @@
         */
         if(ret && targetAttr.isAllUserAttributes() &&
                 !ctx.hasEvalUserAttributes())
+        {
           ctx.setEvalUserAttributes(ACI_USER_ATTR_STAR_MATCHED);
+        }
         else
+        {
           ctx.setEvalUserAttributes(ACI_FOUND_USER_ATTR_RULE);
+        }
 
         if(ret && targetAttr.isAllOpAttributes() &&
                 !ctx.hasEvalOpAttributes())
+        {
           ctx.setEvalOpAttributes(ACI_OP_ATTR_PLUS_MATCHED);
+        }
         else
+        {
           ctx.setEvalOpAttributes(ACI_FOUND_OP_ATTR_RULE);
+        }
     }
 }

--
Gitblit v1.10.0