svn commit: r1398203 - in /archiva/redback/redback-core/trunk: redback-configuration/src/main/java/org/apache/archiva/redback/configuration/ redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/

[olamy]

Author: olamy
Date: Mon Oct 15 07:25:40 2012
New Revision: 1398203

URL: http://svn.apache.org/viewvc?rev=1398203&view=rev
Log:
simplify code

Modified:
    
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
    
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java

Modified: 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java?rev=1398203&r1=1398202&r2=1398203&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
 Mon Oct 15 07:25:40 2012
@@ -94,10 +94,8 @@ public class UserConfiguration
 
         lookupRegistry = registry.getSubset( PREFIX );
 
-        if ( log.isDebugEnabled() )
-        {
-            log.debug( lookupRegistry.dump() );
-        }
+        log.debug("User configuration {}", lookupRegistry.dump() );
+
     }
 
     private void performLegacyInitialization()

Modified: 
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java?rev=1398203&r1=1398202&r2=1398203&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
 Mon Oct 15 07:25:40 2012
@@ -19,10 +19,6 @@ package org.apache.archiva.redback.autho
  * under the License.
  */
 
-import org.apache.archiva.redback.rbac.Permission;
-import org.apache.archiva.redback.rbac.RBACManager;
-import org.apache.archiva.redback.rbac.RbacManagerException;
-import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.authorization.AuthorizationDataSource;
 import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.authorization.AuthorizationResult;
@@ -30,16 +26,19 @@ import org.apache.archiva.redback.author
 import org.apache.archiva.redback.authorization.NotAuthorizedException;
 import 
org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluationException;
 import 
org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluator;
+import org.apache.archiva.redback.rbac.Permission;
+import org.apache.archiva.redback.rbac.RBACManager;
+import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
+import org.apache.archiva.redback.users.UserNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -47,20 +46,19 @@ import java.util.Map;
  * RbacAuthorizer:
  *
  * @author Jesse McConnell <jmcconn...@apache.org>
- *
  */
-@Service( "authorizer#rbac" )
+@Service ( "authorizer#rbac" )
 public class RbacAuthorizer
     implements Authorizer
 {
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named ( value = "rBACManager#cached" )
     private RBACManager manager;
 
     @Inject
-    @Named( value = "userManager#configurable" )
+    @Named ( value = "userManager#configurable" )
     private UserManager userManager;
 
     @Inject
@@ -94,12 +92,10 @@ public class RbacAuthorizer
                 {
                     for ( Permission permission : permissionMap.get( 
operation.toString() ) )
                     {
-                        if ( log.isDebugEnabled() )
-                        {
-                            log.debug( "checking permission {} for operation 
{} resource {}",
-                                       Arrays.asList( permission != null ? 
permission.getName() : "null", operation,
-                                                      resource ).toArray() );
-                        }
+
+                        log.debug( "checking permission {} for operation {} 
resource {}",
+                                   ( permission != null ? permission.getName() 
: "null" ), operation, resource );
+
                         if ( evaluator.evaluate( permission, operation, 
resource, principal ) )
                         {
                             return new AuthorizationResult( true, permission, 
null );