Fix build links when folders are in use

Closes github issue terabyte#12
memory · Nov 10, 2015 · 3a64f68 · 3a64f68
1 parent d9addc9
commit 3a64f68
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/src/main/java/com/palantir/stash/stashbot/urlbuilder/StashbotUrlBuilder.java b/src/main/java/com/palantir/stash/stashbot/urlbuilder/StashbotUrlBuilder.java
@@ -17,6 +17,8 @@
 import java.net.URLEncoder;
 import java.sql.SQLException;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.atlassian.bitbucket.nav.NavBuilder;
 import com.atlassian.bitbucket.pull.PullRequest;
 import com.atlassian.bitbucket.repository.Repository;
@@ -35,7 +37,7 @@ public class StashbotUrlBuilder {
     private final RepositoryService rs;
 
     public StashbotUrlBuilder(ConfigurationPersistenceService cps, NavBuilder nb, RepositoryService rs) {
-    	this.cps = cps;
+        this.cps = cps;
         this.nb = nb;
         this.rs = rs;
     }
@@ -108,16 +110,35 @@ private String mask(String str) {
             return str;
         }
     }
-
+
+    /* NOTE: elsewhere in JenkinsManager, we generate this URL (when folders are enabled) by fetching the entire folder chain from jenkins.
+     * But in places where we are generating the links only, we don't want to have several server round-trips so we will instead assume it
+     * exists and just create the URL.
+     */
     public String getJenkinsJobUrl(Repository repo, JobTemplate jt) throws SQLException {
         RepositoryConfiguration rc = cps.getRepositoryConfigurationForRepository(repo);
         JenkinsServerConfiguration jsc = cps.getJenkinsServerConfiguration(rc.getJenkinsServerName());
-        // XXX this is broken with folders, I think
-        String key = jt.getBuildNameFor(repo);
-        String url = jsc.getUrl() + "/job/" + key;
+        String baseUrl = jsc.getUrl();
+        String prefix = "";
+        if (jsc.getFolderSupportEnabled()) {
+            prefix = prefix + jsc.getFolderPrefix();
+        }
+        if (jsc.getUseSubFolders()) {
+            if (!prefix.isEmpty()) {
+                prefix = prefix + "/" + jt.getPathFor(repo);
+            } else {
+                prefix = jt.getPathFor(repo);
+            }
+        }
+        String url = baseUrl;
+        if (!prefix.isEmpty()) {
+            url = url + "/job/" + StringUtils.join(prefix.split("/"), "/job/");
+        }
+        url = url + "/job/" + jt.getBuildNameFor(repo);
         return url;
     }
+
     public String getJenkinsBuildUrl(Repository repo, JobTemplate jt, long buildNumber) throws SQLException {
-    	return getJenkinsJobUrl(repo, jt) + "/" + Long.toString(buildNumber);
+        return getJenkinsJobUrl(repo, jt) + "/" + Long.toString(buildNumber);
     }
 }