[ignite-teamcity-bot] branch master updated: Link to suite history bug fixed

[dpavlov]

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 908168a  Link to suite history bug fixed
908168a is described below

commit 908168ac08c9db86f5ffc533dcbc66dba4a15746
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Wed Jul 31 21:40:45 2019 +0300

    Link to suite history bug fixed
---
 .../java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java   |  3 +--
 .../java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java   | 13 ++++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
index 14a1c06..47b7d0b 100644
--- 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
+++ 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
@@ -37,7 +37,6 @@ import org.apache.ignite.tcbot.persistence.IStringCompactor;
 import org.apache.ignite.tcignited.ITeamcityIgnited;
 import org.apache.ignite.tcservice.model.conf.BuildType;
 
-import static org.apache.ignite.tcbot.engine.ui.DsSuiteUi.branchForLink;
 import static 
org.apache.ignite.tcbot.engine.ui.DsSuiteUi.createOccurForLogConsumer;
 import static 
org.apache.ignite.tcbot.engine.ui.DsSuiteUi.createOrrucForLongRun;
 import static org.apache.ignite.tcignited.history.RunHistSync.normalizeBranch;
@@ -277,7 +276,7 @@ public class DsChainUi {
     }
 
     private static String buildWebLink(ITeamcityIgnited teamcity, 
FullChainRunCtx suite) {
-        final String branch = branchForLink(suite.branchName());
+        final String branch = normalizeBranch(suite.branchName());
         return teamcity.host() + "viewType.html?buildTypeId=" + suite.suiteId()
             + "&branch=" + UrlUtil.escape(branch)
             + "&tab=buildTypeStatusDiv";
diff --git 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
index ab99a53..a4bb266 100644
--- 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
+++ 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
@@ -249,7 +249,7 @@ public class DsSuiteUi extends ShortSuiteUi {
         queuedBuildCount = suite.queuedBuildCount();
         serverId = tcIgnited.serverCode();
         suiteId = suite.suiteId();
-        branchName = branchForLink(suite.branchName());
+        branchName = normalizeBranch(suite.branchName());
 
         tags = suite.tags();
 
@@ -353,24 +353,19 @@ public class DsSuiteUi extends ShortSuiteUi {
         return buildWebLinkToHist(teamcity, suite, branchName);
     }
 
-
     @Nonnull private static String buildWebLinkToHist(ITeamcityIgnited 
teamcity, MultBuildRunCtx suite, String branchName) {
-        final String branch = branchForLink(branchName);
+        final String branch = normalizeBranch(branchName);
         return teamcity.host() + "buildConfiguration/" + suite.suiteId()
-            + "?branch" + UrlUtil.escape(branch) ;
+            + "?branch=" + UrlUtil.escape(branch);
     }
 
     @Nonnull private static String buildWebLinkToHistOldUi(ITeamcityIgnited 
teamcity, MultBuildRunCtx suite, String branchName) {
-        final String branch = branchForLink(branchName);
+        final String branch = normalizeBranch(branchName);
         return teamcity.host() + "viewType.html?buildTypeId=" + suite.suiteId()
             + "&branch=" + UrlUtil.escape(branch)
             + "&tab=buildTypeStatusDiv";
     }
 
-    public static String branchForLink(@Nullable String branchName) {
-        return normalizeBranch(branchName);
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)