Initialize simple objects outside of constructor
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/CWLParser.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/CWLParser.java
index 382208d..9e764e0 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/CWLParser.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/CWLParser.java
@@ -35,11 +35,11 @@
public class CWLParser {
private JsonNode cwlFile;
- private YAMLHelper yamlHelper;
+ private YAMLHelper yamlHelper = new YAMLHelper();
public CWLParser(JsonNode cwlFile) {
this.cwlFile = cwlFile;
- this.yamlHelper = new YAMLHelper();
+ this.yamlHelper;
}
public Set<Step> parseSteps() {
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/WorkflowParser.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/WorkflowParser.java
index b18dc54..b66991c 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/WorkflowParser.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/WorkflowParser.java
@@ -53,38 +53,24 @@
private static final String FILE_NAME = "/hello_world.cwl";
private CWLParser cwlParser;
- private Converter converter;
+ private Converter converter = new Converter();
- private Map<String, InputWorkflowPort> workflowInputs;
- private Map<String, OutputWorkflowPort> workflowOutputs;
- private Map<String, Processor> workflowProcessors;
- private Map<String, InputProcessorPort> processorInputs;
- private Map<String, OutputProcessorPort> processorOutputs;
- private Set<DataLink> dataLinks;
+ private Map<String, InputWorkflowPort> workflowInputs = new HashMap<>();
+ private Map<String, OutputWorkflowPort> workflowOutputs = new HashMap<>();
+ private Map<String, Processor> workflowProcessors = new HashMap<>();
+ private Map<String, InputProcessorPort> processorInputs = new HashMap<>();
+ private Map<String, OutputProcessorPort> processorOutputs = new HashMap<>();
+ private Set<DataLink> dataLinks = new HashSet<DataLink>();
public WorkflowParser() {
Yaml reader = new Yaml();
ObjectMapper mapper = new ObjectMapper();
JsonNode cwlFile = mapper.valueToTree(reader.load(WorkflowParser.class.getResourceAsStream(FILE_NAME)));
this.cwlParser = new CWLParser(cwlFile);
- this.converter = new Converter();
- workflowInputs = new HashMap<>();
- workflowOutputs = new HashMap<>();
- workflowProcessors = new HashMap<>();
- processorInputs = new HashMap<>();
- processorOutputs = new HashMap<>();
- dataLinks = new HashSet<DataLink>();
}
public WorkflowParser(JsonNode cwlFile) {
this.cwlParser = new CWLParser(cwlFile);
- this.converter = new Converter();
- workflowInputs = new HashMap<>();
- workflowOutputs = new HashMap<>();
- workflowProcessors = new HashMap<>();
- processorInputs = new HashMap<>();
- processorOutputs = new HashMap<>();
- dataLinks = new HashSet<DataLink>();
}
public Workflow buildWorkflow() {
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/CommandLineTool.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/CommandLineTool.java
index d05d38a..db954aa 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/CommandLineTool.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/CommandLineTool.java
@@ -39,14 +39,12 @@
private JsonNode node;
private String baseCommand = null;
- private Map<String, InputProcessorPort> processorInputs;
- private Map<String, OutputProcessorPort> processorOutputs;
+ private Map<String, InputProcessorPort> processorInputs = new HashMap<>();
+ private Map<String, OutputProcessorPort> processorOutputs = new HashMap<>();
public CommandLineTool(JsonNode node) {
this.node = node;
this.cwlParser = new CWLParser(node);
- this.processorInputs = new HashMap<>();
- this.processorOutputs = new HashMap<>();
this.parse();
this.receiverPorts = new HashSet(processorInputs.values());
this.senderPorts = new HashSet(processorOutputs.values());
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/WorkflowProcess.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/WorkflowProcess.java
index c56cbb5..afee5da 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/WorkflowProcess.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/components/WorkflowProcess.java
@@ -49,24 +49,17 @@
private CWLParser cwlParser;
- private Map<String, InputWorkflowPort> workflowInputs;
- private Map<String, OutputWorkflowPort> workflowOutputs;
- private Map<String, Processor> workflowProcessors;
- private Map<String, InputProcessorPort> processorInputs;
- private Map<String, OutputProcessorPort> processorOutputs;
- private Set<DataLink> dataLinks;
+ private Map<String, InputWorkflowPort> workflowInputs = new HashMap<>();
+ private Map<String, OutputWorkflowPort> workflowOutputs = new HashMap<>();
+ private Map<String, Processor> workflowProcessors = new HashMap<>();
+ private Map<String, InputProcessorPort> processorInputs = new HashMap<>();
+ private Map<String, OutputProcessorPort> processorOutputs = new HashMap<>();
+ private Set<DataLink> dataLinks = new HashSet<>();
- private Converter converter;
+ private Converter converter = new Converter();
public WorkflowProcess(JsonNode node) {
cwlParser = new CWLParser(node);
- converter = new Converter();
- workflowInputs = new HashMap<>();
- workflowOutputs = new HashMap<>();
- workflowProcessors = new HashMap<>();
- processorInputs = new HashMap<>();
- processorOutputs = new HashMap<>();
- dataLinks = new HashSet<>();
this.parse();
this.receiverPorts = new HashSet(workflowInputs.values());
this.senderPorts = new HashSet(workflowOutputs.values());
