Skip to content

Commit 9f9c5c8

Browse files
committed
Remove unused injection of applicationURL from controller
1 parent 1cdc077 commit 9f9c5c8

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

src/main/java/org/commonwl/view/cwl/CWLService.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@
1919

2020
package org.commonwl.view.cwl;
2121

22-
import static org.apache.commons.io.FileUtils.readFileToString;
23-
24-
import java.io.ByteArrayInputStream;
25-
import java.io.File;
26-
import java.io.IOException;
27-
import java.io.StringWriter;
28-
import java.util.ArrayList;
29-
import java.util.HashMap;
30-
import java.util.Iterator;
31-
import java.util.List;
32-
import java.util.Map;
33-
22+
import com.fasterxml.jackson.databind.JsonNode;
23+
import com.fasterxml.jackson.databind.ObjectMapper;
24+
import com.fasterxml.jackson.databind.node.ArrayNode;
25+
import com.fasterxml.jackson.databind.node.ObjectNode;
26+
import com.fasterxml.jackson.databind.node.TextNode;
3427
import org.apache.commons.io.FileUtils;
3528
import org.apache.commons.io.FilenameUtils;
3629
import org.apache.jena.iri.IRI;
@@ -54,11 +47,13 @@
5447
import org.springframework.stereotype.Service;
5548
import org.yaml.snakeyaml.Yaml;
5649

57-
import com.fasterxml.jackson.databind.JsonNode;
58-
import com.fasterxml.jackson.databind.ObjectMapper;
59-
import com.fasterxml.jackson.databind.node.ArrayNode;
60-
import com.fasterxml.jackson.databind.node.ObjectNode;
61-
import com.fasterxml.jackson.databind.node.TextNode;
50+
import java.io.ByteArrayInputStream;
51+
import java.io.File;
52+
import java.io.IOException;
53+
import java.io.StringWriter;
54+
import java.util.*;
55+
56+
import static org.apache.commons.io.FileUtils.readFileToString;
6257

6358
/**
6459
* Provides CWL parsing for workflows to gather an overview

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ public ModelAndView createWorkflow(@Valid WorkflowForm workflowForm, BindingResu
168168
*/
169169
@GetMapping(value={"/workflows/{domain}.com/{owner}/{repoName}/tree/{branch}/**",
170170
"/workflows/{domain}.com/{owner}/{repoName}/blob/{branch}/**"})
171-
public ModelAndView getWorkflow(@Value("${applicationURL}") String applicationURL,
172-
@PathVariable("domain") String domain,
171+
public ModelAndView getWorkflow(@PathVariable("domain") String domain,
173172
@PathVariable("owner") String owner,
174173
@PathVariable("repoName") String repoName,
175174
@PathVariable("branch") String branch,
@@ -183,8 +182,7 @@ public ModelAndView getWorkflow(@Value("${applicationURL}") String applicationUR
183182
GitDetails gitDetails = getGitDetails(domain, owner, repoName, branch, path);
184183

185184
// Get workflow
186-
ModelAndView modelAndView = getWorkflow(gitDetails, redirectAttrs);
187-
return modelAndView.addObject("appURL", applicationURL);
185+
return getWorkflow(gitDetails, redirectAttrs);
188186
}
189187

190188
/**
@@ -199,8 +197,7 @@ public ModelAndView getWorkflowGeneric(@Value("${applicationURL}") String applic
199197
RedirectAttributes redirectAttrs) {
200198
String path = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
201199
GitDetails gitDetails = getGitDetails(11, path, branch);
202-
ModelAndView modelAndView = getWorkflow(gitDetails, redirectAttrs);
203-
return modelAndView.addObject("appURL", applicationURL);
200+
return getWorkflow(gitDetails, redirectAttrs);
204201
}
205202

206203
/**

0 commit comments

Comments
 (0)