X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FUrlAuthorizationRule.java;h=a31849685150c3a7ec2b38be3be0a2e3f2bb0cf7;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=0d22d1cad1cccc521c3af64fa40bc4051219ed74;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

diff --git a/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java b/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
index 0d22d1ca..a3184968 100644
--- a/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
+++ b/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
@@ -55,27 +55,27 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
     /**
      * Result that the rule will return in case there is a match. 
      */
-    private AuthorizationResult _result;
+    private AuthorizationResult result;
 
     /**
      * A condition which specifies which users the rule is for. 
      */
-    private UserCondition _userCondition; 
+    private UserCondition userCondition; 
 
     /**
      * Path the rule applies for. 
      */
-    private PathCondition _pathCondition;
+    private PathCondition pathCondition;
 
     /**
      * Resource class that the rule applies for. 
      */
-    private Class _resourceClass;
+    private Class resourceClass;
     
     /**
      * Operation that this rule is for. 
      */
-    private OperationCondition _operationCondition; 
+    private OperationCondition operationCondition; 
 
     /**
      * Constructs an authorization rule. 
@@ -91,11 +91,11 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
         if ( !aResult.equals(GRANTED) && !aResult.equals(DENIED)) {
             throw new IllegalArgumentException("Only GRANTED or DENIED may be used: " + aResult);
         }
-        _result = aResult;
-        _userCondition = aUserCondition; 
-        _pathCondition = aPathCondition;
-        _resourceClass = aResourceClass;
-        _operationCondition = aOperationCondition; 
+        result = aResult;
+        userCondition = aUserCondition; 
+        pathCondition = aPathCondition;
+        resourceClass = aResourceClass;
+        operationCondition = aOperationCondition; 
     }
     
     /**
@@ -103,11 +103,11 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      *
      */
     protected UrlAuthorizationRule(Class aResourceClass) { 
-        _result = null; 
-        _userCondition = null; 
-        _pathCondition = null; 
-        _resourceClass = aResourceClass; 
-        _operationCondition = null; 
+        result = null; 
+        userCondition = null; 
+        pathCondition = null; 
+        resourceClass = aResourceClass; 
+        operationCondition = null; 
     }
     
     /**
@@ -115,11 +115,11 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      *
      */
     protected UrlAuthorizationRule() { 
-        _result = null; 
-        _userCondition = null; 
-        _pathCondition = null; 
-        _resourceClass = null; 
-        _operationCondition = null; 
+        result = null; 
+        userCondition = null; 
+        pathCondition = null; 
+        resourceClass = null; 
+        operationCondition = null; 
     }
 
 
@@ -129,7 +129,7 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      * @see org.wamblee.security.authorization.AuthorizationRule#getSupportedTypes()
      */
     public Class[] getSupportedTypes() {
-        return new Class[] { _resourceClass };
+        return new Class[] { resourceClass };
     }
 
     /*
@@ -139,7 +139,7 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      *      org.wamblee.security.authorization.Operation)
      */
     public AuthorizationResult isAllowed(Object aResource, Operation anOperation, User aUser) {
-        if ( ! _resourceClass.isInstance(aResource)) { 
+        if ( ! resourceClass.isInstance(aResource)) { 
             return UNSUPPORTED_RESOURCE; 
         }
         String path = getResourcePath(aResource);
@@ -154,22 +154,22 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      * @return Authorization result, 
      */
     protected AuthorizationResult isAllowed(String aPath, Operation aOperation, User aUser) {
-        if ( ! _pathCondition.matches(aPath) ) {
+        if ( ! pathCondition.matches(aPath) ) {
             return UNDECIDED;
         }
-        if ( !_operationCondition.matches(aOperation) ) {
+        if ( !operationCondition.matches(aOperation) ) {
             return UNDECIDED; 
         }
-        if ( !_userCondition.matches(aUser)) {
+        if ( !userCondition.matches(aUser)) {
             return UNDECIDED;
         }
-        return _result; 
+        return result; 
     }
 
     /**
      * Gets the path of the resource. 
      * @param aResource Resource, guaranteed to be an instance of 
-     * {@link #_resourceClass}. 
+     * {@link #resourceClass}. 
      * @return Path of the resource. 
      */
     protected abstract String getResourcePath(Object aResource);
@@ -179,10 +179,10 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      */
     @Override
     public String toString() {
-        return "UrlAUthorizationRule(result = " + _result + 
-           ", pathCondition = " + _pathCondition + 
-           ", userCondition = " + _userCondition +   
-           ", resourceClass = " + _resourceClass + ")";  
+        return "UrlAUthorizationRule(result = " + result + 
+           ", pathCondition = " + pathCondition + 
+           ", userCondition = " + userCondition +   
+           ", resourceClass = " + resourceClass + ")";  
     }
     
     /**
@@ -190,10 +190,10 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      * @return Result. 
      */
     protected String getAuthorizationResultString() {
-        if ( _result == null ) { 
+        if ( result == null ) { 
             return null; 
         }
-        return _result.toString(); 
+        return result.toString(); 
     }
     
     /**
@@ -201,19 +201,19 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
      * @param aResult Result. 
      */
     protected void setAuthorizationResultString(String aResult) {
-        _result = AuthorizationResult.valueOf(aResult);
+        result = AuthorizationResult.valueOf(aResult);
     }
     
     protected String getResourceClassName() {
-        if ( _resourceClass == null ) { 
+        if ( resourceClass == null ) { 
             return "";
         }
-        return _resourceClass.getName(); 
+        return resourceClass.getName(); 
     }
     
     protected void setResourceClassName(String aResourceClass) { 
         try {
-            _resourceClass = Class.forName(aResourceClass);
+            resourceClass = Class.forName(aResourceClass);
         } catch (ClassNotFoundException e) {
            LOGGER.error("Cannot find resource class '" + aResourceClass + "'", e); 
            throw new IllegalArgumentException(e.getMessage(), e);
@@ -221,44 +221,44 @@ public abstract class UrlAuthorizationRule extends AbstractPersistent implements
     }
 
     /**
-     * @return Returns the _operationCondition.
+     * @return Returns the operationCondition.
      */
     public OperationCondition getOperationCondition() {
-        return _operationCondition;
+        return operationCondition;
     }
 
     /**
-     * @param aOperationCondition The _operationCondition to set.
+     * @param aOperationCondition The operationCondition to set.
      */
     protected void setOperationCondition(OperationCondition aOperationCondition) {
-        _operationCondition = aOperationCondition;
+        operationCondition = aOperationCondition;
     }
 
     /**
-     * @return Returns the _pathCondition.
+     * @return Returns the pathCondition.
      */
     public PathCondition getPathCondition() {
-        return _pathCondition;
+        return pathCondition;
     }
 
     /**
-     * @param aPathCondition The _pathCondition to set.
+     * @param aPathCondition The pathCondition to set.
      */
     protected void setPathCondition(PathCondition aPathCondition) {
-        _pathCondition = aPathCondition;
+        pathCondition = aPathCondition;
     }
 
     /**
-     * @return Returns the _userCondition.
+     * @return Returns the userCondition.
      */
     public UserCondition getUserCondition() {
-        return _userCondition;
+        return userCondition;
     }
 
     /**
-     * @param aUserCondition The _userCondition to set.
+     * @param aUserCondition The userCondition to set.
      */
     protected void setUserCondition(UserCondition aUserCondition) {
-        _userCondition = aUserCondition;
+        userCondition = aUserCondition;
     }
 }