You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/03 23:36:53 UTC
svn commit: r1428649 - in
/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator:
DefaultPermissionEvaluator.java PermissionEvaluator.java
Author: olamy
Date: Thu Jan 3 22:36:52 2013
New Revision: 1428649
URL: http://svn.apache.org/viewvc?rev=1428649&view=rev
Log:
no need to use toString on a String
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.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/evaluator/DefaultPermissionEvaluator.java?rev=1428649&r1=1428648&r2=1428649&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java Thu Jan 3 22:36:52 2013
@@ -45,7 +45,7 @@ public class DefaultPermissionEvaluator
@Named(value = "userManager#configurable")
private UserManager userManager;
- public boolean evaluate( Permission permission, Object operation, Object resource, Object principal )
+ public boolean evaluate( Permission permission, String operation, String resource, String principal )
throws PermissionEvaluationException
{
String permissionResource = permission.getResource().getIdentifier();
@@ -59,7 +59,7 @@ public class DefaultPermissionEvaluator
{
try
{
- permissionResource = userManager.findUser( principal.toString() ).getUsername();
+ permissionResource = userManager.findUser( principal ).getUsername();
}
catch ( UserNotFoundException e )
{
@@ -73,7 +73,7 @@ public class DefaultPermissionEvaluator
}
// check if this permission applies to the operation at all
- if ( permission.getOperation().getName().equals( operation.toString() ) )
+ if ( permission.getOperation().getName().equals( operation ) )
{
// check if it is a global resource, if it is then since the operations match we return true
if ( Resource.GLOBAL.equals( permission.getResource().getIdentifier() ) )
@@ -89,7 +89,7 @@ public class DefaultPermissionEvaluator
// check if the resource identifier of the permission matches the resource we are checking against
// if it does then return true
- if ( permissionResource.equals( resource.toString() ) )
+ if ( permissionResource.equals( resource ) )
{
return true;
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.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/evaluator/PermissionEvaluator.java?rev=1428649&r1=1428648&r2=1428649&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java Thu Jan 3 22:36:52 2013
@@ -30,6 +30,6 @@ import org.apache.archiva.redback.rbac.P
*/
public interface PermissionEvaluator
{
- boolean evaluate( Permission permission, Object operation, Object resource, Object principal )
+ boolean evaluate( Permission permission, String operation, String resource, String principal )
throws PermissionEvaluationException;
}