Repository: cassandra Updated Branches: refs/heads/trunk 65fb17a88 -> d26f142b3
Remove type parameter from AuthCacheMBean interface Patch by Sam Tunnicliffe; reviewed by Kurt Greaves for CASSANDRA-14687 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d26f142b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d26f142b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d26f142b Branch: refs/heads/trunk Commit: d26f142b34681d047fe010c8ec9097add0b44d2a Parents: 65fb17a Author: Sam Tunnicliffe <s...@beobal.com> Authored: Mon Sep 3 19:36:19 2018 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue Sep 4 12:32:35 2018 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/AuthCache.java | 2 +- src/java/org/apache/cassandra/auth/AuthCacheMBean.java | 4 +--- src/java/org/apache/cassandra/auth/NetworkAuthCache.java | 1 - src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d26f142b/src/java/org/apache/cassandra/auth/AuthCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/AuthCache.java b/src/java/org/apache/cassandra/auth/AuthCache.java index 4f36a63..3adf914 100644 --- a/src/java/org/apache/cassandra/auth/AuthCache.java +++ b/src/java/org/apache/cassandra/auth/AuthCache.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; -public class AuthCache<K, V> implements AuthCacheMBean<K> +public class AuthCache<K, V> implements AuthCacheMBean { private static final Logger logger = LoggerFactory.getLogger(AuthCache.class); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d26f142b/src/java/org/apache/cassandra/auth/AuthCacheMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/AuthCacheMBean.java b/src/java/org/apache/cassandra/auth/AuthCacheMBean.java index 1416044..43fb88e 100644 --- a/src/java/org/apache/cassandra/auth/AuthCacheMBean.java +++ b/src/java/org/apache/cassandra/auth/AuthCacheMBean.java @@ -18,12 +18,10 @@ package org.apache.cassandra.auth; -public interface AuthCacheMBean<T> +public interface AuthCacheMBean { public void invalidate(); - public void invalidate(T t); - public void setValidity(int validityPeriod); public int getValidity(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d26f142b/src/java/org/apache/cassandra/auth/NetworkAuthCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/NetworkAuthCache.java b/src/java/org/apache/cassandra/auth/NetworkAuthCache.java index 0991889..6b3c74e 100644 --- a/src/java/org/apache/cassandra/auth/NetworkAuthCache.java +++ b/src/java/org/apache/cassandra/auth/NetworkAuthCache.java @@ -34,5 +34,4 @@ public class NetworkAuthCache extends AuthCache<RoleResource, DCPermissions> authorizer::authorize, () -> DatabaseDescriptor.getAuthenticator().requireAuthentication()); } - } http://git-wip-us.apache.org/repos/asf/cassandra/blob/d26f142b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java index b10136e..27a68a0 100644 --- a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java @@ -228,7 +228,7 @@ public class PasswordAuthenticator implements IAuthenticator } } - private static class CredentialsCache extends AuthCache<String, String> + private static class CredentialsCache extends AuthCache<String, String> implements CredentialsCacheMBean { private CredentialsCache(PasswordAuthenticator authenticator) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org