You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/26 13:43:43 UTC
[47/50] incubator-taverna-language git commit: public fields. setters
for single values
public fields. setters for single values
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/67664115
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/67664115
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/67664115
Branch: refs/heads/cwl
Commit: 67664115f25cb28d0fde23ea125838e1b43fb29d
Parents: 52bb54e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 20 19:01:47 2016 +0200
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 20 19:01:47 2016 +0200
----------------------------------------------------------------------
.../scufl2/cwl/workflow/CWLCommandLineBinding.java | 14 +++++++-------
.../scufl2/cwl/workflow/CWLCommandOutputBinding.java | 6 +++---
.../taverna/scufl2/cwl/workflow/CWLDirectory.java | 2 +-
.../apache/taverna/scufl2/cwl/workflow/CWLFile.java | 10 +++++-----
.../cwl/workflow/CWLInlineJavascriptRequirement.java | 2 +-
.../scufl2/cwl/workflow/CWLInputArraySchema.java | 10 +++++-----
.../scufl2/cwl/workflow/CWLInputRecordField.java | 8 ++++----
.../scufl2/cwl/workflow/CWLOutputArraySchema.java | 10 +++++-----
.../scufl2/cwl/workflow/CWLOutputEnumSchema.java | 10 +++++-----
.../scufl2/cwl/workflow/CWLOutputRecordField.java | 14 +++++++-------
.../scufl2/cwl/workflow/CWLOutputRecordSchema.java | 8 ++++----
.../apache/taverna/scufl2/cwl/workflow/CWLSchema.java | 5 -----
.../scufl2/cwl/workflow/CWLSchemaDefRequirement.java | 4 +++-
.../scufl2/cwl/workflow/CWLWorkflowStepOutput.java | 2 +-
14 files changed, 51 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandLineBinding.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandLineBinding.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandLineBinding.java
index 33fbba3..9e1bcc2 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandLineBinding.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandLineBinding.java
@@ -1,11 +1,11 @@
package org.apache.taverna.scufl2.cwl.workflow;
public class CWLCommandLineBinding {
- Boolean loadContents;
- Integer position;
- String prefix;
- Boolean separate;
- String itemSeparator;
- String valueFrom;
- Boolean shellQuote;
+ public Boolean loadContents;
+ public Integer position;
+ public String prefix;
+ public Boolean separate;
+ public String itemSeparator;
+ public String valueFrom;
+ public Boolean shellQuote;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandOutputBinding.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandOutputBinding.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandOutputBinding.java
index 2376243..f176112 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandOutputBinding.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLCommandOutputBinding.java
@@ -3,7 +3,7 @@ package org.apache.taverna.scufl2.cwl.workflow;
import java.util.List;
public class CWLCommandOutputBinding {
- List<String> glob;
- Boolean loadContents;
- String outputEval;
+ public List<String> glob;
+ public Boolean loadContents;
+ public String outputEval;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLDirectory.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLDirectory.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLDirectory.java
index e76e9c7..3071ba3 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLDirectory.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLDirectory.java
@@ -7,6 +7,6 @@ public class CWLDirectory {
@JsonProperty(value="class", defaultValue=DIRECTORY, required=true)
public String klass = DIRECTORY;
@JsonProperty(required=true)
- String path;
+ public String path;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLFile.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLFile.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLFile.java
index b2b0784..7f1cf13 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLFile.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLFile.java
@@ -9,10 +9,10 @@ public class CWLFile {
@JsonProperty(value="class", defaultValue=FILE, required=true)
public String klass = FILE;
@JsonProperty(required=true)
- String path;
- String checksum;
- Long size;
- List<CWLFile> secondaryFiles;
- String format;
+ public String path;
+ public String checksum;
+ public Long size;
+ public List<CWLFile> secondaryFiles;
+ public String format;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInlineJavascriptRequirement.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInlineJavascriptRequirement.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInlineJavascriptRequirement.java
index e25efd9..bbd6d89 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInlineJavascriptRequirement.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInlineJavascriptRequirement.java
@@ -7,5 +7,5 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class CWLInlineJavascriptRequirement extends CWLRequirement {
@JsonProperty("class")
public String klass;
- List<String> expressionLib;
+ public List<String> expressionLib;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputArraySchema.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputArraySchema.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputArraySchema.java
index 8aa684a..8c80418 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputArraySchema.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputArraySchema.java
@@ -9,11 +9,11 @@ public class CWLInputArraySchema {
@JsonProperty(required=true, defaultValue="array")
public String type = "array";
- List<JsonNode> types;
+ public List<JsonNode> types;
- List<String> secondaryFiles;
- List<String> format;
- Boolean streamable;
- CWLCommandLineBinding inputBinding;
+ public List<String> secondaryFiles;
+ public List<String> format;
+ public Boolean streamable;
+ public CWLCommandLineBinding inputBinding;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputRecordField.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputRecordField.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputRecordField.java
index 553b841..8ff2b6b 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputRecordField.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLInputRecordField.java
@@ -3,8 +3,8 @@ package org.apache.taverna.scufl2.cwl.workflow;
import java.util.List;
public class CWLInputRecordField {
- String name;
- List<String> type;
- String doc;
- CWLCommandLineBinding inputBinding;
+ public String name;
+ public List<String> type;
+ public String doc;
+ public CWLCommandLineBinding inputBinding;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputArraySchema.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputArraySchema.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputArraySchema.java
index edaa1d7..a868ae9 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputArraySchema.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputArraySchema.java
@@ -9,10 +9,10 @@ public class CWLOutputArraySchema {
public String type = "array";
@JsonProperty(required=true)
- List<String> items;
- List<String> secondaryFiles;
- List<String> format;
- Boolean streamable;
- CWLCommandOutputBinding outputBinding;
+ public List<String> items;
+ public List<String> secondaryFiles;
+ public List<String> format;
+ public Boolean streamable;
+ public CWLCommandOutputBinding outputBinding;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputEnumSchema.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputEnumSchema.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputEnumSchema.java
index 5d4f5d5..d369100 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputEnumSchema.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputEnumSchema.java
@@ -8,10 +8,10 @@ public class CWLOutputEnumSchema {
@JsonProperty(required=true, defaultValue="enum")
public String type = "enum";
- List<String> symbols;
- List<String> secondaryFiles;
- List<String> format;
- Boolean streamable;
- CWLCommandOutputBinding outputBinding;
+ public List<String> symbols;
+ public List<String> secondaryFiles;
+ public List<String> format;
+ public Boolean streamable;
+ public CWLCommandOutputBinding outputBinding;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordField.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordField.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordField.java
index 50c56fd..23166ed 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordField.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordField.java
@@ -5,11 +5,11 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
public class CWLOutputRecordField {
- @JsonProperty(required=true)
- String name;
- @JsonProperty(required=true)
- List<String> type;
- String doc;
- CWLCommandOutputBinding outputBinding;
-
+ @JsonProperty(required = true)
+ public String name;
+ @JsonProperty(required = true)
+ public List<String> type;
+ public String doc;
+ public CWLCommandOutputBinding outputBinding;
+
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordSchema.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordSchema.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordSchema.java
index 0cb0a3a..c3dd9a2 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordSchema.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLOutputRecordSchema.java
@@ -8,8 +8,8 @@ public class CWLOutputRecordSchema {
@JsonProperty(required=true, defaultValue="record")
public String type="record";
- List<CWLOutputRecordField> fields;
- List<String> secondaryFiles;
- List<String> format;
- boolean streamable;
+ public List<CWLOutputRecordField> fields;
+ public List<String> secondaryFiles;
+ public List<String> format;
+ public boolean streamable;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchema.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchema.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchema.java
deleted file mode 100644
index 1374b32..0000000
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchema.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.taverna.scufl2.cwl.workflow;
-
-public interface CWLSchema {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchemaDefRequirement.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchemaDefRequirement.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchemaDefRequirement.java
index c905810..b615f88 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchemaDefRequirement.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLSchemaDefRequirement.java
@@ -2,7 +2,9 @@ package org.apache.taverna.scufl2.cwl.workflow;
import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
public class CWLSchemaDefRequirement extends CWLRequirement {
public String klass;
- public List<CWLSchema> types;
+ public List<JsonNode> types;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/67664115/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLWorkflowStepOutput.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLWorkflowStepOutput.java b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLWorkflowStepOutput.java
index 6861db0..ea82fda 100644
--- a/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLWorkflowStepOutput.java
+++ b/taverna-scufl2-cwl/src/main/java/org/apache/taverna/scufl2/cwl/workflow/CWLWorkflowStepOutput.java
@@ -4,5 +4,5 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class CWLWorkflowStepOutput {
@JsonProperty(required=true)
- String id;
+ public String id;
}