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 2018/10/25 21:14:57 UTC
[ignite-teamcity-bot] 02/02: More deprecations
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9848-load-all-builds
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit fb171f1d1c7ae70369c9406d0058cf627733ebb9
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Oct 26 00:14:51 2018 +0300
More deprecations
---
.../src/main/java/org/apache/ignite/ci/ITeamcity.java | 12 +++---------
.../org/apache/ignite/ci/IgnitePersistentTeamcity.java | 6 ++++++
.../apache/ignite/ci/di/scheduler/TcBotScheduler.java | 16 +++++-----------
.../apache/ignite/ci/web/model/hist/BuildsHistory.java | 18 ++++++------------
.../ignite/ci/web/rest/build/GetBuildTestFailures.java | 1 +
5 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index 115bec0..c3bb8bd 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -113,15 +113,6 @@ public interface ITeamcity extends ITeamcityConn {
/**
* @param projectId Suite ID (string without spaces).
* @param branchNameForHist Branch in TC identification.
- * @return List of build numbers in historical order, recent builds coming last.
- */
- default int[] getBuildNumbersFromHistory(String projectId, String branchNameForHist) {
- return getBuildNumbersFromHistory(projectId, branchNameForHist, null, null);
- }
-
- /**
- * @param projectId Suite ID (string without spaces).
- * @param branchNameForHist Branch in TC identification.
* @param sinceDate Since date.
* @param untilDate Until date.
* @return List of build numbers in historical order in date interval, recent builds coming last.
@@ -151,8 +142,10 @@ public interface ITeamcity extends ITeamcityConn {
*/
ProblemOccurrences getProblems(BuildRef build);
+ @Deprecated
public TestOccurrences getTests(String fullUrl);
+ @Deprecated
TestOccurrences getFailedTests(String href, int count, String normalizedBranch);
Statistics getBuildStatistics(String href);
@@ -164,6 +157,7 @@ public interface ITeamcity extends ITeamcityConn {
ChangesList getChangesList(String href);
+ @Deprecated
CompletableFuture<TestRef> getTestRef(FullQueryParams key);
Configurations getConfigurations(FullQueryParams key);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index a605e83..b248173 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -95,6 +95,7 @@ import static org.apache.ignite.ci.tcbot.chain.BuildChainProcessor.normalizeBran
public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITeamcity, ITcAnalytics {
//V2 caches, 32 parts (V1 caches were 1024 parts)
+ @Deprecated
private static final String TESTS_OCCURRENCES = "testOccurrences";
private static final String TESTS_RUN_STAT = "testsRunStat";
private static final String CALCULATED_STATISTIC = "calculatedStatistic";
@@ -102,6 +103,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
private static final String CHANGE_INFO_FULL = "changeInfoFull";
private static final String CHANGES_LIST = "changesList";
private static final String ISSUES_USAGES_LIST = "issuesUsagesList";
+ @Deprecated
private static final String TEST_FULL = "testFull";
private static final String BUILD_PROBLEMS = "buildProblems";
private static final String BUILD_STATISTICS = "buildStatistics";
@@ -219,6 +221,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
/**
* @return {@link TestOccurrences} instances cache, 32 parts.
*/
+ @Deprecated
private IgniteCache<String, TestOccurrences> testOccurrencesCache() {
return getOrCreateCacheV2(ignCacheNme(TESTS_OCCURRENCES));
}
@@ -226,6 +229,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
/**
* @return {@link TestOccurrenceFull} instances cache, 32 parts.
*/
+ @Deprecated
private IgniteCache<String, TestOccurrenceFull> testFullCache() {
return getOrCreateCacheV2(ignCacheNme(TEST_FULL));
}
@@ -837,6 +841,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
/** {@inheritDoc} */
@AutoProfiling
+ @Deprecated
@Override public TestOccurrences getTests(String fullUrl) {
String hrefForDb = DbMigrations.removeCountFromRef(fullUrl);
@@ -847,6 +852,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
/** {@inheritDoc} */
@AutoProfiling
+ @Deprecated
@Override public TestOccurrences getFailedTests(String href, int cnt, String normalizedBranch) {
return getTests(href + ",muted:false,status:FAILURE,count:" + cnt + "&fields=testOccurrence(id,name)");
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java
index c3cf433..cedb00b 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java
@@ -17,26 +17,20 @@
package org.apache.ignite.ci.di.scheduler;
import com.google.common.base.Preconditions;
+import org.apache.ignite.ci.di.MonitoredTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.ci.TcHelper;
-import org.apache.ignite.ci.di.MonitoredTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
class TcBotScheduler implements IScheduler {
public static final int POOL_SIZE = 3;
/** Logger. */
- private static final Logger logger = LoggerFactory.getLogger(TcHelper.class);
+ private static final Logger logger = LoggerFactory.getLogger(TcBotScheduler.class);
/** Executor service. */
private volatile ScheduledExecutorService executorSvc = Executors.newScheduledThreadPool(POOL_SIZE);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java
index 90b78f0..842f6e9 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java
@@ -23,13 +23,7 @@ import java.io.UncheckedIOException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@@ -119,7 +113,7 @@ public class BuildsHistory {
/** */
private void initStatistics(IAnalyticsEnabledTeamcity teamcity, int[] buildIds) {
- List<Future<BuildStatisticsSummary>> buildStatiscsFutures = new ArrayList<>();
+ List<Future<BuildStatisticsSummary>> buildStaticsFutures = new ArrayList<>();
for (int buildId : buildIds) {
Future<BuildStatisticsSummary> buildFuture = CompletableFuture.supplyAsync(() -> {
@@ -131,10 +125,10 @@ public class BuildsHistory {
}, teamcity.getExecutor());
- buildStatiscsFutures.add(buildFuture);
+ buildStaticsFutures.add(buildFuture);
}
- buildStatiscsFutures.forEach(new Consumer<Future<BuildStatisticsSummary>>() {
+ buildStaticsFutures.forEach(new Consumer<Future<BuildStatisticsSummary>>() {
@Override public void accept(Future<BuildStatisticsSummary> v) {
try {
BuildStatisticsSummary buildsStatistic = v.get();
@@ -144,7 +138,7 @@ public class BuildsHistory {
}
catch (ExecutionException e) {
if (e.getCause() instanceof UncheckedIOException)
- logger.error(e.getStackTrace().toString());
+ logger.error(Arrays.toString(e.getStackTrace()));
else
throw new RuntimeException(e);
@@ -223,7 +217,7 @@ public class BuildsHistory {
v.get();
} catch (ExecutionException e) {
if (e.getCause() instanceof UncheckedIOException)
- logger.error(e.getStackTrace().toString());
+ logger.error(Arrays.toString(e.getStackTrace()));
else
throw new RuntimeException(e);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
index f72b3da..580fcad 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
@@ -161,6 +161,7 @@ public class GetBuildTestFailures {
@GET
@Produces(MediaType.TEXT_PLAIN)
@Path("testRef")
+ @Deprecated
public String getTestRef(
@NotNull @QueryParam("testName") String name,
@NotNull @QueryParam("suiteName") String suiteName,