REST API support for generic git URLs

Author: MarkRobbo

src/main/java/org/commonwl/view/git/GitDetails.java

@@ -19,13 +19,16 @@
 
 package org.commonwl.view.git;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 /**
  * Represents all the parameters necessary to access a file/directory with Git
  */
+@JsonIgnoreProperties(value = {"internalUrl"})
 public class GitDetails implements Serializable {
 
     private String repoUrl;

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

@@ -149,11 +149,11 @@ public ResponseEntity<?> newWorkflowFromGithubURLJson(@RequestParam(value="url")
     @GetMapping(value = {"/workflows/{domain}.com/{owner}/{repoName}/tree/{branch}/**",
                          "/workflows/{domain}.com/{owner}/{repoName}/blob/{branch}/**"},
                 produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Workflow getWorkflowByGithubDetailsJson(@PathVariable("domain") String domain,
-                                                   @PathVariable("owner") String owner,
-                                                   @PathVariable("repoName") String repoName,
-                                                   @PathVariable("branch") String branch,
-                                                   HttpServletRequest request) {
+    public Workflow getWorkflowJson(@PathVariable("domain") String domain,
+                                    @PathVariable("owner") String owner,
+                                    @PathVariable("repoName") String repoName,
+                                    @PathVariable("branch") String branch,
+                                    HttpServletRequest request) {
         // The wildcard end of the URL is the path
         String path = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
         path = WorkflowController.extractPath(path, 7);
@@ -170,6 +170,30 @@ public Workflow getWorkflowByGithubDetailsJson(@PathVariable("domain") String do
         }
     }
 
+    /**
+     * Get JSON representation of a workflow from generic git details
+     * @param branch The branch of the repository
+     * @return The JSON representation of the workflow
+     */
+    @GetMapping(value="/workflows/**/*.git/{branch}/**",
+                produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Workflow getWorkflowJsonGeneric(@PathVariable("branch") String branch,
+                                           HttpServletRequest request) {
+        // The wildcard end of the URL is the path
+        String path = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+
+        // Construct a GitDetails object to search for in the database
+        GitDetails gitDetails = WorkflowController.getGitDetails(11, path, branch);
+
+        // Get workflow
+        Workflow workflowModel = workflowService.getWorkflow(gitDetails);
+        if (workflowModel == null) {
+            throw new WorkflowNotFoundException();
+        } else {
+            return workflowModel;
+        }
+    }
+
     /**
      * Query progress of a queued workflow
      * @param queueID The queued workflow ID to check

src/main/resources/templates/workflow.html

@@ -97,7 +97,7 @@ <h4 id="modalTitle">Dot File Source:</h4>
 </textarea>
                 <a id="download-link-dot" href="" download="workflow.dot"></a>
                 <button id="download-dot" class="btn btn-primary" type="button">Download dot File</button>
-                <a th:href="@{'/workflows/' + ${workflow.id} + '/graph/xdot'}" href="#" download="graph.dot" class="btn btn-primary" type="button">Download xdot File</a>
+                <a th:href="@{${workflow.getVisualisationXdot()}}" href="#" download="graph.dot" class="btn btn-primary" type="button">Download xdot File</a>
             </div>
         </div>
     </div>