Merge pull request #11 from common-workflow-language/nonexistant-workflow

Prevent IndexOutOfBoundsException when no workflow exists

Author: MarkRobbo

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.commonwl</groupId>
-	<artifactId>cwlviewer</artifactId>
+	<artifactId>cwlvisualiser</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 

src/main/java/org/commonwl/viewer/domain/CWLCollection.java

@@ -144,6 +144,11 @@ private void findMainWorkflow() {
     public Workflow getWorkflow() {
         if (mainWorkflowIndex < 0) {
             findMainWorkflow();
+
+            // If it is still less than 0 there is no workflow to be found
+            if (mainWorkflowIndex < 0) {
+                return null;
+            }
         }
         JsonNode mainWorkflow = cwlDocs.get(mainWorkflowIndex);
         return new Workflow(extractLabel(mainWorkflow), extractDoc(mainWorkflow),

src/main/java/org/commonwl/viewer/services/WorkflowFactory.java

@@ -66,15 +66,20 @@ public Workflow workflowFromGithub(String githubURL) {
 
                 // Get the workflow model
                 Workflow workflowModel = cwlFiles.getWorkflow();
-                workflowModel.setRetrievedOn(new Date());
-                workflowModel.setRetrievedFrom(githubInfo);
+                if (workflowModel != null) {
+                    // Set origin details
+                    workflowModel.setRetrievedOn(new Date());
+                    workflowModel.setRetrievedFrom(githubInfo);
 
-                // Save to the MongoDB database
-                workflowRepository.save(workflowModel);
+                    // Save to the MongoDB database
+                    workflowRepository.save(workflowModel);
 
-                // Return this model to be displayed
-                return workflowModel;
+                    // Return this model to be displayed
+                    return workflowModel;
 
+                } else {
+                    System.out.println("Error: no workflow could be found");
+                }
             } catch (IOException ex) {
                 System.out.println("Error: " + ex.getMessage());
             }

src/main/java/org/commonwl/viewer/web/WorkflowController.java

@@ -66,6 +66,12 @@ public ModelAndView newWorkflowFromGithubURL(@Valid WorkflowForm workflowForm, B
             // Create a workflow from the github URL
             Workflow newWorkflow = workflowFactory.workflowFromGithub(workflowForm.getGithubURL());
 
+            // Runtime error
+            if (newWorkflow == null) {
+                bindingResult.rejectValue("githubURL", "githubURL.parsingError");
+                return new ModelAndView("index");
+            }
+
             // Return new workflow along with the workflow view
             return new ModelAndView("workflow", "workflow", newWorkflow);
         }

src/main/resources/messages.properties

@@ -2,4 +2,5 @@
 githubURL.emptyOrWhitespace = URL may not be empty
 githubURL.invalid = You must enter a valid Github directory URL
 githubURL.apiError = API Error - does the specified Github directory exist?
-githubURL.missingWorkflow = No .cwl files were found in the specified Github directory
+githubURL.missingWorkflow = No .cwl files were found in the specified Github directory
+githubURL.parsingError = The workflow could not be parsed from the given URL