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/AciContainer.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
index c81cf7b..09bd8a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -256,9 +256,11 @@
             && operation instanceof SearchOperation)
         {
           hasGetEffectiveRightsControl = true;
-          if (getEffectiveRightsControl.getAuthzDN() == null)
+          if (getEffectiveRightsControl.getAuthzDN() == null) {
             this.authzid = getClientDN();
-          else this.authzid = getEffectiveRightsControl.getAuthzDN();
+          } else {
+            this.authzid = getEffectiveRightsControl.getAuthzDN();
+          }
           this.specificAttrs = getEffectiveRightsControl.getAttributes();
         }
 
@@ -268,13 +270,17 @@
         String allUserAttrs=
                   (String)operation.getAttachment(ALL_USER_ATTRS_MATCHED);
         if(allUserAttrs != null)
+        {
           evalAllAttributes |= ACI_USER_ATTR_STAR_MATCHED;
+        }
         //If an ACI evaluated because of an Targetattr="+", then the
         //AciHandler.maySend method signaled this via adding this attachment
         //string.
         String allOpAttrs=(String)operation.getAttachment(ALL_OP_ATTRS_MATCHED);
         if(allOpAttrs != null)
+        {
           evalAllAttributes |= ACI_OP_ATTR_PLUS_MATCHED;
+        }
       }
 
       //Reference the current authorization entry, so it can be put back
@@ -433,9 +439,10 @@
     /** {@inheritDoc} */
     @Override
     public String getDecidingAciName() {
-      if(this.decidingAci != null)
-         return this.decidingAci.getName();
-      else return null;
+      if(this.decidingAci != null) {
+        return this.decidingAci.getName();
+      }
+      return null;
     }
 
   /** {@inheritDoc} */
@@ -575,9 +582,13 @@
     @Override
     public DN getClientDN() {
       if(this.useAuthzid)
+      {
         return this.authzid;
+      }
       else if (this.authorizationEntry != null)
+      {
         return this.authorizationEntry.getName();
+      }
       return DN.rootDN();
     }
 
@@ -748,26 +759,46 @@
     @Override
     public String rightToString() {
       if(hasRights(ACI_SEARCH))
+      {
         return "search";
+      }
       else if(hasRights(ACI_COMPARE))
+      {
         return "compare";
+      }
       else if(hasRights(ACI_READ))
+      {
         return "read";
+      }
       else if(hasRights(ACI_DELETE))
+      {
         return "delete";
+      }
       else if(hasRights(ACI_ADD))
+      {
         return "add";
+      }
       else if(hasRights(ACI_WRITE))
+      {
         return "write";
+      }
       else if(hasRights(ACI_PROXY))
+      {
         return "proxy";
+      }
       else if(hasRights(ACI_IMPORT))
+      {
         return "import";
+      }
       else if(hasRights(ACI_EXPORT))
+      {
         return "export";
+      }
       else if(hasRights(ACI_WRITE) &&
               hasRights(ACI_SELF))
+      {
         return "selfwrite";
+      }
       return null;
   }
 
@@ -778,8 +809,11 @@
       if(v == ACI_FOUND_USER_ATTR_RULE) {
         evalAllAttributes |= ACI_FOUND_USER_ATTR_RULE;
         evalAllAttributes &= ~ACI_USER_ATTR_STAR_MATCHED;
-      } else
+      }
+      else
+      {
         evalAllAttributes |= ACI_USER_ATTR_STAR_MATCHED;
+      }
     }
   }
 
@@ -790,8 +824,11 @@
       if(v == ACI_FOUND_OP_ATTR_RULE) {
         evalAllAttributes |= ACI_FOUND_OP_ATTR_RULE;
         evalAllAttributes &= ~ACI_OP_ATTR_PLUS_MATCHED;
-      } else
+      }
+      else
+      {
         evalAllAttributes |= ACI_OP_ATTR_PLUS_MATCHED;
+      }
     }
   }
 
@@ -836,9 +873,13 @@
   @Override
   public void clearEvalAttributes(int v) {
     if(v == 0)
+    {
       evalAllAttributes=0;
+    }
     else
+    {
       evalAllAttributes &= ~v;
+    }
   }
 
   /** {@inheritDoc} */

--
Gitblit v1.10.0