svn commit: r1645951 - /tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java

[markt]

Author: markt
Date: Tue Dec 16 13:53:06 2014
New Revision: 1645951

URL: http://svn.apache.org/r1645951
Log:
Clean-up. No functional change.

Modified:
    tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1645951&r1=1645950&r2=1645951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Tue Dec 
16 13:53:06 2014
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.realm;
 
-
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.List;
@@ -28,7 +25,6 @@ import javax.security.auth.login.LoginCo
 import org.apache.catalina.TomcatPrincipal;
 import org.ietf.jgss.GSSCredential;
 
-
 /**
  * Generic implementation of <strong>java.security.Principal</strong> that
  * is available for use by <code>Realm</code> implementations.
@@ -37,7 +33,6 @@ import org.ietf.jgss.GSSCredential;
  */
 public class GenericPrincipal implements TomcatPrincipal {
 
-
     // ----------------------------------------------------------- Constructors
 
     /**
@@ -112,16 +107,16 @@ public class GenericPrincipal implements
             this.roles = new String[0];
         } else {
             this.roles = roles.toArray(new String[roles.size()]);
-            if (this.roles.length > 1)
+            if (this.roles.length > 1) {
                 Arrays.sort(this.roles);
+            }
         }
         this.loginContext = loginContext;
         this.gssCredential = gssCredential;
     }
 
 
-    // ------------------------------------------------------------- Properties
-
+    // -------------------------------------------------------------- 
Properties
 
     /**
      * The username of the user represented by this Principal.
@@ -130,7 +125,7 @@ public class GenericPrincipal implements
 
     @Override
     public String getName() {
-        return (this.name);
+        return this.name;
     }
 
 
@@ -141,7 +136,7 @@ public class GenericPrincipal implements
     protected final String password;
 
     public String getPassword() {
-        return (this.password);
+        return this.password;
     }
 
 
@@ -151,7 +146,7 @@ public class GenericPrincipal implements
     protected final String roles[];
 
     public String[] getRoles() {
-        return (this.roles);
+        return this.roles;
     }
 
 
@@ -190,22 +185,26 @@ public class GenericPrincipal implements
         this.gssCredential = gssCredential;
     }
 
-    // --------------------------------------------------------- Public Methods
 
+    // ---------------------------------------------------------- Public 
Methods
 
     /**
      * Does the user represented by this Principal possess the specified role?
      *
      * @param role Role to be tested
+     *
+     * @return <code>true</code> if this Principal has been assigned the given
+     *         role, otherwise <code>false</code>
      */
     public boolean hasRole(String role) {
 
-        if("*".equals(role)) // Special 2.4 role meaning everyone
+        if ("*".equals(role)) {// Special 2.4 role meaning everyone
             return true;
-        if (role == null)
-            return (false);
-        return (Arrays.binarySearch(roles, role) >= 0);
-
+        }
+        if (role == null) {
+            return false;
+        }
+        return Arrays.binarySearch(roles, role) >= 0;
     }
 
 
@@ -215,16 +214,14 @@ public class GenericPrincipal implements
      */
     @Override
     public String toString() {
-
         StringBuilder sb = new StringBuilder("GenericPrincipal[");
         sb.append(this.name);
         sb.append("(");
-        for( int i=0;i<roles.length; i++ ) {
+        for (int i = 0; i < roles.length; i++ ) {
             sb.append( roles[i]).append(",");
         }
         sb.append(")]");
-        return (sb.toString());
-
+        return sb.toString();
     }
 
 
@@ -244,7 +241,4 @@ public class GenericPrincipal implements
             loginContext.logout();
         }
     }
-
-
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org