This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9800
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9800 by this push:
new f4bbadc IGNITE-9800: GitHub ignited as separate module
f4bbadc is described below
commit f4bbadc64d9b8a8a774fabe05c77c0180fe85aee
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Sat Oct 6 14:06:56 2018 +0300
IGNITE-9800: GitHub ignited as separate module
---
.../apache/ignite/ci/IgniteTeamcityConnection.java | 4 +-
.../apache/ignite/ci/chain/PrChainsProcessor.java | 4 +-
.../org/apache/ignite/ci/di/IgniteTcBotModule.java | 6 +--
.../GitHubConnIgnitedImpl.java} | 56 ++++++++++++++--------
.../GitHubIgnitedModule.java} | 19 ++++++--
.../GitHubIgnitedProvImpl.java} | 35 +++++++-------
.../ignited/IGitHubConnIgnited.java} | 14 ++----
.../IGitHubConnIgnitedProvider.java} | 7 +--
.../github/{ => pure}/GitHubCachingProvider.java | 17 +++----
.../ci/github/{ => pure}/GitHubConnectionImpl.java | 37 ++------------
.../github/{ => pure}/GitHubIntegrationModule.java | 2 +-
.../ci/github/{ => pure}/IGitHubConnection.java | 3 +-
.../{ => pure}/IGitHubConnectionProvider.java | 2 +-
.../ignite/ci/runners/GenerateStatusHtml.java | 2 +-
.../runners/IgniteTeamcityHelperRunnerExample.java | 4 +-
.../{ => pure}/FileRecordingInputStream.java | 2 +-
.../ignite/ci/teamcity/{ => pure}/ITcLogin.java | 2 +-
.../{ => pure}/ITeamcityHttpConnection.java | 2 +-
.../{ => pure}/TcConnectionStaticLinker.java | 2 +-
.../ignite/ci/teamcity/{ => pure}/TcLoginImpl.java | 2 +-
.../{ => pure}/TcRealConnectionModule.java | 2 +-
.../ci/teamcity/{ => pure}/TeamcityRecorder.java | 2 +-
.../{ => pure}/TeamcityRecordingConnection.java | 2 +-
.../ci/visa/TcBotTriggerAndSignOffService.java | 10 ++--
.../java/org/apache/ignite/ci/web/CtxListener.java | 2 +-
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/web/model/current/UpdateInfo.java | 2 +-
.../apache/ignite/ci/web/rest/TriggerBuild.java | 4 +-
.../org/apache/ignite/ci/web/rest/login/Login.java | 2 +-
.../ignite/ci/web/rest/login/UserService.java | 2 +-
.../ci/web/rest/monitoring/MonitoringService.java | 4 +-
.../ignite/ci/web/rest/pr/GetPrTestFailures.java | 4 +-
.../org/apache/ignite/ci/user/LoginAuthTest.java | 2 +-
33 files changed, 122 insertions(+), 140 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
index ee85668..1b8f4a9 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
@@ -21,7 +21,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.MoreExecutors;
-import com.google.gson.Gson;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -51,7 +50,6 @@ import org.apache.ignite.ci.analysis.LogCheckResult;
import org.apache.ignite.ci.analysis.LogCheckTask;
import org.apache.ignite.ci.analysis.SingleBuildRunCtx;
import org.apache.ignite.ci.di.AutoProfiling;
-import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.logs.BuildLogStreamChecker;
import org.apache.ignite.ci.tcmodel.agent.Agent;
import org.apache.ignite.ci.tcmodel.agent.AgentsRef;
@@ -70,7 +68,7 @@ import
org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrences;
import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.tcmodel.user.Users;
-import org.apache.ignite.ci.teamcity.ITeamcityHttpConnection;
+import org.apache.ignite.ci.teamcity.pure.ITeamcityHttpConnection;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.ci.util.HttpUtil;
import org.apache.ignite.ci.util.UrlUtil;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/chain/PrChainsProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/chain/PrChainsProcessor.java
index 926967e..796800b 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/chain/PrChainsProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/chain/PrChainsProcessor.java
@@ -24,8 +24,8 @@ import org.apache.ignite.ci.analysis.FullChainRunCtx;
import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
import org.apache.ignite.ci.di.AutoProfiling;
-import org.apache.ignite.ci.github.IGitHubConnection;
-import org.apache.ignite.ci.github.IGitHubConnectionProvider;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus;
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 c0b0215..3e56ede 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
@@ -25,12 +25,12 @@ import com.google.inject.matcher.Matchers;
import org.apache.ignite.Ignite;
import org.apache.ignite.ci.*;
import org.apache.ignite.ci.db.Ignite1Init;
-import org.apache.ignite.ci.github.GitHubIntegrationModule;
+import org.apache.ignite.ci.github.ignited.GitHubIgnitedModule;
import org.apache.ignite.ci.issue.IssueDetector;
import org.apache.ignite.ci.jira.IJiraIntegration;
import org.apache.ignite.ci.observer.BuildObserver;
import org.apache.ignite.ci.observer.ObserverTask;
-import org.apache.ignite.ci.teamcity.TcRealConnectionModule;
+import org.apache.ignite.ci.teamcity.pure.TcRealConnectionModule;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.ci.web.BackgroundUpdater;
@@ -82,7 +82,7 @@ public class IgniteTcBotModule extends AbstractModule {
bind(BackgroundUpdater.class).in(new SingletonScope());
install(new TcRealConnectionModule());
- install(new GitHubIntegrationModule());
+ install(new GitHubIgnitedModule());
}
//todo fallback to TC big class
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubConnIgnitedImpl.java
similarity index 51%
copy from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
copy to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubConnIgnitedImpl.java
index f0b37d0..3a87c88 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubConnIgnitedImpl.java
@@ -14,46 +14,60 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.ignited;
-import com.google.common.base.Strings;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import java.util.concurrent.Callable;
+import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.ignite.ci.user.ICredentialsProv;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.ci.di.AutoProfiling;
+import org.apache.ignite.ci.github.PullRequest;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.util.ExceptionUtil;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.jetbrains.annotations.NotNull;
-class GitHubCachingProvider implements IGitHubConnectionProvider {
- @Inject Provider<IGitHubConnection> factory;
- private final Cache<String, IGitHubConnection> srvs
+class GitHubConnIgnitedImpl implements IGitHubConnIgnited {
+ private String id;
+ private IGitHubConnection conn;
+
+ @Inject Provider<Ignite> igniteProvider;
+
+ /** Data loaded. */
+ private final Cache<String, List<PullRequest>> prListCache
= CacheBuilder.newBuilder()
.maximumSize(100)
- .expireAfterAccess(16, TimeUnit.MINUTES)
+ .expireAfterWrite(5, TimeUnit.MINUTES)
.softValues()
.build();
+ public void init(String srvId, IGitHubConnection conn) {
+ id = srvId;
+ this.conn = conn;
+ }
+
+ @NotNull
+ public static <K, V> CacheConfiguration<K, V> getCache8PartsConfig(String
name) {
+ CacheConfiguration<K, V> ccfg = new CacheConfiguration<>(name);
+
+ ccfg.setAffinity(new RendezvousAffinityFunction(false, 8));
+
+ return ccfg;
+ }
+
/** {@inheritDoc} */
- @Override public IGitHubConnection server(String srvId, @Nullable
ICredentialsProv prov) {
- Callable<IGitHubConnection> call = () -> {
- IGitHubConnection conn = factory.get();
- conn.init(srvId);
- return conn;
- };
- String fullKey = Strings.nullToEmpty(srvId);
-
- IGitHubConnection gitHubConn;
+ @AutoProfiling
+ @Override public List<PullRequest> getPullRequests() {
try {
- gitHubConn = srvs.get(fullKey, call);
+ return prListCache.get("", conn::getPullRequests);
}
catch (ExecutionException e) {
throw ExceptionUtil.propagateException(e);
}
- return gitHubConn;
}
-
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedModule.java
similarity index 59%
copy from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
copy to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedModule.java
index 8251898..fa9b0df 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedModule.java
@@ -14,15 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.ignited;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
import com.google.inject.AbstractModule;
import com.google.inject.internal.SingletonScope;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.ci.di.AutoProfiling;
+import org.apache.ignite.ci.github.PullRequest;
+import org.apache.ignite.ci.github.pure.GitHubIntegrationModule;
+import org.apache.ignite.ci.util.ExceptionUtil;
-public class GitHubIntegrationModule extends AbstractModule {
+public class GitHubIgnitedModule extends AbstractModule {
/** {@inheritDoc} */
@Override protected void configure() {
- bind(IGitHubConnection.class).to(GitHubConnectionImpl.class);
-
bind(IGitHubConnectionProvider.class).to(GitHubCachingProvider.class).in(new
SingletonScope());
+ install(new GitHubIntegrationModule());
+
+
bind(IGitHubConnIgnitedProvider.class).to(GitHubIgnitedProvImpl.class).in(new
SingletonScope());
}
+
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedProvImpl.java
similarity index 62%
copy from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
copy to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedProvImpl.java
index f0b37d0..727e503 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/GitHubIgnitedProvImpl.java
@@ -14,46 +14,45 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.ignited;
import com.google.common.base.Strings;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Provider;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.util.ExceptionUtil;
-class GitHubCachingProvider implements IGitHubConnectionProvider {
- @Inject Provider<IGitHubConnection> factory;
- private final Cache<String, IGitHubConnection> srvs
+class GitHubIgnitedProvImpl implements IGitHubConnIgnitedProvider {
+ @Inject IGitHubConnectionProvider pureConnProv;
+ @Inject Provider<GitHubConnIgnitedImpl> ignitedProvider;
+
+ private final Cache<String, IGitHubConnIgnited> srvs
= CacheBuilder.newBuilder()
.maximumSize(100)
- .expireAfterAccess(16, TimeUnit.MINUTES)
- .softValues()
+ .expireAfterAccess(60, TimeUnit.MINUTES)
+ //.softValues()
.build();
/** {@inheritDoc} */
- @Override public IGitHubConnection server(String srvId, @Nullable
ICredentialsProv prov) {
- Callable<IGitHubConnection> call = () -> {
- IGitHubConnection conn = factory.get();
- conn.init(srvId);
- return conn;
- };
- String fullKey = Strings.nullToEmpty(srvId);
-
- IGitHubConnection gitHubConn;
+ @Override public IGitHubConnIgnited server(String srvId, @Nullable
ICredentialsProv prov) {
try {
- gitHubConn = srvs.get(fullKey, call);
+ return srvs.get(Strings.nullToEmpty(srvId), () -> {
+ IGitHubConnection srv = pureConnProv.server(srvId, prov);
+ GitHubConnIgnitedImpl ignited = ignitedProvider.get();
+ ignited.init(srvId, srv);
+ return ignited;
+ });
}
catch (ExecutionException e) {
throw ExceptionUtil.propagateException(e);
}
- return gitHubConn;
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnited.java
similarity index 72%
copy from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
copy to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnited.java
index bfb0976..726fdab 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnited.java
@@ -14,16 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.ignite.ci.github.ignited;
-package org.apache.ignite.ci.teamcity;
+import java.util.List;
+import org.apache.ignite.ci.github.PullRequest;
-import java.io.IOException;
-import java.io.InputStream;
+public interface IGitHubConnIgnited {
-public interface ITeamcityHttpConnection {
- /**
- * @param basicAuthTok Basic auth token.
- * @param url Url.
- */
- public InputStream sendGet(String basicAuthTok, String url) throws
IOException;
+ List<PullRequest> getPullRequests();
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnitedProvider.java
similarity index 80%
copy from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
copy to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnitedProvider.java
index 8c3f66d..69dcf02 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/ignited/IGitHubConnIgnitedProvider.java
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.ignited;
import javax.annotation.Nullable;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.user.ICredentialsProv;
-public interface IGitHubConnectionProvider {
+public interface IGitHubConnIgnitedProvider {
/**
* @param srvId Server id.
* @param prov Prov.
*/
- public IGitHubConnection server(String srvId, @Nullable ICredentialsProv
prov);
+ public IGitHubConnIgnited server(String srvId, @Nullable ICredentialsProv
prov);
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubCachingProvider.java
similarity index 82%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubCachingProvider.java
index f0b37d0..0f11d5a 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubCachingProvider.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubCachingProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.pure;
import com.google.common.base.Strings;
import com.google.common.cache.Cache;
@@ -39,21 +39,16 @@ class GitHubCachingProvider implements
IGitHubConnectionProvider {
/** {@inheritDoc} */
@Override public IGitHubConnection server(String srvId, @Nullable
ICredentialsProv prov) {
- Callable<IGitHubConnection> call = () -> {
- IGitHubConnection conn = factory.get();
- conn.init(srvId);
- return conn;
- };
- String fullKey = Strings.nullToEmpty(srvId);
-
- IGitHubConnection gitHubConn;
try {
- gitHubConn = srvs.get(fullKey, call);
+ return srvs.get(Strings.nullToEmpty(srvId), () -> {
+ IGitHubConnection conn = factory.get();
+ conn.init(srvId);
+ return conn;
+ });
}
catch (ExecutionException e) {
throw ExceptionUtil.propagateException(e);
}
- return gitHubConn;
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubConnectionImpl.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
similarity index 80%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubConnectionImpl.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
index 8339ee2..08e6064 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubConnectionImpl.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubConnectionImpl.java
@@ -14,41 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.pure;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UncheckedIOException;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.function.BiFunction;
-import javax.annotation.Nullable;
-import javax.ws.rs.BadRequestException;
-import org.apache.ignite.IgniteCache;
import org.apache.ignite.ci.HelperConfig;
-import org.apache.ignite.ci.analysis.Expirable;
-import org.apache.ignite.ci.analysis.SuiteInBranch;
import org.apache.ignite.ci.di.AutoProfiling;
-import org.apache.ignite.ci.tcmodel.hist.BuildRef;
+import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.ci.util.HttpUtil;
-import org.apache.ignite.ci.util.ObjectInterner;
-import org.apache.ignite.internal.util.typedef.T2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -133,7 +121,7 @@ class GitHubConnectionImpl implements IGitHubConnection {
/** {@inheritDoc} */
@AutoProfiling
- public List<PullRequest> getGithubPullRequests() {
+ @Override public List<PullRequest> getPullRequests() {
Preconditions.checkState( !isNullOrEmpty(gitApiUrl) , "Git API URL is
not configured for this server.");
String s = gitApiUrl + "pulls?sort=updated&direction=desc";
@@ -151,23 +139,4 @@ class GitHubConnectionImpl implements IGitHubConnection {
throw new UncheckedIOException(e);
}
}
- /** Data loaded. */
- private final Cache<String, List<PullRequest>> prListCache
- = CacheBuilder.newBuilder()
- .maximumSize(100)
- .expireAfterWrite(5, TimeUnit.MINUTES)
- .softValues()
- .build();
-
-
- /** {@inheritDoc} */
- @AutoProfiling
- @Override public List<PullRequest> getPullRequests() {
- try {
- return prListCache.get("", this::getGithubPullRequests);
- }
- catch (ExecutionException e) {
- throw ExceptionUtil.propagateException(e);
- }
- }
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubIntegrationModule.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubIntegrationModule.java
index 8251898..8b2911e 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/GitHubIntegrationModule.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/GitHubIntegrationModule.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.pure;
import com.google.inject.AbstractModule;
import com.google.inject.internal.SingletonScope;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnection.java
similarity index 94%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnection.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnection.java
index f07878f..18bca6b 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnection.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.pure;
import java.util.List;
+import org.apache.ignite.ci.github.PullRequest;
public interface IGitHubConnection {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnectionProvider.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnectionProvider.java
index 8c3f66d..86f2507 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/IGitHubConnectionProvider.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/pure/IGitHubConnectionProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.ci.github;
+package org.apache.ignite.ci.github.pure;
import javax.annotation.Nullable;
import org.apache.ignite.ci.user.ICredentialsProv;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/GenerateStatusHtml.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/GenerateStatusHtml.java
index adc81ff..c986665 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/GenerateStatusHtml.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/GenerateStatusHtml.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.apache.ignite.ci.IgniteTeamcityConnection;
import org.apache.ignite.ci.tcmodel.conf.BuildType;
-import org.apache.ignite.ci.teamcity.TcConnectionStaticLinker;
+import org.apache.ignite.ci.teamcity.pure.TcConnectionStaticLinker;
import java.io.*;
import java.util.*;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/IgniteTeamcityHelperRunnerExample.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/IgniteTeamcityHelperRunnerExample.java
index 33c0634..1c4500e 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/IgniteTeamcityHelperRunnerExample.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/IgniteTeamcityHelperRunnerExample.java
@@ -18,14 +18,12 @@
package org.apache.ignite.ci.runners;
import com.google.common.base.Throwables;
-import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
@@ -34,7 +32,7 @@ import org.apache.ignite.ci.IgniteTeamcityConnection;
import org.apache.ignite.ci.tcmodel.conf.BuildType;
import org.apache.ignite.ci.tcmodel.conf.bt.BuildTypeFull;
import org.apache.ignite.ci.tcmodel.conf.bt.SnapshotDependency;
-import org.apache.ignite.ci.teamcity.TcConnectionStaticLinker;
+import org.apache.ignite.ci.teamcity.pure.TcConnectionStaticLinker;
/**
* Local class for running specific checks
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/FileRecordingInputStream.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/FileRecordingInputStream.java
similarity index 98%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/FileRecordingInputStream.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/FileRecordingInputStream.java
index 25e6854..45d1cdf 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/FileRecordingInputStream.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/FileRecordingInputStream.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.teamcity;
+package org.apache.ignite.ci.teamcity.pure;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITcLogin.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcLogin.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITcLogin.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcLogin.java
index 867da4a..7fb46b2 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITcLogin.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITcLogin.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;
+package org.apache.ignite.ci.teamcity.pure;
import org.apache.ignite.ci.tcmodel.user.User;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITeamcityHttpConnection.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITeamcityHttpConnection.java
index bfb0976..8f26955 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ITeamcityHttpConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/ITeamcityHttpConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.teamcity;
+package org.apache.ignite.ci.teamcity.pure;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcConnectionStaticLinker.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcConnectionStaticLinker.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcConnectionStaticLinker.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcConnectionStaticLinker.java
index 2decbb1..aafbe4f 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcConnectionStaticLinker.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcConnectionStaticLinker.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;
+package org.apache.ignite.ci.teamcity.pure;
import org.apache.ignite.ci.IgniteTeamcityConnection;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcLoginImpl.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java
similarity index 98%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcLoginImpl.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java
index 590b6e8..f8aad00 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcLoginImpl.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.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;
+package org.apache.ignite.ci.teamcity.pure;
import org.apache.ignite.ci.ITeamcity;
import org.apache.ignite.ci.tcmodel.user.User;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcRealConnectionModule.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcRealConnectionModule.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcRealConnectionModule.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcRealConnectionModule.java
index e71c678..4d154e7 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TcRealConnectionModule.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcRealConnectionModule.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;
+package org.apache.ignite.ci.teamcity.pure;
import com.google.inject.AbstractModule;
import com.google.inject.internal.SingletonScope;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecorder.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecorder.java
similarity index 98%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecorder.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecorder.java
index 40ec487..7cae7f3 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecorder.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecorder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.teamcity;
+package org.apache.ignite.ci.teamcity.pure;
import com.google.common.base.Charsets;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecordingConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecordingConnection.java
similarity index 96%
rename from
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecordingConnection.java
rename to
ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecordingConnection.java
index 4b41e1c..72ded81 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/TeamcityRecordingConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TeamcityRecordingConnection.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;
+package org.apache.ignite.ci.teamcity.pure;
import org.apache.ignite.ci.util.HttpUtil;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
index ae12e03..41046e3 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
@@ -19,7 +19,6 @@ package org.apache.ignite.ci.visa;
import com.google.common.base.Strings;
import com.google.inject.Provider;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -27,8 +26,10 @@ import javax.ws.rs.QueryParam;
import org.apache.ignite.ci.ITcServerProvider;
import org.apache.ignite.ci.ITeamcity;
import org.apache.ignite.ci.github.GitHubUser;
-import org.apache.ignite.ci.github.IGitHubConnection;
-import org.apache.ignite.ci.github.IGitHubConnectionProvider;
+import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
+import org.apache.ignite.ci.github.ignited.IGitHubConnIgnitedProvider;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.jira.IJiraIntegration;
import org.apache.ignite.ci.observer.BuildObserver;
@@ -47,6 +48,7 @@ public class TcBotTriggerAndSignOffService {
@Inject Provider<BuildObserver> buildObserverProvider;
@Inject IGitHubConnectionProvider gitHubConnectionProvider;
+ @Inject IGitHubConnIgnitedProvider gitHubConnIgnitedProvider;
@Inject ITcServerProvider tcServerProvider;
@@ -177,7 +179,7 @@ public class TcBotTriggerAndSignOffService {
}
public List<ContributionToCheck> getContributionsToCheck(String srvId) {
- IGitHubConnection gitHubConn = gitHubConnectionProvider.server(srvId,
null);
+ IGitHubConnIgnited gitHubConn =
gitHubConnIgnitedProvider.server(srvId, null);
List<PullRequest> requests = gitHubConn.getPullRequests();
if (requests == null)
return null;
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 073b865..26d7489 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
@@ -35,7 +35,7 @@ import org.apache.ignite.ci.TcHelper;
import org.apache.ignite.ci.db.TcHelperDb;
import org.apache.ignite.ci.di.IgniteTcBotModule;
import org.apache.ignite.ci.observer.BuildObserver;
-import org.apache.ignite.ci.teamcity.TeamcityRecorder;
+import org.apache.ignite.ci.teamcity.pure.TeamcityRecorder;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.jetbrains.annotations.Nullable;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index ff9946a..f6f7415 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -23,7 +23,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF =
"https://github.com/apache/ignite-teamcity-bot";;
/** TC Bot Version. */
- public static final String VERSION = "20181004";
+ public static final String VERSION = "20181006";
/** TC Bot Version. */
public String version = VERSION;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
index 8ff78c3..788dd57 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.web.model.current;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
-import org.apache.ignite.ci.github.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
/**
* Created by Дмитрий on 19.02.2018
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java
index 5514a72..6acb1ba 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java
@@ -34,8 +34,8 @@ import javax.ws.rs.core.MediaType;
import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.ITeamcity;
import org.apache.ignite.ci.conf.ServerIntegrationLinks;
-import org.apache.ignite.ci.github.IGitHubConnection;
-import org.apache.ignite.ci.github.IGitHubConnectionProvider;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.visa.TcBotTriggerAndSignOffService;
import org.apache.ignite.ci.web.CtxListener;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
index 5d8b561..065a5e7 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
@@ -22,7 +22,7 @@ import com.google.inject.Injector;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.tcmodel.user.User;
-import org.apache.ignite.ci.teamcity.ITcLogin;
+import org.apache.ignite.ci.teamcity.pure.ITcLogin;
import org.apache.ignite.ci.user.TcHelperUser;
import org.apache.ignite.ci.user.UserAndSessionsStorage;
import org.apache.ignite.ci.util.Base64Util;
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 aad7ffd..43feeae 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
@@ -36,7 +36,7 @@ import com.google.inject.Injector;
import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.issue.IssueDetector;
import org.apache.ignite.ci.tcmodel.user.User;
-import org.apache.ignite.ci.teamcity.ITcLogin;
+import org.apache.ignite.ci.teamcity.pure.ITcLogin;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.user.TcHelperUser;
import org.apache.ignite.ci.user.UserAndSessionsStorage;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java
index 18750de..bb66618 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java
@@ -22,9 +22,7 @@ import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.ci.di.AutoProfilingInterceptor;
import org.apache.ignite.ci.di.MonitoredTaskInterceptor;
-import org.apache.ignite.ci.teamcity.ITeamcityHttpConnection;
-import org.apache.ignite.ci.teamcity.TeamcityRecorder;
-import org.apache.ignite.ci.teamcity.TeamcityRecordingConnection;
+import org.apache.ignite.ci.teamcity.pure.TeamcityRecorder;
import org.apache.ignite.ci.web.CtxListener;
import javax.annotation.security.PermitAll;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/pr/GetPrTestFailures.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/pr/GetPrTestFailures.java
index 152d8d5..885c783 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/pr/GetPrTestFailures.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/pr/GetPrTestFailures.java
@@ -22,8 +22,8 @@ import javax.ws.rs.POST;
import com.google.inject.Injector;
import org.apache.ignite.ci.chain.PrChainsProcessor;
-import org.apache.ignite.ci.github.IGitHubConnection;
-import org.apache.ignite.ci.github.IGitHubConnectionProvider;
+import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.web.BackgroundUpdater;
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
index 47de277..1a21536 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.user;
import org.apache.ignite.ci.tcmodel.user.User;
-import org.apache.ignite.ci.teamcity.ITcLogin;
+import org.apache.ignite.ci.teamcity.pure.ITcLogin;
import org.apache.ignite.ci.util.Base64Util;
import org.apache.ignite.ci.web.auth.AuthenticationFilter;
import org.apache.ignite.ci.web.rest.login.Login;
