You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/06/19 01:32:59 UTC
incubator-reef git commit: [REEF-371]: Fix violations of
EqualsHashCode checkstyle
Repository: incubator-reef
Updated Branches:
refs/heads/master 660ee805d -> 9f19b13b8
[REEF-371]: Fix violations of EqualsHashCode checkstyle
This addressed the issue by
* Adding getHash() methods where missing
JIRA:
[REEF-371](https://issues.apache.org/jira/browse/REEF-371)
Pull Request:
This closes #230
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/9f19b13b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/9f19b13b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/9f19b13b
Branch: refs/heads/master
Commit: 9f19b13b86f2eadbaab17e508fa8e1e6544b9d01
Parents: 660ee80
Author: Mariia Mykhailova <mi...@gmail.com>
Authored: Tue Jun 16 16:09:54 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Thu Jun 18 16:30:52 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/reef/client/LauncherStatus.java | 5 +++++
.../network/group/impl/GroupCommunicationMessage.java | 13 +++++++++++++
.../io/network/group/impl/task/NodeStructImpl.java | 6 +++++-
.../reef/tang/implementation/types/AbstractNode.java | 5 +++++
.../tang/implementation/types/ConstructorArgImpl.java | 7 +++++++
.../tang/implementation/types/ConstructorDefImpl.java | 9 +++++++++
6 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
index d983579..3d59e36 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
@@ -67,6 +67,11 @@ public final class LauncherStatus {
(other instanceof LauncherStatus && ((LauncherStatus) other).state == this.state);
}
+ @Override
+ public int hashCode() {
+ return state.hashCode();
+ }
+
/**
* Has the job completed?
*
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupCommunicationMessage.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupCommunicationMessage.java
index 294fb49..03c7ec8 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupCommunicationMessage.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupCommunicationMessage.java
@@ -164,4 +164,17 @@ public class GroupCommunicationMessage {
}
}
+
+ @Override
+ public int hashCode() {
+ int result = groupName.hashCode();
+ result = 31 * result + operName.hashCode();
+ result = 31 * result + msgType.hashCode();
+ result = 31 * result + from.hashCode();
+ result = 31 * result + srcVersion;
+ result = 31 * result + to.hashCode();
+ result = 31 * result + dstVersion;
+ result = 31 * result + Arrays.deepHashCode(data);
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/NodeStructImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/NodeStructImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/NodeStructImpl.java
index 2c2c3ec..87ea9c5 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/NodeStructImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/NodeStructImpl.java
@@ -93,6 +93,10 @@ public abstract class NodeStructImpl implements NodeStruct {
}
}
- public abstract boolean checkDead(final GroupCommunicationMessage gcm);
+ @Override
+ public int hashCode() {
+ return 31 * id.hashCode() + version;
+ }
+ public abstract boolean checkDead(final GroupCommunicationMessage gcm);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java
index 845471e..e706491 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java
@@ -80,6 +80,11 @@ public abstract class AbstractNode implements Node {
}
@Override
+ public int hashCode() {
+ return getFullName().hashCode();
+ }
+
+ @Override
public Node getParent() {
return parent;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java
index a9622ed..7297817 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorArgImpl.java
@@ -71,6 +71,13 @@ public class ConstructorArgImpl implements ConstructorArg {
}
@Override
+ public int hashCode() {
+ int result = type.hashCode();
+ result = 31 * result + (name != null ? name.hashCode() : 0);
+ return result;
+ }
+
+ @Override
public boolean isInjectionFuture() {
return isInjectionFuture;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9f19b13b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java
index 46b2655..ef3ff9e 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java
@@ -23,6 +23,8 @@ import org.apache.reef.tang.types.ClassNode;
import org.apache.reef.tang.types.ConstructorArg;
import org.apache.reef.tang.types.ConstructorDef;
+import java.util.Arrays;
+
public class ConstructorDefImpl<T> implements ConstructorDef<T> {
private final ConstructorArg[] args;
private final String className;
@@ -148,4 +150,11 @@ public class ConstructorDefImpl<T> implements ConstructorDef<T> {
public int compareTo(ConstructorDef<?> o) {
return toString().compareTo(o.toString());
}
+
+ @Override
+ public int hashCode() {
+ ConstructorArg[] argsSort = getArgs().clone();
+ Arrays.sort(argsSort);
+ return Arrays.hashCode(argsSort);
+ }
}