Updated Branches: refs/heads/trunk a9ec0acf3 -> 87d5c019c
Get rid of redundant this references in equals() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b248b1ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b248b1ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b248b1ae Branch: refs/heads/trunk Commit: b248b1ae390bcbe81724c499882435a4a5eda4d8 Parents: 233ad18 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Sep 8 19:40:38 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Sep 8 19:40:38 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/AuthenticatedUser.java | 2 +- src/java/org/apache/cassandra/auth/DataResource.java | 6 +++--- src/java/org/apache/cassandra/auth/PermissionDetails.java | 6 +++--- src/java/org/apache/cassandra/config/TriggerDefinition.java | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b248b1ae/src/java/org/apache/cassandra/auth/AuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java index f834878..e142acf 100644 --- a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java +++ b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java @@ -75,7 +75,7 @@ public class AuthenticatedUser AuthenticatedUser u = (AuthenticatedUser) o; - return Objects.equal(this.name, u.name); + return Objects.equal(name, u.name); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/b248b1ae/src/java/org/apache/cassandra/auth/DataResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/DataResource.java b/src/java/org/apache/cassandra/auth/DataResource.java index 35812e5..6aa8add 100644 --- a/src/java/org/apache/cassandra/auth/DataResource.java +++ b/src/java/org/apache/cassandra/auth/DataResource.java @@ -235,9 +235,9 @@ public class DataResource implements IResource DataResource ds = (DataResource) o; - return Objects.equal(this.level, ds.level) - && Objects.equal(this.keyspace, ds.keyspace) - && Objects.equal(this.columnFamily, ds.columnFamily); + return Objects.equal(level, ds.level) + && Objects.equal(keyspace, ds.keyspace) + && Objects.equal(columnFamily, ds.columnFamily); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/b248b1ae/src/java/org/apache/cassandra/auth/PermissionDetails.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/PermissionDetails.java b/src/java/org/apache/cassandra/auth/PermissionDetails.java index c13ec4b..b2b4512 100644 --- a/src/java/org/apache/cassandra/auth/PermissionDetails.java +++ b/src/java/org/apache/cassandra/auth/PermissionDetails.java @@ -66,9 +66,9 @@ public class PermissionDetails implements Comparable<PermissionDetails> return false; PermissionDetails pd = (PermissionDetails) o; - return Objects.equal(this.username, pd.username) - && Objects.equal(this.resource, pd.resource) - && Objects.equal(this.permission, pd.permission); + return Objects.equal(username, pd.username) + && Objects.equal(resource, pd.resource) + && Objects.equal(permission, pd.permission); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/b248b1ae/src/java/org/apache/cassandra/config/TriggerDefinition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/TriggerDefinition.java b/src/java/org/apache/cassandra/config/TriggerDefinition.java index 699c163..69e06b1 100644 --- a/src/java/org/apache/cassandra/config/TriggerDefinition.java +++ b/src/java/org/apache/cassandra/config/TriggerDefinition.java @@ -148,8 +148,7 @@ public class TriggerDefinition TriggerDefinition td = (TriggerDefinition) o; - return Objects.equal(this.name, td.name) - && Objects.equal(this.classOption, td.classOption); + return Objects.equal(name, td.name) && Objects.equal(classOption, td.classOption); } @Override