Ordered enum of supported formats, used by WorkflowController

.. to make permalinks at bottom of page

Author: stain

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

@@ -19,33 +19,48 @@
 
 package org.commonwl.view;
 
+import static org.springframework.http.MediaType.parseMediaType;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import static org.springframework.http.MediaType.parseMediaType;
-
 @Configuration
 public class WebConfig extends WebMvcConfigurerAdapter {
 
+    /**
+     * Ordered list of formats as presented on Workflow page - must match the
+     * .mediaType() strings below.
+     *
+     */
+    public static enum formats {
+        html, json, turtle, jsonld, rdfxml, svg, png, dot, zip, ro, yaml, raw
+    }
+
     /**
      * Allows the use of the format query parameter to be used
      * instead of the Accept HTTP header
      */
     @Override
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.favorParameter(true)
-            .mediaType("html", MediaType.TEXT_HTML)
+                // Browser
+                .mediaType("html", MediaType.TEXT_HTML)
+                // API
             .mediaType("json", MediaType.APPLICATION_JSON)
+                // RDF
             .mediaType("turtle", parseMediaType("text/turtle"))
             .mediaType("jsonld", parseMediaType("application/ld+json"))
             .mediaType("rdfxml", parseMediaType("application/rdf+xml"))
+                // Images
             .mediaType("svg", parseMediaType("image/svg+xml"))
             .mediaType("png", MediaType.IMAGE_PNG)
+                .mediaType("dot", parseMediaType("text/vnd+graphviz"))
+                // Archives
+                .mediaType("zip", parseMediaType("application/zip"))
             .mediaType("ro", parseMediaType("application/vnd.wf4ever.robundle+zip"))
-            .mediaType("zip", parseMediaType("application/zip"))
-            .mediaType("dot", parseMediaType("text/vnd+graphviz"))
+                // raw redirects
             .mediaType("yaml", parseMediaType("text/x-yaml"))
             .mediaType("raw", MediaType.APPLICATION_OCTET_STREAM);
     }

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

@@ -19,7 +19,16 @@
 
 package org.commonwl.view.workflow;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 import org.apache.commons.lang.StringUtils;
+import org.commonwl.view.WebConfig;
 import org.commonwl.view.cwl.CWLToolStatus;
 import org.commonwl.view.git.GitDetails;
 import org.commonwl.view.graphviz.GraphVizService;
@@ -36,18 +45,15 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
 @Controller
 public class WorkflowController {
 
@@ -58,15 +64,19 @@ public class WorkflowController {
     private final GraphVizService graphVizService;
 
     /**
-     * Autowired constructor to initialise objects used by the controller
-     * @param workflowFormValidator Validator to validate the workflow form
-     * @param workflowService Builds new Workflow objects
-     * @param graphVizService Generates and stores imagess
+     * Autowired constructor to initialise objects used by the controller.
+     * 
+     * @param workflowFormValidator
+     *            Validator to validate the workflow form
+     * @param workflowService
+     *            Builds new Workflow objects
+     * @param graphVizService
+     *            Generates and stores images
      */
     @Autowired
     public WorkflowController(WorkflowFormValidator workflowFormValidator,
                               WorkflowService workflowService,
-                              GraphVizService graphVizService) {
+            GraphVizService graphVizService) {
         this.workflowFormValidator = workflowFormValidator;
         this.workflowService = workflowService;
         this.graphVizService = graphVizService;
@@ -532,7 +542,8 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
             }
             return new ModelAndView("loading", "queued", queued);
         } else {
-            return new ModelAndView("workflow", "workflow", workflowModel);
+            return new ModelAndView("workflow", "workflow", workflowModel).addObject("formats",
+                    WebConfig.formats.values());
         }
     }
 }