Priority of branch and path parameters change

Override path/branch within smart URLs

Author: MarkRobbo

src/main/java/org/commonwl/view/workflow/WorkflowFormValidator.java

@@ -19,6 +19,7 @@
 
 package org.commonwl.view.workflow;
 
+import org.apache.commons.lang.StringUtils;
 import org.commonwl.view.git.GitDetails;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,32 +69,50 @@ public GitDetails validateAndParse(WorkflowForm form, Errors e) {
         // If not null and isn't just whitespace
         if (!e.hasErrors()) {
 
+            // Override if specific branch or path is given in the form
+            String branch = null;
+            String path = null;
+            if (!isEmptyOrWhitespace(form.getBranch())) {
+                branch = form.getBranch();
+            }
+            if (!isEmptyOrWhitespace(form.getPath())) {
+                path = form.getPath();
+            }
+
             // Github URL
             Matcher m = githubCwlPattern.matcher(form.getUrl());
             if (m.find()) {
                 String repoUrl = "https://github.com/" + m.group(1) + "/" + m.group(2) + ".git";
-                return new GitDetails(repoUrl, m.group(3), m.group(4));
+                if (branch == null) branch = m.group(3);
+                if (path == null) path = m.group(4);
+                return new GitDetails(repoUrl, branch, path);
             }
 
             // Gitlab URL
             m = gitlabCwlPattern.matcher(form.getUrl());
             if (m.find()) {
                 String repoUrl = "https://gitlab.com/" + m.group(1) + "/" + m.group(2) + ".git";
-                return new GitDetails(repoUrl, m.group(3), m.group(4));
+                if (branch == null) branch = m.group(3);
+                if (path == null) path = m.group(4);
+                return new GitDetails(repoUrl, branch, path);
             }
 
             // Github Dir URL
             m = githubDirPattern.matcher(form.getUrl());
             if (m.find()) {
                 String repoUrl = "https://github.com/" + m.group(1) + "/" + m.group(2) + ".git";
-                return new GitDetails(repoUrl, m.group(3), m.group(4));
+                if (branch == null) branch = m.group(3);
+                if (path == null) path = m.group(4);
+                return new GitDetails(repoUrl, branch, path);
             }
 
             // Gitlab Dir URL
             m = gitlabDirPattern.matcher(form.getUrl());
             if (m.find()) {
                 String repoUrl = "https://gitlab.com/" + m.group(1) + "/" + m.group(2) + ".git";
-                return new GitDetails(repoUrl, m.group(3), m.group(4));
+                if (branch == null) branch = m.group(3);
+                if (path == null) path = m.group(4);
+                return new GitDetails(repoUrl, branch, path);
             }
 
             // General Git details if didn't match the above
@@ -110,4 +129,15 @@ public GitDetails validateAndParse(WorkflowForm form, Errors e) {
         // Errors will stop this being used anyway
         return null;
     }
+
+    /**
+     * Checks if a string is empty or whitespace
+     * @param str The string to be checked
+     * @return Whether the string is empty or whitespace
+     */
+    private boolean isEmptyOrWhitespace(String str) {
+        return (str == null ||
+                str.length() == 0 ||
+                StringUtils.isWhitespace(str));
+    }
 }