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 facc650 Deprecating old CTX-analogue class, to be refactored to smaller facc650 is described below commit facc650730b6a8e2ada113231a7ade034af44a80 Author: Dmitriy Pavlov <dpav...@apache.org> AuthorDate: Wed Oct 24 19:37:33 2018 +0300 Deprecating old CTX-analogue class, to be refactored to smaller --- .../main/java/org/apache/ignite/ci/ITcHelper.java | 5 +++-- .../apache/ignite/ci/IgnitePersistentTeamcity.java | 3 +++ .../main/java/org/apache/ignite/ci/TcHelper.java | 5 +++-- .../org/apache/ignite/ci/di/IgniteTcBotModule.java | 2 +- .../org/apache/ignite/ci/issue/IssueDetector.java | 23 +++++++++++----------- .../org/apache/ignite/ci/jobs/CheckQueueJob.java | 8 ++------ .../ignite/ci/tcbot/TcBotGeneralService.java | 4 +++- .../ignite/ci/tcbot/chain/PrChainsProcessor.java | 2 +- .../tcbot/chain/TrackedBranchChainsProcessor.java | 2 +- .../teamcity/ignited/TcIgnitedCachingProvider.java | 2 +- .../{pure => restcached}/ITcServerProvider.java | 2 +- .../ci/teamcity/restcached/TcRestCachedModule.java | 1 - .../restcached/TcServerCachingProvider.java | 2 -- .../java/org/apache/ignite/ci/web/CtxListener.java | 2 +- .../ignite/ci/web/rest/login/UserService.java | 2 +- .../org/apache/ignite/ci/di/DiContextTest.java | 2 +- 16 files changed, 34 insertions(+), 33 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java index 356b633..25a5bd0 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java @@ -21,13 +21,14 @@ import java.util.Collection; import java.util.List; import org.apache.ignite.ci.issue.IssueDetector; import org.apache.ignite.ci.issue.IssuesStorage; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.user.ICredentialsProv; import org.apache.ignite.ci.user.UserAndSessionsStorage; /** - * Teamcity Bot main interface + * Teamcity Bot main interface. This inteface became too huge. */ +@Deprecated public interface ITcHelper extends ITcServerProvider { /** System property to specify: Teamcity helper home. Ignite home will be set to same dir. */ public String TEAMCITY_HELPER_HOME = "teamcity.helper.home"; 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 60f61ba..8977517 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 @@ -89,7 +89,10 @@ import static org.apache.ignite.ci.tcbot.chain.BuildChainProcessor.normalizeBran /** * Apache Ignite based cache over teamcity responses (REST caches). + * + * Cache is now overloaded with data, Compacted */ +@Deprecated public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITeamcity, ITcAnalytics { /** Logger. */ private static final Logger logger = LoggerFactory.getLogger(IgnitePersistentTeamcity.class); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java index 59f0428..b40ba69 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java @@ -24,7 +24,7 @@ import org.apache.ignite.ci.issue.IssuesStorage; import org.apache.ignite.ci.jira.IJiraIntegration; import org.apache.ignite.ci.tcmodel.hist.BuildRef; import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.user.ICredentialsProv; import org.apache.ignite.ci.user.UserAndSessionsStorage; import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus; @@ -45,8 +45,9 @@ import static org.apache.ignite.ci.analysis.RunStat.MAX_LATEST_RUNS; import static org.apache.ignite.ci.util.XmlUtil.xmlEscapeText; /** - * TC Bot implementation + * TC Bot implementation. To be migrated to smaller injected classes */ +@Deprecated public class TcHelper implements ITcHelper, IJiraIntegration { /** Logger. */ private static final Logger logger = LoggerFactory.getLogger(TcHelper.class); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java index 4b8e192..7f75f78 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java @@ -84,7 +84,7 @@ public class IgniteTcBotModule extends AbstractModule { install(new SchedulerModule()); } - //todo fallback to TC big class + //todo now it is just fallback to TC big class, extract JIRA integation module private static class Jira implements IJiraIntegration { @Inject ITcHelper helper; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java index 405f0ea..fce8204 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java @@ -35,7 +35,7 @@ import javax.inject.Provider; import org.apache.ignite.ci.HelperConfig; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; import org.apache.ignite.ci.ITcHelper; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.ITeamcity; import org.apache.ignite.ci.analysis.RunStat; import org.apache.ignite.ci.analysis.SuiteInBranch; @@ -79,28 +79,31 @@ public class IssueDetector { private final AtomicBoolean init = new AtomicBoolean(); private ICredentialsProv backgroundOpsCreds; - private ITcHelper backgroundOpsTcHelper; @Deprecated //todo use scheduler private ScheduledExecutorService executorService; @Inject private Provider<CheckQueueJob> checkQueueJobProv; + /** TrackedBranch Processor. */ @Inject private TrackedBranchChainsProcessor tbProc; /** Tc helper. */ @Inject private ITcHelper tcHelper; + /** Server provider. */ + @Inject private ITcServerProvider srvProvider; + /** Send notification guard. */ private final AtomicBoolean sndNotificationGuard = new AtomicBoolean(); - private void registerIssuesAndNotifyLater(TestFailuresSummary res, ITcServerProvider helper, + private void registerIssuesAndNotifyLater(TestFailuresSummary res, ICredentialsProv creds) { if (creds == null) return; - registerNewIssues(res, helper, creds); + registerNewIssues(res, creds); if (sndNotificationGuard.compareAndSet(false, true)) executorService.schedule(this::sendNewNotifications, 90, TimeUnit.SECONDS); @@ -207,14 +210,13 @@ public class IssueDetector { /** * @param res summary of failures in test - * @param srvProvider Server provider. * @param creds Credentials provider. * @return Displayable string with operation status. */ @SuppressWarnings({"WeakerAccess", "UnusedReturnValue"}) @AutoProfiling @MonitoredTask(name = "Register new issues") - protected String registerNewIssues(TestFailuresSummary res, ITcServerProvider srvProvider, ICredentialsProv creds) { + protected String registerNewIssues(TestFailuresSummary res, ICredentialsProv creds) { int newIssues = 0; for (ChainAtServerCurrentStatus next : res.servers) { @@ -375,14 +377,13 @@ public class IssueDetector { * */ public boolean isAuthorized() { - return backgroundOpsCreds != null && backgroundOpsTcHelper != null; + return backgroundOpsCreds != null; } - public void startBackgroundCheck(ITcHelper helper, ICredentialsProv prov) { + public void startBackgroundCheck(ICredentialsProv prov) { try { if (init.compareAndSet(false, true)) { this.backgroundOpsCreds = prov; - this.backgroundOpsTcHelper = helper; executorService = Executors.newScheduledThreadPool(3); @@ -390,7 +391,7 @@ public class IssueDetector { final CheckQueueJob checkQueueJob = checkQueueJobProv.get(); - checkQueueJob.init(backgroundOpsTcHelper, backgroundOpsCreds); + checkQueueJob.init(backgroundOpsCreds); executorService.scheduleAtFixedRate(checkQueueJob, 0, 10, TimeUnit.MINUTES); @@ -446,7 +447,7 @@ public class IssueDetector { backgroundOpsCreds ); - registerIssuesAndNotifyLater(failures, backgroundOpsTcHelper, backgroundOpsCreds); + registerIssuesAndNotifyLater(failures, backgroundOpsCreds); return "Tests " + failures.failedTests + " Suites " + failures.failedToFinish + " were checked"; } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java index e5733d7..d7974e5 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java @@ -30,7 +30,7 @@ import jersey.repackaged.com.google.common.base.Throwables; import org.apache.ignite.ci.HelperConfig; import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited; import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.ITeamcity; import org.apache.ignite.ci.conf.BranchTracked; import org.apache.ignite.ci.conf.ChainAtServerTracked; @@ -63,9 +63,6 @@ public class CheckQueueJob implements Runnable { private ICredentialsProv creds; /** */ - private ITcServerProvider tcHelper; - - /** */ @Inject private ITeamcityIgnitedProvider tcIgnitedProv; /** */ @@ -77,9 +74,8 @@ public class CheckQueueJob implements Runnable { /** * @param creds Background credentials provider. */ - public void init(ITcServerProvider tcHelper, ICredentialsProv creds) { + public void init(ICredentialsProv creds) { this.creds = creds; - this.tcHelper = tcHelper; } /** {@inheritDoc} */ diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotGeneralService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotGeneralService.java index ae6e7b7..ba9c967 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotGeneralService.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotGeneralService.java @@ -23,10 +23,12 @@ import org.apache.ignite.ci.web.model.Version; import org.apache.ignite.lang.IgniteProductVersion; /** - * + * Service for general requests processing, which are not related to builds/JIRA/GitHub. */ public class TcBotGeneralService { + /** Ignite provider. */ @Inject Provider<Ignite> igniteProvider; + /** * */ diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java index 9f65be2..afa8a6c 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java @@ -18,7 +18,7 @@ package org.apache.ignite.ci.tcbot.chain; import com.google.common.base.Strings; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.ITeamcity; import org.apache.ignite.ci.analysis.FullChainRunCtx; import org.apache.ignite.ci.analysis.mode.LatestRebuildMode; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java index ccb8b32..11e1b97 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; import org.apache.ignite.ci.HelperConfig; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.analysis.FullChainRunCtx; import org.apache.ignite.ci.analysis.mode.LatestRebuildMode; import org.apache.ignite.ci.analysis.mode.ProcessLogsMode; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TcIgnitedCachingProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TcIgnitedCachingProvider.java index 8e8df4b..ec1afc9 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TcIgnitedCachingProvider.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TcIgnitedCachingProvider.java @@ -25,7 +25,7 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; import org.apache.ignite.ci.ITeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.user.ICredentialsProv; import org.apache.ignite.ci.util.ExceptionUtil; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcServerProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/ITcServerProvider.java similarity index 96% rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcServerProvider.java rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/ITcServerProvider.java index 06beb6f..9b8cbe0 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcServerProvider.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/ITcServerProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ignite.ci.teamcity.pure; +package org.apache.ignite.ci.teamcity.restcached; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; import org.apache.ignite.ci.user.ICredentialsProv; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcRestCachedModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcRestCachedModule.java index cd814bd..897d97e 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcRestCachedModule.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcRestCachedModule.java @@ -20,7 +20,6 @@ import com.google.inject.AbstractModule; import com.google.inject.internal.SingletonScope; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; import org.apache.ignite.ci.IgnitePersistentTeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; import org.apache.ignite.ci.teamcity.pure.ITeamcityHttpConnection; import org.apache.ignite.ci.teamcity.pure.TcRealConnectionModule; import org.jetbrains.annotations.Nullable; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcServerCachingProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcServerCachingProvider.java index 255eefd..42ab9ad 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcServerCachingProvider.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/restcached/TcServerCachingProvider.java @@ -20,8 +20,6 @@ import com.google.common.base.Strings; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; -import org.apache.ignite.ci.teamcity.restcached.ITcServerFactory; import org.apache.ignite.ci.user.ICredentialsProv; import org.apache.ignite.ci.util.ExceptionUtil; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java index 914da02..f52517f 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java @@ -29,7 +29,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.ignite.Ignite; import org.apache.ignite.ci.IAnalyticsEnabledTeamcity; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.ITcHelper; import org.apache.ignite.ci.TcHelper; import org.apache.ignite.ci.db.TcHelperDb; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java index c257a7e..a44df25 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java @@ -94,7 +94,7 @@ public class UserService { IssueDetector detector = helper.issueDetector(); - detector.startBackgroundCheck(helper, prov); + detector.startBackgroundCheck(prov); CtxListener.getInjector(ctx).getInstance(TcBotTriggerAndSignOffService.class).startObserver(); diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java index 690914b..770b6ce 100644 --- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java +++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.ci.ITcHelper; import org.apache.ignite.ci.observer.BuildObserver; import org.apache.ignite.ci.observer.ObserverTask; -import org.apache.ignite.ci.teamcity.pure.ITcServerProvider; +import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider; import org.apache.ignite.ci.teamcity.restcached.ITcServerFactory; import org.apache.ignite.ci.web.TcUpdatePool; import org.junit.Test;