Author: olamy
Date: Thu Jan 3 00:15:37 2013
New Revision: 1428124
URL: http://svn.apache.org/viewvc?rev=1428124&view=rev
Log:
this return a String so no need to do toString on Object
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
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=1428124&r1=1428123&r2=1428124&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
Thu Jan 3 00:15:37 2013
@@ -78,20 +78,20 @@ public class RbacAuthorizer
public AuthorizationResult isAuthorized( AuthorizationDataSource source )
throws AuthorizationException
{
- Object principal = source.getPrincipal();
- Object operation = source.getPermission();
- Object resource = source.getResource();
+ String principal = source.getPrincipal();
+ String operation = source.getPermission();
+ String resource = source.getResource();
try
{
if ( principal != null )
{
// Set permissions = manager.getAssignedPermissions(
principal.toString(), operation );
- Map<String, List<Permission>> permissionMap =
manager.getAssignedPermissionMap( principal.toString() );
+ Map<String, List<Permission>> permissionMap =
manager.getAssignedPermissionMap( principal );
- if ( permissionMap.keySet().contains( operation.toString() ) )
+ if ( permissionMap.keySet().contains( operation ) )
{
- for ( Permission permission : permissionMap.get(
operation.toString() ) )
+ for ( Permission permission : permissionMap.get( operation
) )
{
log.debug( "checking permission {} for operation {}
resource {}",
@@ -103,11 +103,11 @@ public class RbacAuthorizer
}
}
- log.debug( "no permission found for operation {} resource
{}", operation.toString(), resource );
+ log.debug( "no permission found for operation {} resource
{}", operation, resource );
}
else
{
- log.debug( "permission map does not contain operation:
{}", operation.toString() );
+ log.debug( "permission map does not contain operation:
{}", operation );
}
}
// check if guest user is enabled, if so check the global
permissions
@@ -118,9 +118,9 @@ public class RbacAuthorizer
// Set permissions = manager.getAssignedPermissions(
principal.toString(), operation );
Map<String, List<Permission>> permissionMap =
manager.getAssignedPermissionMap( guest.getUsername() );
- if ( permissionMap.keySet().contains( operation.toString() ) )
+ if ( permissionMap.keySet().contains( operation ) )
{
- for ( Permission permission : permissionMap.get(
operation.toString() ) )
+ for ( Permission permission : permissionMap.get( operation
) )
{
log.debug( "checking permission {}",
permission.getName() );
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java?rev=1428124&r1=1428123&r2=1428124&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
Thu Jan 3 00:15:37 2013
@@ -40,9 +40,9 @@ public class MemoryAuthorizer
public AuthorizationResult isAuthorized( AuthorizationDataSource source )
throws AuthorizationException
{
- Object principal = source.getPrincipal();
+ String principal = source.getPrincipal();
- Object permission = source.getPermission();
+ String permission = source.getPermission();
// TODO: Actually use a real permission!
if ( "foo".equals( permission.toString() ) )
