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 15:03:26 UTC
[ignite-teamcity-bot] branch master updated (5cd5df2 -> 94c8022)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.
from 5cd5df2 Removal of guava objects usage for equals/hash code & code commenting
new d3d6711 Removal of guava objects usage for equals/hash code & code commenting
new 94c8022 Removal of guava objects usage for equals/hash code & code commenting
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ignite/ci/jira/ignited/TicketCompacted.java | 10 ++--
.../apache/ignite/ci/tcmodel/hist/BuildRef.java | 34 +++++++-----
.../teamcity/ignited/fatbuild/TestCompacted.java | 11 ++--
.../teamcity/ignited/runhist/InvocationData.java | 6 +--
.../teamcity/ignited/runhist/RunHistCompacted.java | 6 +--
.../model/current/ChainAtServerCurrentStatus.java | 46 ++++++++--------
.../ci/web/model/current/SuiteCurrentStatus.java | 61 +++++++++++-----------
.../ignite/ci/web/model/current/TestFailure.java | 32 ++++++------
.../ci/web/model/current/TestFailuresSummary.java | 14 ++---
.../ignite/ci/web/model/hist/FailureSummary.java | 11 ++--
.../ignite/ci/web/model/hist/TestHistory.java | 12 ++---
.../ignite/ci/web/rest/parms/FullQueryParams.java | 30 +++++------
12 files changed, 144 insertions(+), 129 deletions(-)
[ignite-teamcity-bot] 02/02: Removal of guava objects usage for
equals/hash code & code commenting
Posted by dp...@apache.org.
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
commit 94c80229ee44c49301c54c7aec0aacc20e8c300c
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Mar 14 18:01:07 2019 +0300
Removal of guava objects usage for equals/hash code & code commenting
---
.../ignite/ci/web/model/current/TestFailure.java | 32 +++++++++++-----------
.../ci/web/model/current/TestFailuresSummary.java | 14 ++++++----
.../ignite/ci/web/model/hist/TestHistory.java | 12 ++++----
.../ignite/ci/web/rest/parms/FullQueryParams.java | 30 ++++++++++----------
4 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
index 1448222..a99deb4 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
@@ -17,10 +17,10 @@
package org.apache.ignite.ci.web.model.current;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
@@ -253,25 +253,25 @@ import static org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.branchFo
return false;
TestFailure failure = (TestFailure)o;
return investigated == failure.investigated &&
- Objects.equal(name, failure.name) &&
- Objects.equal(suiteName, failure.suiteName) &&
- Objects.equal(testName, failure.testName) &&
- Objects.equal(curFailures, failure.curFailures) &&
- Objects.equal(webUrl, failure.webUrl) &&
- Objects.equal(webIssueUrl, failure.webIssueUrl) &&
- Objects.equal(webIssueText, failure.webIssueText) &&
- Objects.equal(durationPrintable, failure.durationPrintable) &&
- Objects.equal(warnings, failure.warnings) &&
- Objects.equal(histBaseBranch, failure.histBaseBranch) &&
- Objects.equal(histCurBranch, failure.histCurBranch)&&
- Objects.equal(webUrlBaseBranch, failure.webUrlBaseBranch) ;
+ Objects.equals(name, failure.name) &&
+ Objects.equals(suiteName, failure.suiteName) &&
+ Objects.equals(testName, failure.testName) &&
+ Objects.equals(curFailures, failure.curFailures) &&
+ Objects.equals(webUrl, failure.webUrl) &&
+ Objects.equals(webIssueUrl, failure.webIssueUrl) &&
+ Objects.equals(webIssueText, failure.webIssueText) &&
+ Objects.equals(durationPrintable, failure.durationPrintable) &&
+ Objects.equals(warnings, failure.warnings) &&
+ Objects.equals(problemRef, failure.problemRef) &&
+ Objects.equals(histCurBranch, failure.histCurBranch) &&
+ Objects.equals(histBaseBranch, failure.histBaseBranch) &&
+ Objects.equals(webUrlBaseBranch, failure.webUrlBaseBranch);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(name, suiteName, testName, curFailures,
- webUrl, webIssueUrl, webIssueText, investigated, durationPrintable, warnings, histBaseBranch, histCurBranch,
- webUrlBaseBranch);
+ return Objects.hash(name, suiteName, testName, curFailures, webUrl, webIssueUrl, webIssueText, investigated,
+ durationPrintable, warnings, problemRef, histCurBranch, histBaseBranch, webUrlBaseBranch);
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailuresSummary.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailuresSummary.java
index cc2a57e..1f92eb6 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailuresSummary.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailuresSummary.java
@@ -17,9 +17,9 @@
package org.apache.ignite.ci.web.model.current;
-import com.google.common.base.Objects;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
@@ -62,20 +62,22 @@ import org.jetbrains.annotations.Nullable;
hashCodeHex = Integer.toHexString(U.safeAbs(hashCode()));
}
+ /** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
TestFailuresSummary summary = (TestFailuresSummary)o;
- return Objects.equal(servers, summary.servers) &&
- Objects.equal(failedTests, summary.failedTests) &&
- Objects.equal(failedToFinish, summary.failedToFinish);
- //todo add tracked branch to equals
+ return Objects.equals(servers, summary.servers) &&
+ Objects.equals(failedTests, summary.failedTests) &&
+ Objects.equals(failedToFinish, summary.failedToFinish) &&
+ Objects.equals(trackedBranch, summary.trackedBranch);
}
+ /** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(servers, failedTests, failedToFinish);
+ return Objects.hash(servers, failedTests, failedToFinish, trackedBranch);
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/TestHistory.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/TestHistory.java
index f18fe20..888ecce 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/TestHistory.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/TestHistory.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ci.web.model.hist;
-import com.google.common.base.Objects;
import java.util.List;
+import java.util.Objects;
import javax.annotation.Nullable;
import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
@@ -62,14 +62,14 @@ public class TestHistory {
if (o == null || getClass() != o.getClass())
return false;
TestHistory hist = (TestHistory)o;
-
- return Objects.equal(allTime, hist.allTime) &&
- Objects.equal(recent, hist.recent) &&
- Objects.equal(latestRuns, hist.latestRuns);
+ return Objects.equals(allTime, hist.allTime) &&
+ Objects.equals(recent, hist.recent) &&
+ Objects.equals(latestRuns, hist.latestRuns) &&
+ Objects.equals(flakyComments, hist.flakyComments);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(allTime, recent, latestRuns);
+ return Objects.hash(allTime, recent, latestRuns, flakyComments);
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/parms/FullQueryParams.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/parms/FullQueryParams.java
index 47fac6f..323691b 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/parms/FullQueryParams.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/parms/FullQueryParams.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.web.rest.parms;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
+import java.util.Objects;
import javax.annotation.Nonnull;
import javax.ws.rs.QueryParam;
import org.jetbrains.annotations.Nullable;
@@ -122,25 +122,25 @@ public class FullQueryParams {
if (o == null || getClass() != o.getClass())
return false;
- FullQueryParams param = (FullQueryParams)o;
+ FullQueryParams params = (FullQueryParams)o;
- return Objects.equal(branch, param.branch) &&
- Objects.equal(serverId, param.serverId) &&
- Objects.equal(suiteId, param.suiteId) &&
- Objects.equal(branchForTc, param.branchForTc) &&
- Objects.equal(action, param.action) &&
- Objects.equal(count, param.count) &&
- Objects.equal(checkAllLogs, param.checkAllLogs) &&
- Objects.equal(buildId, param.buildId) &&
- Objects.equal(projectId, param.projectId) &&
- Objects.equal(testName, param.testName) &&
- Objects.equal(baseBranchForTc, param.baseBranchForTc);
+ return Objects.equals(branch, params.branch) &&
+ Objects.equals(serverId, params.serverId) &&
+ Objects.equals(suiteId, params.suiteId) &&
+ Objects.equals(branchForTc, params.branchForTc) &&
+ Objects.equals(action, params.action) &&
+ Objects.equals(count, params.count) &&
+ Objects.equals(checkAllLogs, params.checkAllLogs) &&
+ Objects.equals(buildId, params.buildId) &&
+ Objects.equals(baseBranchForTc, params.baseBranchForTc) &&
+ Objects.equals(projectId, params.projectId) &&
+ Objects.equals(testName, params.testName);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(branch, serverId, suiteId, branchForTc, action, count, checkAllLogs, buildId,
- baseBranchForTc, testName, projectId);
+ return Objects.hash(branch, serverId, suiteId, branchForTc, action, count, checkAllLogs, buildId,
+ baseBranchForTc, projectId, testName);
}
public void setBranch(@Nullable String branch) {
[ignite-teamcity-bot] 01/02: Removal of guava objects usage for
equals/hash code & code commenting
Posted by dp...@apache.org.
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
commit d3d6711e0eed90b1ee9ab1fec034012b024e1c71
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Mar 14 17:58:43 2019 +0300
Removal of guava objects usage for equals/hash code & code commenting
---
.../ignite/ci/jira/ignited/TicketCompacted.java | 10 ++--
.../apache/ignite/ci/tcmodel/hist/BuildRef.java | 34 +++++++-----
.../teamcity/ignited/fatbuild/TestCompacted.java | 11 ++--
.../teamcity/ignited/runhist/InvocationData.java | 6 +--
.../teamcity/ignited/runhist/RunHistCompacted.java | 6 +--
.../model/current/ChainAtServerCurrentStatus.java | 46 ++++++++--------
.../ci/web/model/current/SuiteCurrentStatus.java | 61 +++++++++++-----------
.../ignite/ci/web/model/hist/FailureSummary.java | 11 ++--
8 files changed, 99 insertions(+), 86 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
index 0cece92..7496795 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
@@ -17,7 +17,7 @@
package org.apache.ignite.ci.jira.ignited;
-import com.google.common.base.Objects;
+import java.util.Objects;
import org.apache.ignite.ci.jira.pure.Fields;
import org.apache.ignite.ci.jira.pure.Status;
import org.apache.ignite.ci.jira.pure.Ticket;
@@ -93,13 +93,13 @@ public class TicketCompacted {
return id == compacted.id &&
igniteId == compacted.igniteId &&
status == compacted.status &&
- Objects.equal(summary, compacted.summary) &&
- Objects.equal(customfield_11050, compacted.customfield_11050) &&
- Objects.equal(description, compacted.description);
+ Objects.equals(summary, compacted.summary) &&
+ Objects.equals(customfield_11050, compacted.customfield_11050) &&
+ Objects.equals(description, compacted.description);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(id, igniteId, status, summary, customfield_11050, description);
+ return Objects.hash(id, igniteId, status, summary, customfield_11050, description);
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
index ad627d3..491a062 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.tcmodel.hist;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
+import java.util.Objects;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -121,23 +121,29 @@ public class BuildRef extends AbstractRef {
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- BuildRef buildRef = (BuildRef) o;
- return Objects.equal(id, buildRef.id) &&
- Objects.equal(buildTypeId, buildRef.buildTypeId) &&
- Objects.equal(branchName, buildRef.branchName) &&
- Objects.equal(status, buildRef.status) &&
- Objects.equal(state, buildRef.state) &&
- Objects.equal(buildNumber, buildRef.buildNumber) &&
- Objects.equal(defaultBranch, buildRef.defaultBranch) &&
- Objects.equal(composite, buildRef.composite) &&
- Objects.equal(webUrl, buildRef.webUrl);
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ BuildRef ref = (BuildRef)o;
+
+ return Objects.equals(id, ref.id) &&
+ Objects.equals(buildTypeId, ref.buildTypeId) &&
+ Objects.equals(branchName, ref.branchName) &&
+ Objects.equals(status, ref.status) &&
+ Objects.equals(state, ref.state) &&
+ Objects.equals(buildNumber, ref.buildNumber) &&
+ Objects.equals(defaultBranch, ref.defaultBranch) &&
+ Objects.equals(composite, ref.composite) &&
+ Objects.equals(failedToStart, ref.failedToStart) &&
+ Objects.equals(webUrl, ref.webUrl);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(id, buildTypeId, branchName, status, state, buildNumber, defaultBranch, composite, webUrl);
+ return Objects.hash(id, buildTypeId, branchName, status, state, buildNumber, defaultBranch, composite,
+ failedToStart, webUrl);
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
index cdd99c7..07c49aa 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
@@ -18,11 +18,12 @@
package org.apache.ignite.ci.teamcity.ignited.fatbuild;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.BitSet;
+import java.util.Objects;
import org.apache.ignite.ci.analysis.RunStat;
import org.apache.ignite.ci.tcbot.common.StringFieldCompacted;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
@@ -289,13 +290,15 @@ public class TestCompacted {
duration == compacted.duration &&
testId == compacted.testId &&
actualBuildId == compacted.actualBuildId &&
- Objects.equal(flags, compacted.flags) &&
- Objects.equal(details, compacted.details);
+ Objects.equals(flags, compacted.flags) &&
+ Arrays.equals(details, compacted.details);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(idInBuild, name, status, duration, flags, testId, actualBuildId, details);
+ int res = Objects.hash(idInBuild, name, status, duration, flags, testId, actualBuildId);
+ res = 31 * res + Arrays.hashCode(details);
+ return res;
}
public boolean isFailedButNotMuted(IStringCompactor compactor) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
index ef5521f..6e29a3c 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
@@ -18,9 +18,9 @@
package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
import java.time.Duration;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.ci.analysis.RunStat;
@@ -160,12 +160,12 @@ public class InvocationData {
InvocationData data = (InvocationData)o;
return allHistRuns == data.allHistRuns &&
allHistFailures == data.allHistFailures &&
- Objects.equal(invocationMap, data.invocationMap);
+ Objects.equals(invocationMap, data.invocationMap);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(allHistRuns, allHistFailures, invocationMap);
+ return Objects.hash(allHistRuns, allHistFailures, invocationMap);
}
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 0dd4569..97499a3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -18,8 +18,8 @@
package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.apache.ignite.ci.analysis.IVersionedEntity;
@@ -207,11 +207,11 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
return false;
RunHistCompacted compacted = (RunHistCompacted)o;
return _ver == compacted._ver &&
- Objects.equal(data, compacted.data);
+ Objects.equals(data, compacted.data);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(_ver, data);
+ return Objects.hash(_ver, data);
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
index 39567a8..5c739d4 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
@@ -17,15 +17,14 @@
package org.apache.ignite.ci.web.model.current;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Stream;
import javax.annotation.Nullable;
-
import org.apache.ignite.ci.analysis.FullChainRunCtx;
import org.apache.ignite.ci.analysis.IMultTestOccurrence;
import org.apache.ignite.ci.analysis.MultBuildRunCtx;
@@ -33,7 +32,6 @@ import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.jira.ignited.IJiraIgnited;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
import org.apache.ignite.ci.tcbot.visa.BranchTicketMatcher;
import org.apache.ignite.ci.tcmodel.conf.BuildType;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
@@ -41,7 +39,9 @@ import org.apache.ignite.ci.util.CollectionUtil;
import org.apache.ignite.internal.util.typedef.T2;
import static org.apache.ignite.ci.util.UrlUtil.escape;
-import static org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.*;
+import static org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.branchForLink;
+import static org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.createOccurForLogConsumer;
+import static org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.createOrrucForLongRun;
/**
* Represent Run All chain results/ or RunAll+latest re-runs.
@@ -245,27 +245,31 @@ public class ChainAtServerCurrentStatus {
if (o == null || getClass() != o.getClass())
return false;
ChainAtServerCurrentStatus status = (ChainAtServerCurrentStatus)o;
- return Objects.equal(chainName, status.chainName) &&
- Objects.equal(serverId, status.serverId) &&
- Objects.equal(branchName, status.branchName) &&
- Objects.equal(webToHist, status.webToHist) &&
- Objects.equal(webToBuild, status.webToBuild) &&
- Objects.equal(suites, status.suites) &&
- Objects.equal(failedTests, status.failedTests) &&
- Objects.equal(failedToFinish, status.failedToFinish) &&
- Objects.equal(durationPrintable, status.durationPrintable) &&
- Objects.equal(testsDurationPrintable, status.testsDurationPrintable) &&
- Objects.equal(lostInTimeouts, status.lostInTimeouts) &&
- Objects.equal(logConsumers, status.logConsumers) &&
- Objects.equal(topLongRunning, status.topLongRunning) &&
- Objects.equal(buildNotFound, status.buildNotFound);
+ return buildNotFound == status.buildNotFound &&
+ Objects.equals(chainName, status.chainName) &&
+ Objects.equals(serverId, status.serverId) &&
+ Objects.equals(branchName, status.branchName) &&
+ Objects.equals(webToHist, status.webToHist) &&
+ Objects.equals(webToBuild, status.webToBuild) &&
+ Objects.equals(ticketFullName, status.ticketFullName) &&
+ Objects.equals(webToTicket, status.webToTicket) &&
+ Objects.equals(prNum, status.prNum) &&
+ Objects.equals(webToPr, status.webToPr) &&
+ Objects.equals(suites, status.suites) &&
+ Objects.equals(failedTests, status.failedTests) &&
+ Objects.equals(failedToFinish, status.failedToFinish) &&
+ Objects.equals(durationPrintable, status.durationPrintable) &&
+ Objects.equals(testsDurationPrintable, status.testsDurationPrintable) &&
+ Objects.equals(lostInTimeouts, status.lostInTimeouts) &&
+ Objects.equals(topLongRunning, status.topLongRunning) &&
+ Objects.equals(logConsumers, status.logConsumers) &&
+ Objects.equals(baseBranchForTc, status.baseBranchForTc);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(chainName, serverId, branchName, webToHist, webToBuild, suites,
- failedTests, failedToFinish, durationPrintable, testsDurationPrintable,
- lostInTimeouts, logConsumers, topLongRunning, buildNotFound);
+ return Objects.hash(chainName, serverId, branchName, webToHist, webToBuild, ticketFullName, webToTicket, prNum,
+ webToPr, suites, failedTests, failedToFinish, durationPrintable, testsDurationPrintable, lostInTimeouts, topLongRunning, logConsumers, buildNotFound, baseBranchForTc);
}
public void setBuildNotFound(boolean buildNotFound) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
index 269bcb5..530c7d6 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
@@ -17,12 +17,12 @@
package org.apache.ignite.ci.web.model.current;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -325,41 +325,40 @@ import static org.apache.ignite.ci.util.UrlUtil.escape;
return true;
if (o == null || getClass() != o.getClass())
return false;
+ if (!super.equals(o))
+ return false;
SuiteCurrentStatus status = (SuiteCurrentStatus)o;
- return Objects.equal(name, status.name) &&
- Objects.equal(result, status.result) &&
- Objects.equal(hasCriticalProblem, status.hasCriticalProblem) &&
- Objects.equal(webToHist, status.webToHist) &&
- Objects.equal(webToHistBaseBranch, status.webToHistBaseBranch) &&
- Objects.equal(webToBuild, status.webToBuild) &&
- Objects.equal(testFailures, status.testFailures) &&
- Objects.equal(topLongRunning, status.topLongRunning) &&
- Objects.equal(webUrlThreadDump, status.webUrlThreadDump) &&
- Objects.equal(runningBuildCount, status.runningBuildCount) &&
- Objects.equal(queuedBuildCount, status.queuedBuildCount) &&
- Objects.equal(serverId, status.serverId) &&
- Objects.equal(suiteId, status.suiteId) &&
- Objects.equal(branchName, status.branchName) &&
- Objects.equal(failures, status.failures) &&
- Objects.equal(runs, status.runs) &&
- Objects.equal(failureRate, status.failureRate) &&
- Objects.equal(failsAllHist, status.failsAllHist) &&
- Objects.equal(criticalFails, status.criticalFails) &&
- Objects.equal(userCommits, status.userCommits) &&
- Objects.equal(failedTests, status.failedTests) &&
- Objects.equal(durationPrintable, status.durationPrintable) &&
- Objects.equal(testsDurationPrintable, status.testsDurationPrintable) &&
- Objects.equal(lostInTimeouts, status.lostInTimeouts) &&
- Objects.equal(warnOnly, status.warnOnly);
+ return Objects.equals(name, status.name) &&
+ Objects.equals(result, status.result) &&
+ Objects.equals(hasCriticalProblem, status.hasCriticalProblem) &&
+ Objects.equals(webToHist, status.webToHist) &&
+ Objects.equals(webToHistBaseBranch, status.webToHistBaseBranch) &&
+ Objects.equals(webToBuild, status.webToBuild) &&
+ Objects.equals(testFailures, status.testFailures) &&
+ Objects.equals(topLongRunning, status.topLongRunning) &&
+ Objects.equals(warnOnly, status.warnOnly) &&
+ Objects.equals(logConsumers, status.logConsumers) &&
+ Objects.equals(webUrlThreadDump, status.webUrlThreadDump) &&
+ Objects.equals(runningBuildCount, status.runningBuildCount) &&
+ Objects.equals(queuedBuildCount, status.queuedBuildCount) &&
+ Objects.equals(serverId, status.serverId) &&
+ Objects.equals(suiteId, status.suiteId) &&
+ Objects.equals(branchName, status.branchName) &&
+ Objects.equals(failsAllHist, status.failsAllHist) &&
+ Objects.equals(criticalFails, status.criticalFails) &&
+ Objects.equals(latestRuns, status.latestRuns) &&
+ Objects.equals(userCommits, status.userCommits) &&
+ Objects.equals(failedTests, status.failedTests) &&
+ Objects.equals(durationPrintable, status.durationPrintable) &&
+ Objects.equals(testsDurationPrintable, status.testsDurationPrintable) &&
+ Objects.equals(lostInTimeouts, status.lostInTimeouts) &&
+ Objects.equals(problemRef, status.problemRef) &&
+ Objects.equals(possibleBlocker, status.possibleBlocker);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(name, result, hasCriticalProblem, webToHist, webToHistBaseBranch, webToBuild, testFailures,
- topLongRunning, webUrlThreadDump, runningBuildCount, queuedBuildCount, serverId,
- suiteId, branchName, failures, runs, failureRate,
- failsAllHist, criticalFails, userCommits, failedTests, durationPrintable, testsDurationPrintable,
- lostInTimeouts, warnOnly);
+ return Objects.hash(super.hashCode(), name, result, hasCriticalProblem, webToHist, webToHistBaseBranch, webToBuild, testFailures, topLongRunning, warnOnly, logConsumers, webUrlThreadDump, runningBuildCount, queuedBuildCount, serverId, suiteId, branchName, failsAllHist, criticalFails, latestRuns, userCommits, failedTests, durationPrintable, testsDurationPrintable, lostInTimeouts, problemRef, possibleBlocker);
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/FailureSummary.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/FailureSummary.java
index b831e85..2389215 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/FailureSummary.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/FailureSummary.java
@@ -17,7 +17,7 @@
package org.apache.ignite.ci.web.model.hist;
-import com.google.common.base.Objects;
+import java.util.Objects;
import javax.annotation.Nullable;
/**
@@ -40,13 +40,14 @@ public class FailureSummary {
if (o == null || getClass() != o.getClass())
return false;
FailureSummary summary = (FailureSummary)o;
- return Objects.equal(failures, summary.failures) &&
- Objects.equal(runs, summary.runs) &&
- Objects.equal(failureRate, summary.failureRate);
+
+ return Objects.equals(failures, summary.failures) &&
+ Objects.equals(runs, summary.runs) &&
+ Objects.equals(failureRate, summary.failureRate);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hashCode(failures, runs, failureRate);
+ return Objects.hash(failures, runs, failureRate);
}
}