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/02/12 17:56:01 UTC
[ignite-teamcity-bot] branch master updated: Optimize imports &
code formatted
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 7716a66 Optimize imports & code formatted
7716a66 is described below
commit 7716a66fa84e247df971f3f61573d4caf7d3b89a
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Feb 12 20:55:52 2019 +0300
Optimize imports & code formatted
---
.../ignite/ci/analysis/IVersionedEntity.java | 1 +
.../apache/ignite/ci/analysis/LogCheckResult.java | 3 +-
.../apache/ignite/ci/analysis/LogCheckTask.java | 2 +-
.../apache/ignite/ci/analysis/MultBuildRunCtx.java | 43 ++++++++++------------
.../org/apache/ignite/ci/analysis/RunStat.java | 26 ++++++-------
.../ignite/ci/analysis/SingleBuildRunCtx.java | 13 ++++---
.../ignite/ci/analysis/TestCompactedMult.java | 4 +-
.../ignite/ci/analysis/TestLogCheckResult.java | 1 -
8 files changed, 43 insertions(+), 50 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/IVersionedEntity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/IVersionedEntity.java
index 8b4c9c5..817222f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/IVersionedEntity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/IVersionedEntity.java
@@ -22,6 +22,7 @@ package org.apache.ignite.ci.analysis;
*/
public interface IVersionedEntity {
int version();
+
int latestVersion();
default <V extends IVersionedEntity> boolean isOutdatedEntityVersion() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckResult.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckResult.java
index 790f80a..29e36e3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckResult.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckResult.java
@@ -95,7 +95,7 @@ public class LogCheckResult implements IVersionedEntity {
testLogCheckResult.forEach(
(t, logCheckResult) -> {
List<String> warns = logCheckResult.getWarns();
- if(warns.isEmpty())
+ if (warns.isEmpty())
return;
sb.append(t).append(" :\n");
@@ -108,7 +108,6 @@ public class LogCheckResult implements IVersionedEntity {
return sb.toString();
}
-
public Map<String, TestLogCheckResult> getTestLogCheckResult() {
return Collections.unmodifiableMap(testLogCheckResult);
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckTask.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckTask.java
index 00e6e15..a536444 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckTask.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/LogCheckTask.java
@@ -52,7 +52,7 @@ public class LogCheckTask {
if (isIncompleteSuite)
logCheckRes.setLastThreadDump(threadDumpCp.getLastThreadDump());
- else if(logCheckRes.hasProblem(JAVA_LEVEL_DEADLOCK))
+ else if (logCheckRes.hasProblem(JAVA_LEVEL_DEADLOCK))
logCheckRes.setLastThreadDump(threadDumpCp.getLastThreadDump());
this.result = logCheckRes;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
index 4a0f449..651a40a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
@@ -43,8 +43,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
- * Run configuration execution results loaded from different API URLs.
- * Includes tests and problem occurrences; if logs processing is done also contains last started test
+ * Run configuration execution results loaded from different API URLs. Includes tests and problem occurrences; if logs
+ * processing is done also contains last started test
*/
public class MultBuildRunCtx implements ISuiteResults {
/** Cancelled. */
@@ -85,7 +85,6 @@ public class MultBuildRunCtx implements ISuiteResults {
return buildsStream().map(SingleBuildRunCtx::getBuildIdIfHasThreadDump).filter(Objects::nonNull);
}
-
public Stream<Map<String, TestLogCheckResult>> getLogsCheckResults() {
return buildsStream().map(SingleBuildRunCtx::getTestLogCheckResult).filter(Objects::nonNull);
}
@@ -243,7 +242,6 @@ public class MultBuildRunCtx implements ISuiteResults {
}
}
-
public Stream<Map.Entry<String, Long>> getTopLogConsumers() {
Map<String, Long> logSizeBytes = new HashMap<>();
@@ -264,7 +262,7 @@ public class MultBuildRunCtx implements ISuiteResults {
Comparator<Map.Entry<String, Long>> comparing = Comparator.comparing(Map.Entry::getValue);
- return CollectionUtil.top(logSizeBytes.entrySet().stream(), 3 ,comparing).stream();
+ return CollectionUtil.top(logSizeBytes.entrySet().stream(), 3, comparing).stream();
}
public Stream<? extends IMultTestOccurrence> getTopLongRunning() {
@@ -286,14 +284,13 @@ public class MultBuildRunCtx implements ISuiteResults {
saveToMap(res, singleBuildRunCtx.getFailedNotMutedTests());
});
-
return new ArrayList<>(res.values());
}
public void saveToMap(Map<Integer, TestCompactedMult> res, Stream<TestCompacted> tests) {
tests.forEach(testCompacted -> {
res.computeIfAbsent(testCompacted.testName(), k -> new TestCompactedMult(compactor))
- .add(testCompacted);
+ .add(testCompacted);
});
}
@@ -314,13 +311,13 @@ public class MultBuildRunCtx implements ISuiteResults {
*/
@Nullable public Long getBuildDuration() {
final OptionalDouble average = buildsStream()
- .map(SingleBuildRunCtx::getBuildDuration)
- .filter(Objects::nonNull)
- .mapToLong(l->l)
- .average();
+ .map(SingleBuildRunCtx::getBuildDuration)
+ .filter(Objects::nonNull)
+ .mapToLong(l -> l)
+ .average();
- if(average.isPresent())
- return (long) average.getAsDouble();
+ if (average.isPresent())
+ return (long)average.getAsDouble();
return null;
}
@@ -367,7 +364,6 @@ public class MultBuildRunCtx implements ISuiteResults {
return buildsStream().findFirst().map(SingleBuildRunCtx::projectId).orElse(null);
}
-
public void setRunningBuildCount(int runningBuildCount) {
this.runningBuildCount = runningBuildCount;
}
@@ -393,19 +389,18 @@ public class MultBuildRunCtx implements ISuiteResults {
*/
public Stream<String> lastChangeUsers() {
return buildsStream()
- .flatMap(k -> k.getChanges().stream())
- .filter(ChangeCompacted::hasUsername)
- .map(change -> {
- final String tcUserFullName = change.tcUserFullName(compactor);
-
- final String vcsUsername = change.vcsUsername(compactor);
+ .flatMap(k -> k.getChanges().stream())
+ .filter(ChangeCompacted::hasUsername)
+ .map(change -> {
+ final String tcUserFullName = change.tcUserFullName(compactor);
- if (Strings.isNullOrEmpty(tcUserFullName))
- return vcsUsername;
+ final String vcsUsername = change.vcsUsername(compactor);
+ if (Strings.isNullOrEmpty(tcUserFullName))
+ return vcsUsername;
- return vcsUsername + " [" + tcUserFullName + "]";
- });
+ return vcsUsername + " [" + tcUserFullName + "]";
+ });
}
Stream<? extends Future<?>> getFutures() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
index 60187e6..d8dd61c 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
@@ -19,13 +19,16 @@ package org.apache.ignite.ci.analysis;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
-
-import org.apache.ignite.ci.db.Persisted;
import org.apache.ignite.ci.issue.EventTemplate;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
@@ -62,7 +65,6 @@ public class RunStat implements IRunHistory {
*/
private String name;
-
@Nullable
SortedMap<TestId, RunInfo> latestRuns;
@@ -141,19 +143,14 @@ public class RunStat implements IRunHistory {
return name;
}
-
-
- @Override public int getFailuresAllHist() {
+ @Override public int getFailuresAllHist() {
return failures;
}
- @Override public int getRunsAllHist() {
+ @Override public int getRunsAllHist() {
return runs;
}
-
-
-
@Override public int getFailuresCount() {
if (latestRuns == null)
return 0;
@@ -196,6 +193,7 @@ public class RunStat implements IRunHistory {
/**
* Sets build status as having critical failure
+ *
* @param buildId Build id.
*/
public void setBuildCriticalError(Integer buildId) {
@@ -269,7 +267,8 @@ public class RunStat implements IRunHistory {
}
@Nullable
- private static TestId checkTemplateAtPos(int[] template, int centralEvtBuild, List<Map.Entry<TestId, RunInfo>> histAsArr,
+ private static TestId checkTemplateAtPos(int[] template, int centralEvtBuild,
+ List<Map.Entry<TestId, RunInfo>> histAsArr,
int idx) {
for (int tIdx = 0; tIdx < template.length; tIdx++) {
RunInfo curStatus = histAsArr.get(idx + tIdx).getValue();
@@ -321,7 +320,6 @@ public class RunStat implements IRunHistory {
"changed its status [" + statusChange + "/" + latestRuns.size() + "] without code modifications";
}
-
/**
* Status of run.
*/
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
index 7d0833b..7704761 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
@@ -19,8 +19,11 @@ package org.apache.ignite.ci.analysis;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.stream.Stream;
@@ -55,7 +58,7 @@ public class SingleBuildRunCtx implements ISuiteResults {
* @param compactor Compactor.
*/
public SingleBuildRunCtx(FatBuildCompacted buildCompacted,
- IStringCompactor compactor) {
+ IStringCompactor compactor) {
this.buildCompacted = buildCompacted;
this.compactor = compactor;
}
@@ -156,13 +159,12 @@ public class SingleBuildRunCtx implements ISuiteResults {
}
public List<TestOccurrenceFull> getTests() {
- if(isComposite())
+ if (isComposite())
return Collections.emptyList();
return buildCompacted.getTestOcurrences(compactor).getTests();
}
-
@Nonnull Stream<? extends Future<?>> getFutures() {
return logCheckResFut == null ? Stream.empty() : Stream.of((Future<?>)logCheckResFut);
}
@@ -175,7 +177,6 @@ public class SingleBuildRunCtx implements ISuiteResults {
return compactor.getStringFromId(buildCompacted.branchName());
}
-
/**
* @return Names of not muted or ignored test failed for non composite build
*/
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestCompactedMult.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestCompactedMult.java
index c59ad79..98a3604 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestCompactedMult.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestCompactedMult.java
@@ -73,8 +73,8 @@ public class TestCompactedMult implements IMultTestOccurrence {
/** {@inheritDoc} */
@Override public Iterable<TestOccurrenceFull> getOccurrences() {
return occurrences.stream()
- .map(testCompacted -> testCompacted.toTestOccurrence(compactor, 0))
- .collect(Collectors.toList());
+ .map(testCompacted -> testCompacted.toTestOccurrence(compactor, 0))
+ .collect(Collectors.toList());
}
public void add(TestCompacted next) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestLogCheckResult.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestLogCheckResult.java
index 8c16423..9da55e9 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestLogCheckResult.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/TestLogCheckResult.java
@@ -20,7 +20,6 @@ package org.apache.ignite.ci.analysis;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;
import org.apache.ignite.ci.db.Persisted;