You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/03/14 14:48:15 UTC
[ignite-teamcity-bot] branch master updated: Removal of guava
objects usage for equals/hash code & code commenting
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 5cd5df2 Removal of guava objects usage for equals/hash code & code commenting
5cd5df2 is described below
commit 5cd5df2e89897a2fc393b4757482104b6bde1230
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Mar 14 17:48:12 2019 +0300
Removal of guava objects usage for equals/hash code & code commenting
---
.../apache/ignite/ci/analysis/TestInBranch.java | 17 +++++++-----
.../org/apache/ignite/ci/github/GitHubBranch.java | 15 +++++++----
.../org/apache/ignite/ci/github/GitHubUser.java | 8 +++---
.../org/apache/ignite/ci/github/PullRequest.java | 30 +++++++++++++---------
4 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestInBranch.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestInBranch.java
index 6bb6990..d871a06 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestInBranch.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestInBranch.java
@@ -18,10 +18,8 @@
package org.apache.ignite.ci.analysis;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import org.apache.ignite.ci.db.Persisted;
+import java.util.Objects;
-@Persisted
public class TestInBranch implements Comparable<TestInBranch> {
public String name;
@@ -32,6 +30,7 @@ public class TestInBranch implements Comparable<TestInBranch> {
this.branch = branch;
}
+ /** {@inheritDoc} */
@Override public int compareTo(TestInBranch o) {
int runConfCompare = name.compareTo(o.name);
if (runConfCompare != 0)
@@ -39,20 +38,26 @@ public class TestInBranch implements Comparable<TestInBranch> {
return branch.compareTo(o.branch);
}
+ /** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o)
return true;
+
if (o == null || getClass() != o.getClass())
return false;
+
TestInBranch branch1 = (TestInBranch)o;
- return Objects.equal(name, branch1.name) &&
- Objects.equal(branch, branch1.branch);
+
+ return Objects.equals(name, branch1.name) &&
+ Objects.equals(branch, branch1.branch);
}
+ /** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(name, branch);
+ return Objects.hash(name, branch);
}
+ /** {@inheritDoc} */
@Override public String toString() {
return MoreObjects.toStringHelper(this)
.add("name", name)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubBranch.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubBranch.java
index 0b4e332..931dd30 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubBranch.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubBranch.java
@@ -16,11 +16,16 @@
*/
package org.apache.ignite.ci.github;
-import com.google.common.base.Objects;
+import java.util.Objects;
public class GitHubBranch {
+ /** Label. */
private String label;
+
+ /** Branch name. */
private String ref;
+
+ /** Sha of latest commit. */
private String sha;
/** {@inheritDoc} */
@@ -30,14 +35,14 @@ public class GitHubBranch {
if (o == null || getClass() != o.getClass())
return false;
GitHubBranch branch = (GitHubBranch)o;
- return Objects.equal(label, branch.label) &&
- Objects.equal(ref, branch.ref) &&
- Objects.equal(sha, branch.sha);
+ return Objects.equals(label, branch.label) &&
+ Objects.equals(ref, branch.ref) &&
+ Objects.equals(sha, branch.sha);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(label, ref, sha);
+ return Objects.hash(label, ref, sha);
}
public String ref() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubUser.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubUser.java
index 3157acc..44f7594 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubUser.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubUser.java
@@ -16,8 +16,8 @@
*/
package org.apache.ignite.ci.github;
-import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
+import java.util.Objects;
public class GitHubUser {
@SerializedName("login") private String login;
@@ -45,12 +45,12 @@ public class GitHubUser {
if (o == null || getClass() != o.getClass())
return false;
GitHubUser user = (GitHubUser)o;
- return Objects.equal(login, user.login) &&
- Objects.equal(avatarUrl, user.avatarUrl);
+ return Objects.equals(login, user.login) &&
+ Objects.equals(avatarUrl, user.avatarUrl);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(login, avatarUrl);
+ return Objects.hash(login, avatarUrl);
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
index 75c04cd..3f71962 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
@@ -18,9 +18,9 @@
package org.apache.ignite.ci.github;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.gson.annotations.SerializedName;
+import java.util.Objects;
import org.apache.ignite.ci.analysis.IVersionedEntity;
import org.apache.ignite.ci.db.Persisted;
import org.jetbrains.annotations.Nullable;
@@ -30,9 +30,13 @@ import org.jetbrains.annotations.Nullable;
*/
@Persisted
public class PullRequest implements IVersionedEntity {
+ /** Open status. */
public static final String OPEN = "open";
+
+ /** Symbols count to include to short commit version. */
public static final int INCLUDE_SHORT_VER = 7;
- /** Latest version. */
+
+ /** Entitiy current (latest) version. */
private static final int LATEST_VERSION = 7;
/** Entity version. */
@@ -132,22 +136,24 @@ public class PullRequest implements IVersionedEntity {
return true;
if (o == null || getClass() != o.getClass())
return false;
+
PullRequest req = (PullRequest)o;
+
return num == req.num &&
- Objects.equal(_ver, req._ver) &&
- Objects.equal(state, req.state) &&
- Objects.equal(title, req.title) &&
- Objects.equal(htmlUrl, req.htmlUrl) &&
- Objects.equal(updatedAt, req.updatedAt) &&
- Objects.equal(statusesUrl, req.statusesUrl) &&
- Objects.equal(gitHubUser, req.gitHubUser) &&
- Objects.equal(base, req.base) &&
- Objects.equal(head, req.head);
+ Objects.equals(_ver, req._ver) &&
+ Objects.equals(state, req.state) &&
+ Objects.equals(title, req.title) &&
+ Objects.equals(htmlUrl, req.htmlUrl) &&
+ Objects.equals(updatedAt, req.updatedAt) &&
+ Objects.equals(statusesUrl, req.statusesUrl) &&
+ Objects.equals(gitHubUser, req.gitHubUser) &&
+ Objects.equals(head, req.head) &&
+ Objects.equals(base, req.base);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(_ver, num, state, title, htmlUrl, updatedAt, statusesUrl, gitHubUser, base, head);
+ return Objects.hash(_ver, num, state, title, htmlUrl, updatedAt, statusesUrl, gitHubUser, head, base);
}
/** {@inheritDoc} */