Skip to content

Commit 24e31cd

Browse files
committed
refresh with latest schema-salad, proposed CWL v1.2.1 changes
1 parent 1b53530 commit 24e31cd

13 files changed

+46
-21
lines changed

src/main/java/org/w3id/cwl/cwl1_2/CWLType.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@
1717
import org.w3id.cwl.cwl1_2.utils.ValidationException;
1818

1919
public enum CWLType {
20+
NULL("null"),
21+
BOOLEAN("boolean"),
22+
INT("int"),
23+
LONG("long"),
24+
FLOAT("float"),
25+
DOUBLE("double"),
26+
STRING("string"),
2027
FILE("File"),
2128
DIRECTORY("Directory");
2229

23-
private static String[] symbols = new String[] {"File", "Directory"};
30+
private static String[] symbols = new String[] {"null", "boolean", "int", "long", "float", "double", "string", "File", "Directory"};
2431
private String docVal;
2532

2633
private CWLType(final String docVal) {

src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,10 @@ public interface CommandLineTool extends Process, Savable {
193193
* Capture the command's standard output stream to a file written to
194194
* the designated output directory.
195195
*
196+
* If the `CommandLineTool` contains logically chained commands
197+
* (e.g. `echo a && echo b`) `stdout` must include the output of
198+
* every command.
199+
*
196200
* If `stdout` is a string, it specifies the file name to use.
197201
*
198202
* If `stdout` is an expression, the expression is evaluated and must

src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ public Object getStderr() {
273273
* Capture the command's standard output stream to a file written to
274274
* the designated output directory.
275275
*
276+
* If the `CommandLineTool` contains logically chained commands
277+
* (e.g. `echo a && echo b`) `stdout` must include the output of
278+
* every command.
279+
*
276280
* If `stdout` is a string, it specifies the file name to use.
277281
*
278282
* If `stdout` is an expression, the expression is evaluated and must

src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#InitialWorkDirRequirement</I><BR>This interface is implemented by {@link InitialWorkDirRequirementImpl}<BR> <BLOCKQUOTE>
2121
Define a list of files and subdirectories that must be staged by the workflow platform prior to executing the command line tool.
22-
Normally files are staged within the designated output directory. However, when running inside containers, files may be staged at arbitrary locations, see discussion for `Dirent.entryname`. Together with `DockerRequirement.dockerOutputDirectory` this it possible to control the locations of both input and output files when running in containers. </BLOCKQUOTE>
22+
Normally files are staged within the designated output directory. However, when running inside containers, files may be staged at arbitrary locations, see discussion for [`Dirent.entryname`](#Dirent). Together with `DockerRequirement.dockerOutputDirectory` it is possible to control the locations of both input and output files when running in containers. </BLOCKQUOTE>
2323
*/
2424
public interface InitialWorkDirRequirement extends ProcessRequirement, Savable {
2525
/**

src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#InitialWorkDirRequirement</I><BR> <BLOCKQUOTE>
2525
Define a list of files and subdirectories that must be staged by the workflow platform prior to executing the command line tool.
26-
Normally files are staged within the designated output directory. However, when running inside containers, files may be staged at arbitrary locations, see discussion for `Dirent.entryname`. Together with `DockerRequirement.dockerOutputDirectory` this it possible to control the locations of both input and output files when running in containers. </BLOCKQUOTE>
26+
Normally files are staged within the designated output directory. However, when running inside containers, files may be staged at arbitrary locations, see discussion for [`Dirent.entryname`](#Dirent). Together with `DockerRequirement.dockerOutputDirectory` it is possible to control the locations of both input and output files when running in containers. </BLOCKQUOTE>
2727
*/
2828
public class InitialWorkDirRequirementImpl extends SavableImpl implements InitialWorkDirRequirement {
2929
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();

src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchema.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ public interface SecondaryFileSchema extends Savable {
7070
* secondary file from that expression.
7171
*
7272
* To work on non-filename-preserving storage systems, portable
73-
* tool descriptions should treat `location` as an opaque
74-
* identifier and avoid constructing new values from `location`,
75-
* but should construct relative references using `basename` or
76-
* `nameroot` instead, or propagate `location` from defined inputs.
73+
* tool descriptions should treat `location` as an
74+
* [opaque identifier](#opaque-strings) and avoid constructing new
75+
* values from `location`, but should construct relative references
76+
* using `basename` or `nameroot` instead, or propagate `location`
77+
* from defined inputs.
7778
*
7879
* If a value in `secondaryFiles` is a string that is not an expression,
7980
* it specifies that the following pattern should be applied to the path

src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchemaImpl.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ public class SecondaryFileSchemaImpl extends SavableImpl implements SecondaryFil
8080
* secondary file from that expression.
8181
*
8282
* To work on non-filename-preserving storage systems, portable
83-
* tool descriptions should treat `location` as an opaque
84-
* identifier and avoid constructing new values from `location`,
85-
* but should construct relative references using `basename` or
86-
* `nameroot` instead, or propagate `location` from defined inputs.
83+
* tool descriptions should treat `location` as an
84+
* [opaque identifier](#opaque-strings) and avoid constructing new
85+
* values from `location`, but should construct relative references
86+
* using `basename` or `nameroot` instead, or propagate `location`
87+
* from defined inputs.
8788
*
8889
* If a value in `secondaryFiles` is a string that is not an expression,
8990
* it specifies that the following pattern should be applied to the path

src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#ShellCommandRequirement</I><BR>This interface is implemented by {@link ShellCommandRequirementImpl}<BR> <BLOCKQUOTE>
2121
Modify the behavior of CommandLineTool to generate a single string
22-
containing a shell command line. Each item in the argument list must be
23-
joined into a string separated by single spaces and quoted to prevent
22+
containing a shell command line. Each item in the `arguments` list must
23+
be joined into a string separated by single spaces and quoted to prevent
2424
intepretation by the shell, unless `CommandLineBinding` for that argument
2525
contains `shellQuote: false`. If `shellQuote: false` is specified, the
2626
argument is joined into the command string without quoting, which allows

src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#ShellCommandRequirement</I><BR> <BLOCKQUOTE>
2525
Modify the behavior of CommandLineTool to generate a single string
26-
containing a shell command line. Each item in the argument list must be
27-
joined into a string separated by single spaces and quoted to prevent
26+
containing a shell command line. Each item in the `arguments` list must
27+
be joined into a string separated by single spaces and quoted to prevent
2828
intepretation by the shell, unless `CommandLineBinding` for that argument
2929
contains `shellQuote: false`. If `shellQuote: false` is specified, the
3030
argument is joined into the command string without quoting, which allows

src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameter.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,11 @@ public interface WorkflowOutputParameter extends OutputParameter, Savable {
124124
/**
125125
* Getter for property <I>https://w3id.org/cwl/cwl#outputSource</I><BR>
126126
* <BLOCKQUOTE>
127-
* Specifies one or more workflow parameters that supply the value of to
128-
* the output parameter.
127+
* Specifies one or more names of an output from a workflow step (in the form
128+
* `step_name/output_name` with a `/` separator`), or a workflow input name,
129+
* that supply their value(s) to the output parameter.
130+
* the output parameter. It is valid to reference workflow level inputs
131+
* here.
129132
* * </BLOCKQUOTE>
130133
*/
131134

0 commit comments

Comments
 (0)