Add support for adding workflows from generic Git URLs

Author: MarkRobbo

src/main/java/org/commonwl/view/PageController.java

@@ -35,7 +35,7 @@ public class PageController {
      */
     @GetMapping("/")
     public String homePage(Model model, @RequestParam(value = "url", required = false) String defaultURL) {
-        model.addAttribute("workflowForm", new WorkflowForm(defaultURL));
+        model.addAttribute("workflowForm", new WorkflowForm(defaultURL, "", ""));
         return "index";
     }
 

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

@@ -444,7 +444,7 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
             queued = workflowService.getQueuedWorkflow(gitDetails);
             if (queued == null) {
                 // Validation
-                WorkflowForm workflowForm = new WorkflowForm(gitDetails.getUrl());
+                WorkflowForm workflowForm = new WorkflowForm(gitDetails.getUrl(), gitDetails.getBranch(), gitDetails.getPath());
                 BeanPropertyBindingResult errors = new BeanPropertyBindingResult(workflowForm, "errors");
                 workflowFormValidator.validateAndParse(workflowForm, errors);
                 if (!errors.hasErrors()) {

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

@@ -32,9 +32,13 @@ public class WorkflowForm {
     public WorkflowForm() {}
 
     public WorkflowForm(String url) {
-        if (url != null) {
-            this.url = trimTrailingSlashes(url);
-        }
+        setUrl(url);
+    }
+
+    public WorkflowForm(String url, String branch, String path) {
+        setUrl(url);
+        this.branch = branch;
+        this.path = path;
     }
 
     public String getUrl() {

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

@@ -88,14 +88,18 @@ public Page<Workflow> searchWorkflowsJson(Model model,
     /**
      * Create a new workflow from the given URL
      * @param url The URL of the workflow
+     * @param branch The branch where the workflow can be found
+     * @param path The path within the repository to the workflow file
      * @return Appropriate response code and optional JSON string with message
      */
     @PostMapping(value = "/workflows", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseEntity<?> newWorkflowFromGithubURLJson(@RequestParam(value="url") String url,
-                                                          HttpServletResponse response) {
+    public ResponseEntity<?> newWorkflowFromGitURLJson(@RequestParam(value="url") String url,
+                                                       @RequestParam(value="branch", required=false) String branch,
+                                                       @RequestParam(value="path", required=false) String path,
+                                                       HttpServletResponse response) {
 
-        // Run validator which checks the github URL is valid
-        WorkflowForm workflowForm = new WorkflowForm(url);
+        // Run validator which checks the URL is valid
+        WorkflowForm workflowForm = new WorkflowForm(url, branch, path);
         BeanPropertyBindingResult errors = new BeanPropertyBindingResult(workflowForm, "errors");
         GitDetails gitInfo = workflowFormValidator.validateAndParse(workflowForm, errors);