Skip to content

Commit 476b0c0

Browse files
mr-cmr-c
authored
refresh with latest schema-salad, proposed CWL v1.2.1 changes (#89)
* refresh with latest schema-salad, proposed CWL v1.2.1 changes - `Savable` → `Saveable` typo fix changes some class names - `default` field type is now explicitly including `File` and `Directory` alongside `Any` - `hints` is now defined as any of the known requirements, or `Any` (should be a nice simplification) - the refscope for workflow `outputSource` was corrected from 0 to 1 * add additional examples from https://github.com/common-workflow-language/cwl-v1.2/tree/e15d7b77ceecc503382561d04eaf1fc140d80f12/tests
1 parent 673940d commit 476b0c0

File tree

183 files changed

+2184
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2184
-363
lines changed

‎src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
package org.w3id.cwl.cwl1_2;
1616

17-
import org.w3id.cwl.cwl1_2.utils.Savable;
17+
import org.w3id.cwl.cwl1_2.utils.Saveable;
1818

1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/salad#ArraySchema</I><BR>This interface is implemented by {@link ArraySchemaImpl}<BR>
2121
*/
22-
public interface ArraySchema extends Savable {
22+
public interface ArraySchema extends Saveable {
2323
/**
2424
* Getter for property <I>https://w3id.org/cwl/salad#items</I><BR>
2525
* <BLOCKQUOTE>

‎src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
1818
import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
1919
import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
20-
import org.w3id.cwl.cwl1_2.utils.SavableImpl;
20+
import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
2121
import org.w3id.cwl.cwl1_2.utils.ValidationException;
2222

2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/salad#ArraySchema</I><BR>
2525
*/
26-
public class ArraySchemaImpl extends SavableImpl implements ArraySchema {
26+
public class ArraySchemaImpl extends SaveableImpl implements ArraySchema {
2727
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
2828
private java.util.Map<String, Object> extensionFields_ =
2929
new java.util.HashMap<String, Object>();

‎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/CommandInputArraySchema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
package org.w3id.cwl.cwl1_2;
1616

17-
import org.w3id.cwl.cwl1_2.utils.Savable;
17+
import org.w3id.cwl.cwl1_2.utils.Saveable;
1818

1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputArraySchema</I><BR>This interface is implemented by {@link CommandInputArraySchemaImpl}<BR>
2121
*/
22-
public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Savable {
22+
public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Saveable {
2323
/**
2424
* Getter for property <I>https://w3id.org/cwl/cwl#IOSchema/name</I><BR>
2525
* <BLOCKQUOTE>

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
1818
import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
1919
import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
20-
import org.w3id.cwl.cwl1_2.utils.SavableImpl;
20+
import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
2121
import org.w3id.cwl.cwl1_2.utils.ValidationException;
2222

2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputArraySchema</I><BR>
2525
*/
26-
public class CommandInputArraySchemaImpl extends SavableImpl implements CommandInputArraySchema {
26+
public class CommandInputArraySchemaImpl extends SaveableImpl implements CommandInputArraySchema {
2727
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
2828
private java.util.Map<String, Object> extensionFields_ =
2929
new java.util.HashMap<String, Object>();

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
package org.w3id.cwl.cwl1_2;
1616

17-
import org.w3id.cwl.cwl1_2.utils.Savable;
17+
import org.w3id.cwl.cwl1_2.utils.Saveable;
1818

1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputEnumSchema</I><BR>This interface is implemented by {@link CommandInputEnumSchemaImpl}<BR>
2121
*/
22-
public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Savable {
22+
public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Saveable {
2323
/**
2424
* Getter for property <I>https://w3id.org/cwl/cwl#IOSchema/name</I><BR>
2525
* <BLOCKQUOTE>

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
1818
import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
1919
import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
20-
import org.w3id.cwl.cwl1_2.utils.SavableImpl;
20+
import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
2121
import org.w3id.cwl.cwl1_2.utils.ValidationException;
2222

2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputEnumSchema</I><BR>
2525
*/
26-
public class CommandInputEnumSchemaImpl extends SavableImpl implements CommandInputEnumSchema {
26+
public class CommandInputEnumSchemaImpl extends SaveableImpl implements CommandInputEnumSchema {
2727
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
2828
private java.util.Map<String, Object> extensionFields_ =
2929
new java.util.HashMap<String, Object>();

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
package org.w3id.cwl.cwl1_2;
1616

17-
import org.w3id.cwl.cwl1_2.utils.Savable;
17+
import org.w3id.cwl.cwl1_2.utils.Saveable;
1818

1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputParameter</I><BR>This interface is implemented by {@link CommandInputParameterImpl}<BR> <BLOCKQUOTE>
2121
An input parameter for a CommandLineTool. </BLOCKQUOTE>
2222
*/
23-
public interface CommandInputParameter extends InputParameter, Savable {
23+
public interface CommandInputParameter extends InputParameter, Saveable {
2424
/**
2525
* Getter for property <I>https://w3id.org/cwl/cwl#Identified/id</I><BR>
2626
* <BLOCKQUOTE>
@@ -158,7 +158,7 @@ public interface CommandInputParameter extends InputParameter, Savable {
158158
* * </BLOCKQUOTE>
159159
*/
160160

161-
java.util.Optional<Object> getDefault();
161+
Object getDefault();
162162
/**
163163
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
164164
* <BLOCKQUOTE>

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
1818
import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
1919
import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
20-
import org.w3id.cwl.cwl1_2.utils.SavableImpl;
20+
import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
2121
import org.w3id.cwl.cwl1_2.utils.ValidationException;
2222

2323
/**
2424
* Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputParameter</I><BR> <BLOCKQUOTE>
2525
An input parameter for a CommandLineTool. </BLOCKQUOTE>
2626
*/
27-
public class CommandInputParameterImpl extends SavableImpl implements CommandInputParameter {
27+
public class CommandInputParameterImpl extends SaveableImpl implements CommandInputParameter {
2828
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
2929
private java.util.Map<String, Object> extensionFields_ =
3030
new java.util.HashMap<String, Object>();
@@ -196,7 +196,7 @@ public java.util.Optional<LoadListingEnum> getLoadListing() {
196196
return this.loadListing;
197197
}
198198

199-
private java.util.Optional<Object> default_;
199+
private Object default_;
200200

201201
/**
202202
* Getter for property <I>https://w3id.org/cwl/salad#default</I><BR>
@@ -208,7 +208,7 @@ public java.util.Optional<LoadListingEnum> getLoadListing() {
208208
* * </BLOCKQUOTE>
209209
*/
210210

211-
public java.util.Optional<Object> getDefault() {
211+
public Object getDefault() {
212212
return this.default_;
213213
}
214214

@@ -419,13 +419,13 @@ public CommandInputParameterImpl(
419419
} else {
420420
loadListing = null;
421421
}
422-
java.util.Optional<Object> default_;
422+
Object default_;
423423

424424
if (__doc.containsKey("default")) {
425425
try {
426426
default_ =
427427
LoaderInstances
428-
.optional_AnyInstance
428+
.union_of_NullInstance_or_File_or_Directory_or_AnyInstance
429429
.loadField(__doc.get("default"), __baseUri, __loadingOptions);
430430
} catch (ValidationException e) {
431431
default_ = null; // won't be used but prevents compiler from complaining.
@@ -475,7 +475,7 @@ public CommandInputParameterImpl(
475475
this.format = (Object) format;
476476
this.loadContents = (java.util.Optional<Boolean>) loadContents;
477477
this.loadListing = (java.util.Optional<LoadListingEnum>) loadListing;
478-
this.default_ = (java.util.Optional<Object>) default_;
478+
this.default_ = (Object) default_;
479479
this.type = (Object) type;
480480
this.inputBinding = (java.util.Optional<CommandLineBinding>) inputBinding;
481481
}

‎src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
package org.w3id.cwl.cwl1_2;
1616

17-
import org.w3id.cwl.cwl1_2.utils.Savable;
17+
import org.w3id.cwl.cwl1_2.utils.Saveable;
1818

1919
/**
2020
* Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputRecordField</I><BR>This interface is implemented by {@link CommandInputRecordFieldImpl}<BR>
2121
*/
22-
public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Savable {
22+
public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Saveable {
2323
/**
2424
* Getter for property <I>https://w3id.org/cwl/salad#RecordField/name</I><BR>
2525
* <BLOCKQUOTE>

0 commit comments

Comments
 (0)