You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/21 21:44:15 UTC
[16/50] [abbrv] git commit: use guava equals/hashCode
use guava equals/hashCode
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/aabcd584
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/aabcd584
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/aabcd584
Branch: refs/heads/master
Commit: aabcd5846010ff0bc5832520bf8f59e9879728cc
Parents: 48f6840
Author: wurstmeister <wu...@users.noreply.github.com>
Authored: Sun Jan 26 21:32:13 2014 +0000
Committer: wurstmeister <wu...@users.noreply.github.com>
Committed: Sun Jan 26 21:34:54 2014 +0000
----------------------------------------------------------------------
src/jvm/storm/kafka/Broker.java | 17 +++++++++----
.../trident/GlobalPartitionInformation.java | 26 +++++++-------------
2 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/aabcd584/src/jvm/storm/kafka/Broker.java
----------------------------------------------------------------------
diff --git a/src/jvm/storm/kafka/Broker.java b/src/jvm/storm/kafka/Broker.java
index 66e6112..2451eee 100644
--- a/src/jvm/storm/kafka/Broker.java
+++ b/src/jvm/storm/kafka/Broker.java
@@ -1,6 +1,7 @@
package storm.kafka;
import java.io.Serializable;
+import com.google.common.base.Objects;
public class Broker implements Serializable, Comparable<Broker> {
public final String host;
@@ -16,14 +17,20 @@ public class Broker implements Serializable, Comparable<Broker> {
}
@Override
- public boolean equals(Object o) {
- Broker other = (Broker) o;
- return host.equals(other.host) && port == other.port;
+ public int hashCode() {
+ return Objects.hashCode(host, port);
}
@Override
- public int hashCode() {
- return host.hashCode();
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final Broker other = (Broker) obj;
+ return Objects.equal(this.host, other.host) && Objects.equal(this.port, other.port);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/aabcd584/src/jvm/storm/kafka/trident/GlobalPartitionInformation.java
----------------------------------------------------------------------
diff --git a/src/jvm/storm/kafka/trident/GlobalPartitionInformation.java b/src/jvm/storm/kafka/trident/GlobalPartitionInformation.java
index e73d6b0..6f82f62 100644
--- a/src/jvm/storm/kafka/trident/GlobalPartitionInformation.java
+++ b/src/jvm/storm/kafka/trident/GlobalPartitionInformation.java
@@ -1,12 +1,13 @@
package storm.kafka.trident;
import storm.kafka.Broker;
-import storm.kafka.Broker;
import storm.kafka.Partition;
import java.io.Serializable;
import java.util.*;
+import com.google.common.base.Objects;
+
/**
* Date: 14/05/2013
* Time: 19:18
@@ -67,27 +68,18 @@ public class GlobalPartitionInformation implements Iterable<Partition>, Serializ
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((partitionMap == null) ? 0 : partitionMap.hashCode());
- return result;
+ return Objects.hashCode(partitionMap);
}
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- GlobalPartitionInformation other = (GlobalPartitionInformation) obj;
- if (partitionMap == null) {
- if (other.partitionMap != null)
- return false;
- } else if (!partitionMap.equals(other.partitionMap))
+ }
+ if (obj == null || getClass() != obj.getClass()) {
return false;
- return true;
+ }
+ final GlobalPartitionInformation other = (GlobalPartitionInformation) obj;
+ return Objects.equal(this.partitionMap, other.partitionMap);
}
}