Skip to content

Commit 7c0a114

Browse files
committed
allow some CWL extensions that we know about
1 parent 464e5ac commit 7c0a114

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ private String runCwltoolOnWorkflow(String argument, String workflowUrl)
107107
"--disable-color",
108108
"--non-strict",
109109
"--quiet",
110+
"--enable-dev",
111+
"--enable-ext",
110112
"--skip-schemas",
111113
argument,
112114
workflowUrl

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.fasterxml.jackson.databind.node.ObjectNode;
55
import java.util.HashMap;
66
import java.util.Map;
7-
87
import org.apache.commons.lang3.StringUtils;
98
import org.commonwl.view.util.LicenseUtils;
109
import org.springframework.context.annotation.Bean;
@@ -24,7 +23,7 @@ public Map<String, String> licenseVocab() {
2423
restTemplate.getForObject(LicenseUtils.SPDX_LICENSES_JSON_URL, ObjectNode.class);
2524
if (jsonLicenses == null) {
2625
throw new GitLicenseException(
27-
"Failed to load SPDX licenses from " + LicenseUtils.SPDX_LICENSES_JSON_URL);
26+
"Failed to load SPDX licenses from " + LicenseUtils.SPDX_LICENSES_JSON_URL);
2827
}
2928
Map<String, String> licenseMap = new HashMap<>();
3029
for (JsonNode license : jsonLicenses.withArray("licenses")) {

src/main/java/org/commonwl/view/util/FileUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.io.IOException;
55
import java.nio.file.Path;
66
import java.util.regex.Pattern;
7-
87
import org.apache.taverna.robundle.Bundle;
98
import org.apache.taverna.robundle.fs.BundleFileSystem;
109
import org.eclipse.jgit.api.Git;
@@ -75,8 +74,9 @@ public static void deleteTemporaryGitRepository(Git repo) throws IOException {
7574
&& repo.getRepository() != null
7675
&& repo.getRepository().getDirectory() != null
7776
&& repo.getRepository().getDirectory().getParentFile() != null) {
78-
if (UUID_REGEX_PATTERN.matcher(
79-
repo.getRepository().getDirectory().getParentFile().getName()).matches()) {
77+
if (UUID_REGEX_PATTERN
78+
.matcher(repo.getRepository().getDirectory().getParentFile().getName())
79+
.matches()) {
8080
deleteGitRepository(repo);
8181
}
8282
}

src/test/java/org/commonwl/view/cwl/CWLServiceTest.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,20 @@
1919

2020
package org.commonwl.view.cwl;
2121

22+
import static org.apache.commons.io.FileUtils.readFileToString;
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertNotNull;
25+
import static org.junit.jupiter.api.Assertions.assertNull;
26+
import static org.junit.jupiter.api.Assertions.assertTrue;
27+
import static org.mockito.ArgumentMatchers.any;
28+
import static org.mockito.Mockito.when;
29+
30+
import java.io.ByteArrayInputStream;
31+
import java.io.File;
32+
import java.io.IOException;
33+
import java.nio.file.Paths;
34+
import java.util.List;
35+
import java.util.Map;
2236
import org.apache.jena.query.Dataset;
2337
import org.apache.jena.query.DatasetFactory;
2438
import org.apache.jena.query.Query;
@@ -43,21 +57,6 @@
4357
import org.mockito.stubbing.Answer;
4458
import org.springframework.test.context.ContextConfiguration;
4559

46-
import java.io.ByteArrayInputStream;
47-
import java.io.File;
48-
import java.io.IOException;
49-
import java.nio.file.Paths;
50-
import java.util.List;
51-
import java.util.Map;
52-
53-
import static org.apache.commons.io.FileUtils.readFileToString;
54-
import static org.junit.jupiter.api.Assertions.assertEquals;
55-
import static org.junit.jupiter.api.Assertions.assertNotNull;
56-
import static org.junit.jupiter.api.Assertions.assertNull;
57-
import static org.junit.jupiter.api.Assertions.assertTrue;
58-
import static org.mockito.ArgumentMatchers.any;
59-
import static org.mockito.Mockito.when;
60-
6160
@ContextConfiguration(classes = {GitConfig.class})
6261
public class CWLServiceTest {
6362

0 commit comments

Comments
 (0)