Repository: cassandra Updated Branches: refs/heads/trunk c37e7bfbb -> b5a232b04
truth in advertising define parm types based on what is actually needed for the method to function Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5a232b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5a232b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5a232b0 Branch: refs/heads/trunk Commit: b5a232b04eb61fef4d722dae67147f686e07b503 Parents: c37e7bf Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu Dec 25 15:30:33 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu Dec 25 15:30:33 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 6 +++--- .../org/apache/cassandra/cql3/statements/GrantStatement.java | 4 ++-- .../cassandra/cql3/statements/ListPermissionsStatement.java | 4 ++-- .../cassandra/cql3/statements/PermissionAlteringStatement.java | 4 ++-- .../org/apache/cassandra/cql3/statements/RevokeStatement.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a232b0/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 2a6e6d0..cfe274e 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -810,7 +810,7 @@ grantStatement returns [GrantStatement stmt] resource K_TO username - { $stmt = new GrantStatement($permissionOrAll.perms, $resource.res, $username.text); } + { $stmt = new GrantStatement($permissionOrAll.perms, (DataResource) $resource.res, $username.text); } ; /** @@ -823,7 +823,7 @@ revokeStatement returns [RevokeStatement stmt] resource K_FROM username - { $stmt = new RevokeStatement($permissionOrAll.perms, $resource.res, $username.text); } + { $stmt = new RevokeStatement($permissionOrAll.perms, (DataResource) $resource.res, $username.text); } ; listPermissionsStatement returns [ListPermissionsStatement stmt] @@ -837,7 +837,7 @@ listPermissionsStatement returns [ListPermissionsStatement stmt] ( K_ON resource { resource = $resource.res; } )? ( K_OF username { username = $username.text; } )? ( K_NORECURSIVE { recursive = false; } )? - { $stmt = new ListPermissionsStatement($permissionOrAll.perms, resource, username, recursive); } + { $stmt = new ListPermissionsStatement($permissionOrAll.perms, (DataResource) resource, username, recursive); } ; permission returns [Permission perm] http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a232b0/src/java/org/apache/cassandra/cql3/statements/GrantStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/GrantStatement.java b/src/java/org/apache/cassandra/cql3/statements/GrantStatement.java index 67b651c..aabde5d 100644 --- a/src/java/org/apache/cassandra/cql3/statements/GrantStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/GrantStatement.java @@ -20,7 +20,7 @@ package org.apache.cassandra.cql3.statements; import java.util.Set; -import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestExecutionException; @@ -30,7 +30,7 @@ import org.apache.cassandra.transport.messages.ResultMessage; public class GrantStatement extends PermissionAlteringStatement { - public GrantStatement(Set<Permission> permissions, IResource resource, String username) + public GrantStatement(Set<Permission> permissions, DataResource resource, String username) { super(permissions, resource, username); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a232b0/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java b/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java index d8db871..eaae2c6 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ListPermissionsStatement.java @@ -52,10 +52,10 @@ public class ListPermissionsStatement extends AuthorizationStatement private final String username; private final boolean recursive; - public ListPermissionsStatement(Set<Permission> permissions, IResource resource, String username, boolean recursive) + public ListPermissionsStatement(Set<Permission> permissions, DataResource resource, String username, boolean recursive) { this.permissions = permissions; - this.resource = (DataResource) resource; + this.resource = resource; this.username = username; this.recursive = recursive; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a232b0/src/java/org/apache/cassandra/cql3/statements/PermissionAlteringStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/PermissionAlteringStatement.java b/src/java/org/apache/cassandra/cql3/statements/PermissionAlteringStatement.java index 5f3b70c..8784930 100644 --- a/src/java/org/apache/cassandra/cql3/statements/PermissionAlteringStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/PermissionAlteringStatement.java @@ -34,10 +34,10 @@ public abstract class PermissionAlteringStatement extends AuthorizationStatement protected DataResource resource; protected final String username; - protected PermissionAlteringStatement(Set<Permission> permissions, IResource resource, String username) + protected PermissionAlteringStatement(Set<Permission> permissions, DataResource resource, String username) { this.permissions = permissions; - this.resource = (DataResource) resource; + this.resource = resource; this.username = username; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a232b0/src/java/org/apache/cassandra/cql3/statements/RevokeStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/RevokeStatement.java b/src/java/org/apache/cassandra/cql3/statements/RevokeStatement.java index e81a385..6f8ccd1 100644 --- a/src/java/org/apache/cassandra/cql3/statements/RevokeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/RevokeStatement.java @@ -20,7 +20,7 @@ package org.apache.cassandra.cql3.statements; import java.util.Set; -import org.apache.cassandra.auth.IResource; +import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestExecutionException; @@ -30,7 +30,7 @@ import org.apache.cassandra.transport.messages.ResultMessage; public class RevokeStatement extends PermissionAlteringStatement { - public RevokeStatement(Set<Permission> permissions, IResource resource, String username) + public RevokeStatement(Set<Permission> permissions, DataResource resource, String username) { super(permissions, resource, username); }
