diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java index b6b944b..8820670 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java @@ -33,5 +33,5 @@ public interface ArraySchema extends Saveable { * Must be `array` * */ - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType(); + Array_name getType(); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java index e3ee958..2fbc2f0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java @@ -40,7 +40,7 @@ public Object getItems() { return this.items; } - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + private Array_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -48,7 +48,7 @@ public Object getItems() { * Must be `array` * */ - public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() { + public Array_name getType() { return this.type; } @@ -86,18 +86,18 @@ public ArraySchemaImpl( try { items = LoaderInstances - .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2 + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. final String __message = "the `items` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + Array_name type; try { type = LoaderInstances - .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 + .typedsl_Array_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -108,6 +108,6 @@ public ArraySchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.items = (Object) items; - this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type; + this.type = (Array_name) type; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java b/src/main/java/org/w3id/cwl/cwl1_1/Array_name.java similarity index 69% rename from src/main/java/org/w3id/cwl/cwl1_1/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java rename to src/main/java/org/w3id/cwl/cwl1_1/Array_name.java index f96a59b..70618b1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/Array_name.java @@ -16,22 +16,22 @@ import org.w3id.cwl.cwl1_1.utils.ValidationException; -public enum enum_d062602be0b4b8fd33e69e29a841317b6ab665bc { +public enum Array_name { ARRAY("array"); private static String[] symbols = new String[] {"array"}; private String docVal; - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc(final String docVal) { + private Array_name(final String docVal) { this.docVal = docVal; } - public static enum_d062602be0b4b8fd33e69e29a841317b6ab665bc fromDocumentVal(final String docVal) { - for(final enum_d062602be0b4b8fd33e69e29a841317b6ab665bc val : enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.values()) { + public static Array_name fromDocumentVal(final String docVal) { + for(final Array_name val : Array_name.values()) { if(val.docVal.equals(docVal)) { return val; } } - throw new ValidationException(String.format("Expected one of %s", enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.symbols, docVal)); + throw new ValidationException(String.format("Expected one of %s", Array_name.symbols, docVal)); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java new file mode 100644 index 0000000..fe04d0e --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLArraySchema
This interface is implemented by {@link CWLArraySchemaImpl}
+ */ +public interface CWLArraySchema extends ArraySchema, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#items
+ *
+ * Defines the type of the array elements. *
+ */ + + Object getItems(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `array` *
+ */ + + Array_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java new file mode 100644 index 0000000..db3b3c3 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.LoaderInstances; +import org.w3id.cwl.cwl1_1.utils.LoadingOptions; +import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_1.utils.SaveableImpl; +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLArraySchema
+ */ +public class CWLArraySchemaImpl extends SaveableImpl implements CWLArraySchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Object items; + + /** + * Getter for property https://w3id.org/cwl/salad#items
+ *
+ * Defines the type of the array elements. *
+ */ + + public Object getItems() { + return this.items; + } + + private Array_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `array` *
+ */ + + public Array_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLArraySchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLArraySchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLArraySchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Object items; + try { + items = + LoaderInstances + .uri_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("items"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + items = null; // won't be used but prevents compiler from complaining. + final String __message = "the `items` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Array_name type; + try { + type = + LoaderInstances + .typedsl_Array_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.items = (Object) items; + this.type = (Array_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java new file mode 100644 index 0000000..c66ccb8 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java @@ -0,0 +1,46 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordField
This interface is implemented by {@link CWLRecordFieldImpl}
+ */ +public interface CWLRecordField extends RecordField, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#RecordField/name
+ *
+ * The name of the field + * *
+ */ + + String getName(); + /** + * Getter for property https://w3id.org/cwl/salad#Documented/doc
+ *
+ * A documentation string for this object, or an array of strings which should be concatenated. *
+ */ + + Object getDoc(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * The field type + * *
+ */ + + Object getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java new file mode 100644 index 0000000..5a24fd0 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java @@ -0,0 +1,160 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.LoaderInstances; +import org.w3id.cwl.cwl1_1.utils.LoadingOptions; +import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_1.utils.SaveableImpl; +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordField
+ */ +public class CWLRecordFieldImpl extends SaveableImpl implements CWLRecordField { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private String name; + + /** + * Getter for property https://w3id.org/cwl/salad#RecordField/name
+ *
+ * The name of the field + * *
+ */ + + public String getName() { + return this.name; + } + + private Object doc; + + /** + * Getter for property https://w3id.org/cwl/salad#Documented/doc
+ *
+ * A documentation string for this object, or an array of strings which should be concatenated. *
+ */ + + public Object getDoc() { + return this.doc; + } + + private Object type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * The field type + * *
+ */ + + public Object getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLRecordFieldImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLRecordFieldImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLRecordFieldImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + String name; + + if (__doc.containsKey("name")) { + try { + name = + LoaderInstances + .uri_StringInstance_True_False_None_None + .loadField(__doc.get("name"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + name = null; // won't be used but prevents compiler from complaining. + final String __message = "the `name` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + name = null; + } + + if (name == null) { + if (__docRoot != null) { + name = __docRoot; + } else { + throw new ValidationException("Missing name"); + } + } + __baseUri = (String) name; + Object doc; + + if (__doc.containsKey("doc")) { + try { + doc = + LoaderInstances + .union_of_NullInstance_or_StringInstance_or_array_of_StringInstance + .loadField(__doc.get("doc"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + doc = null; // won't be used but prevents compiler from complaining. + final String __message = "the `doc` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + doc = null; + } + Object type; + try { + type = + LoaderInstances + .typedsl_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.doc = (Object) doc; + this.name = (String) name; + this.type = (Object) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java new file mode 100644 index 0000000..645d59c --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordSchema
This interface is implemented by {@link CWLRecordSchemaImpl}
+ */ +public interface CWLRecordSchema extends RecordSchema, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#fields
+ *
+ * Defines the fields of the record. *
+ */ + + java.util.Optional> getFields(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `record` *
+ */ + + Record_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java new file mode 100644 index 0000000..b4da24f --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java @@ -0,0 +1,119 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.LoaderInstances; +import org.w3id.cwl.cwl1_1.utils.LoadingOptions; +import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_1.utils.SaveableImpl; +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordSchema
+ */ +public class CWLRecordSchemaImpl extends SaveableImpl implements CWLRecordSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private java.util.Optional> fields; + + /** + * Getter for property https://w3id.org/cwl/salad#fields
+ *
+ * Defines the fields of the record. *
+ */ + + public java.util.Optional> getFields() { + return this.fields; + } + + private Record_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `record` *
+ */ + + public Record_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLRecordSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLRecordSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + java.util.Optional> fields; + + if (__doc.containsKey("fields")) { + try { + fields = + LoaderInstances + .idmap_fields_optional_array_of_CWLRecordField + .loadField(__doc.get("fields"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + fields = null; // won't be used but prevents compiler from complaining. + final String __message = "the `fields` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + fields = null; + } + Record_name type; + try { + type = + LoaderInstances + .typedsl_Record_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.fields = (java.util.Optional>) fields; + this.type = (Record_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java index a81c29e..5a9a4a6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java @@ -40,7 +40,7 @@ public interface CommandInputArraySchema extends InputArraySchema, CommandInputS * Must be `array` * */ - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType(); + Array_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java index d02bead..ca50713 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java @@ -52,7 +52,7 @@ public Object getItems() { return this.items; } - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + private Array_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public Object getItems() { * Must be `array` *
*/ - public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() { + public Array_name getType() { return this.type; } @@ -136,7 +136,7 @@ public CommandInputArraySchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -165,18 +165,18 @@ public CommandInputArraySchemaImpl( try { items = LoaderInstances - .typedsl_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2 + .uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. final String __message = "the `items` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + Array_name type; try { type = LoaderInstances - .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 + .typedsl_Array_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -238,7 +238,7 @@ public CommandInputArraySchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.items = (Object) items; - this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type; + this.type = (Array_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java index 7d26250..730ec16 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java @@ -40,7 +40,7 @@ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSch * Must be `enum` * */ - enum_d961d79c225752b9fadb617367615ab176b47d77 getType(); + Enum_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java index b542321..7daaf00 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.List getSymbols() { return this.symbols; } - private enum_d961d79c225752b9fadb617367615ab176b47d77 type; + private Enum_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.List getSymbols() { * Must be `enum` *
*/ - public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() { + public Enum_name getType() { return this.type; } @@ -136,7 +136,7 @@ public CommandInputEnumSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -165,18 +165,18 @@ public CommandInputEnumSchemaImpl( try { symbols = LoaderInstances - .uri_array_of_StringInstance_True_False_None + .uri_array_of_StringInstance_True_False_None_None .loadField(__doc.get("symbols"), __baseUri, __loadingOptions); } catch (ValidationException e) { symbols = null; // won't be used but prevents compiler from complaining. final String __message = "the `symbols` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d961d79c225752b9fadb617367615ab176b47d77 type; + Enum_name type; try { type = LoaderInstances - .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 + .typedsl_Enum_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -237,11 +237,11 @@ public CommandInputEnumSchemaImpl( if (!__errors.isEmpty()) { throw new ValidationException("Trying 'RecordField'", __errors); } + this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; - this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type; + this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; - this.name = (java.util.Optional) name; this.inputBinding = (java.util.Optional) inputBinding; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java index 396ef41..e4529eb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java @@ -154,7 +154,7 @@ public interface CommandInputParameter extends InputParameter, Saveable { * * */ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java index 324bc9b..29a4e41 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java @@ -192,7 +192,7 @@ public java.util.Optional getLoadListing() { return this.loadListing; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -204,7 +204,7 @@ public java.util.Optional getLoadListing() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -271,7 +271,7 @@ public CommandInputParameterImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -370,7 +370,7 @@ public CommandInputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -415,13 +415,13 @@ public CommandInputParameterImpl( } else { loadListing = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -471,7 +471,7 @@ public CommandInputParameterImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java index befc18f..71b1eab 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java @@ -253,7 +253,7 @@ public CommandInputRecordFieldImpl( try { name = LoaderInstances - .uri_StringInstance_True_False_None + .uri_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -358,7 +358,7 @@ public CommandInputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java index 504bf03..bae4406 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java @@ -40,7 +40,7 @@ public interface CommandInputRecordSchema extends InputRecordSchema, CommandInpu * Must be `record` * */ - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType(); + Record_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java index 124e0ab..b6681eb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.Optional> getFields() { return this.fields; } - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + private Record_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.Optional> getFields() { * Must be `record` *
*/ - public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() { + public Record_name getType() { return this.type; } @@ -136,7 +136,7 @@ public CommandInputRecordSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -178,11 +178,11 @@ public CommandInputRecordSchemaImpl( } else { fields = null; } - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + Record_name type; try { type = LoaderInstances - .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 + .typedsl_Record_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -244,7 +244,7 @@ public CommandInputRecordSchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.fields = (java.util.Optional>) fields; - this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type; + this.type = (Record_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java index cf8e43d..7c3299e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java @@ -337,7 +337,7 @@ public CommandLineToolImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -366,7 +366,7 @@ public CommandLineToolImpl( try { class_ = LoaderInstances - .uri_CommandLineTool_class_False_True_None + .uri_CommandLineTool_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. @@ -469,7 +469,7 @@ public CommandLineToolImpl( try { cwlVersion = LoaderInstances - .uri_optional_CWLVersion_False_True_None + .uri_optional_CWLVersion_False_True_None_None .loadField(__doc.get("cwlVersion"), __baseUri, __loadingOptions); } catch (ValidationException e) { cwlVersion = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java index 189faaa..1d077ad 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java @@ -40,7 +40,7 @@ public interface CommandOutputArraySchema extends OutputArraySchema, Saveable { * Must be `array` * */ - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType(); + Array_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java index b579e2c..e6cf382 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java @@ -52,7 +52,7 @@ public Object getItems() { return this.items; } - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + private Array_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public Object getItems() { * Must be `array` *
*/ - public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() { + public Array_name getType() { return this.type; } @@ -124,7 +124,7 @@ public CommandOutputArraySchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public CommandOutputArraySchemaImpl( try { items = LoaderInstances - .typedsl_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_2 + .uri_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. final String __message = "the `items` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + Array_name type; try { type = LoaderInstances - .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 + .typedsl_Array_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -209,7 +209,7 @@ public CommandOutputArraySchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.items = (Object) items; - this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type; + this.type = (Array_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java index f3a951e..2a4782f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java @@ -40,7 +40,7 @@ public interface CommandOutputEnumSchema extends OutputEnumSchema, Saveable { * Must be `enum` * */ - enum_d961d79c225752b9fadb617367615ab176b47d77 getType(); + Enum_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java index 9d4ff2f..5654afd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.List getSymbols() { return this.symbols; } - private enum_d961d79c225752b9fadb617367615ab176b47d77 type; + private Enum_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.List getSymbols() { * Must be `enum` *
*/ - public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() { + public Enum_name getType() { return this.type; } @@ -124,7 +124,7 @@ public CommandOutputEnumSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public CommandOutputEnumSchemaImpl( try { symbols = LoaderInstances - .uri_array_of_StringInstance_True_False_None + .uri_array_of_StringInstance_True_False_None_None .loadField(__doc.get("symbols"), __baseUri, __loadingOptions); } catch (ValidationException e) { symbols = null; // won't be used but prevents compiler from complaining. final String __message = "the `symbols` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d961d79c225752b9fadb617367615ab176b47d77 type; + Enum_name type; try { type = LoaderInstances - .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 + .typedsl_Enum_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -208,10 +208,10 @@ public CommandOutputEnumSchemaImpl( if (!__errors.isEmpty()) { throw new ValidationException("Trying 'RecordField'", __errors); } + this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; - this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type; + this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; - this.name = (java.util.Optional) name; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java index 3332c76..b3a90e7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java @@ -213,7 +213,7 @@ public CommandOutputParameterImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -312,7 +312,7 @@ public CommandOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java index a433d33..6d25e0d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java @@ -215,7 +215,7 @@ public CommandOutputRecordFieldImpl( try { name = LoaderInstances - .uri_StringInstance_True_False_None + .uri_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -320,7 +320,7 @@ public CommandOutputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java index 6d0fdb4..33e35c2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java @@ -40,7 +40,7 @@ public interface CommandOutputRecordSchema extends OutputRecordSchema, Saveable * Must be `record` * */ - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType(); + Record_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java index a567964..36088e5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.Optional> getFields() { return this.fields; } - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + private Record_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.Optional> getFields() { * Must be `record` *
*/ - public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() { + public Record_name getType() { return this.type; } @@ -124,7 +124,7 @@ public CommandOutputRecordSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -166,11 +166,11 @@ public CommandOutputRecordSchemaImpl( } else { fields = null; } - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + Record_name type; try { type = LoaderInstances - .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 + .typedsl_Record_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -215,7 +215,7 @@ public CommandOutputRecordSchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.fields = (java.util.Optional>) fields; - this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type; + this.type = (Record_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java index 132cd65..b0ef611 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java @@ -213,7 +213,7 @@ public DirectoryImpl( try { class_ = LoaderInstances - .uri_Directory_class_False_True_None + .uri_Directory_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. @@ -226,7 +226,7 @@ public DirectoryImpl( try { location = LoaderInstances - .uri_optional_StringInstance_False_False_None + .uri_optional_StringInstance_False_False_None_None .loadField(__doc.get("location"), __baseUri, __loadingOptions); } catch (ValidationException e) { location = null; // won't be used but prevents compiler from complaining. @@ -243,7 +243,7 @@ public DirectoryImpl( try { path = LoaderInstances - .uri_optional_StringInstance_False_False_None + .uri_optional_StringInstance_False_False_None_None .loadField(__doc.get("path"), __baseUri, __loadingOptions); } catch (ValidationException e) { path = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java index af2129f..d27b8e9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java @@ -207,7 +207,7 @@ public DockerRequirementImpl( try { class_ = LoaderInstances - .uri_DockerRequirement_class_False_True_None + .uri_DockerRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java index 32299c3..d75bda5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java @@ -22,6 +22,12 @@ */ public interface EnumSchema extends Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#EnumSchema/name
+ + */ + + java.util.Optional getName(); /** * Getter for property https://w3id.org/cwl/salad#symbols
*
@@ -35,5 +41,5 @@ public interface EnumSchema extends Saveable { * Must be `enum` *
*/ - enum_d961d79c225752b9fadb617367615ab176b47d77 getType(); + Enum_name getType(); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java index e751518..5971e82 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java @@ -30,6 +30,17 @@ public class EnumSchemaImpl extends SaveableImpl implements EnumSchema { private java.util.Map extensionFields_ = new java.util.HashMap(); + private java.util.Optional name; + + /** + * Getter for property https://w3id.org/cwl/salad#EnumSchema/name
+ + */ + + public java.util.Optional getName() { + return this.name; + } + private java.util.List symbols; /** @@ -42,7 +53,7 @@ public java.util.List getSymbols() { return this.symbols; } - private enum_d961d79c225752b9fadb617367615ab176b47d77 type; + private Enum_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -50,7 +61,7 @@ public java.util.List getSymbols() { * Must be `enum` * */ - public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() { + public Enum_name getType() { return this.type; } @@ -84,22 +95,53 @@ public EnumSchemaImpl( if (__loadingOptions != null) { this.loadingOptions_ = __loadingOptions; } + java.util.Optional name; + + if (__doc.containsKey("name")) { + try { + name = + LoaderInstances + .uri_optional_StringInstance_True_False_None_None + .loadField(__doc.get("name"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + name = null; // won't be used but prevents compiler from complaining. + final String __message = "the `name` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + name = null; + } + + Boolean __original_is_null = name == null; + if (name == null) { + if (__docRoot != null) { + name = java.util.Optional.of(__docRoot); + } else { + name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString()); + } + } + if (__original_is_null) { + __baseUri = __baseUri_; + } else { + __baseUri = (String) name.orElse(null); + } java.util.List symbols; try { symbols = LoaderInstances - .uri_array_of_StringInstance_True_False_None + .uri_array_of_StringInstance_True_False_None_None .loadField(__doc.get("symbols"), __baseUri, __loadingOptions); } catch (ValidationException e) { symbols = null; // won't be used but prevents compiler from complaining. final String __message = "the `symbols` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d961d79c225752b9fadb617367615ab176b47d77 type; + Enum_name type; try { type = LoaderInstances - .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 + .typedsl_Enum_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -109,7 +151,8 @@ public EnumSchemaImpl( if (!__errors.isEmpty()) { throw new ValidationException("Trying 'RecordField'", __errors); } + this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; - this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type; + this.type = (Enum_name) type; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/enum_d961d79c225752b9fadb617367615ab176b47d77.java b/src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java similarity index 69% rename from src/main/java/org/w3id/cwl/cwl1_1/enum_d961d79c225752b9fadb617367615ab176b47d77.java rename to src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java index 35d7944..8d9877c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/enum_d961d79c225752b9fadb617367615ab176b47d77.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java @@ -16,22 +16,22 @@ import org.w3id.cwl.cwl1_1.utils.ValidationException; -public enum enum_d961d79c225752b9fadb617367615ab176b47d77 { +public enum Enum_name { ENUM("enum"); private static String[] symbols = new String[] {"enum"}; private String docVal; - private enum_d961d79c225752b9fadb617367615ab176b47d77(final String docVal) { + private Enum_name(final String docVal) { this.docVal = docVal; } - public static enum_d961d79c225752b9fadb617367615ab176b47d77 fromDocumentVal(final String docVal) { - for(final enum_d961d79c225752b9fadb617367615ab176b47d77 val : enum_d961d79c225752b9fadb617367615ab176b47d77.values()) { + public static Enum_name fromDocumentVal(final String docVal) { + for(final Enum_name val : Enum_name.values()) { if(val.docVal.equals(docVal)) { return val; } } - throw new ValidationException(String.format("Expected one of %s", enum_d961d79c225752b9fadb617367615ab176b47d77.symbols, docVal)); + throw new ValidationException(String.format("Expected one of %s", Enum_name.symbols, docVal)); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java index 4a7da5e..72e2bba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java @@ -89,7 +89,7 @@ public EnvVarRequirementImpl( try { class_ = LoaderInstances - .uri_EnvVarRequirement_class_False_True_None + .uri_EnvVarRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java index 688620f..bb08311 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java @@ -218,7 +218,7 @@ public ExpressionToolImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -247,7 +247,7 @@ public ExpressionToolImpl( try { class_ = LoaderInstances - .uri_ExpressionTool_class_False_True_None + .uri_ExpressionTool_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. @@ -350,7 +350,7 @@ public ExpressionToolImpl( try { cwlVersion = LoaderInstances - .uri_optional_CWLVersion_False_True_None + .uri_optional_CWLVersion_False_True_None_None .loadField(__doc.get("cwlVersion"), __baseUri, __loadingOptions); } catch (ValidationException e) { cwlVersion = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java index b6a0bca..fcd965f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java @@ -200,7 +200,7 @@ public ExpressionToolOutputParameterImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -299,7 +299,7 @@ public ExpressionToolOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java index c74be79..3a4fd4d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java @@ -372,7 +372,7 @@ public FileImpl( try { class_ = LoaderInstances - .uri_File_class_False_True_None + .uri_File_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. @@ -385,7 +385,7 @@ public FileImpl( try { location = LoaderInstances - .uri_optional_StringInstance_False_False_None + .uri_optional_StringInstance_False_False_None_None .loadField(__doc.get("location"), __baseUri, __loadingOptions); } catch (ValidationException e) { location = null; // won't be used but prevents compiler from complaining. @@ -402,7 +402,7 @@ public FileImpl( try { path = LoaderInstances - .uri_optional_StringInstance_False_False_None + .uri_optional_StringInstance_False_False_None_None .loadField(__doc.get("path"), __baseUri, __loadingOptions); } catch (ValidationException e) { path = null; // won't be used but prevents compiler from complaining. @@ -538,7 +538,7 @@ public FileImpl( try { format = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java index b12f801..29304ce 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java @@ -99,7 +99,7 @@ public InitialWorkDirRequirementImpl( try { class_ = LoaderInstances - .uri_InitialWorkDirRequirement_class_False_True_None + .uri_InitialWorkDirRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java index 9f62d76..6d1ef0a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java @@ -93,7 +93,7 @@ public InlineJavascriptRequirementImpl( try { class_ = LoaderInstances - .uri_InlineJavascriptRequirement_class_False_True_None + .uri_InlineJavascriptRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java index 4609042..f636888 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java @@ -116,7 +116,7 @@ public InplaceUpdateRequirementImpl( try { class_ = LoaderInstances - .uri_InplaceUpdateRequirement_class_False_True_None + .uri_InplaceUpdateRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java index ad9ea05..30b4154 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputArraySchema
This interface is implemented by {@link InputArraySchemaImpl}
*/ -public interface InputArraySchema extends ArraySchema, InputSchema, Saveable { +public interface InputArraySchema extends CWLArraySchema, InputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
@@ -40,7 +40,7 @@ public interface InputArraySchema extends ArraySchema, InputSchema, Saveable { * Must be `array` *
*/ - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType(); + Array_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java index d3f0e71..cbfb4be 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java @@ -52,7 +52,7 @@ public Object getItems() { return this.items; } - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + private Array_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public Object getItems() { * Must be `array` *
*/ - public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() { + public Array_name getType() { return this.type; } @@ -124,7 +124,7 @@ public InputArraySchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public InputArraySchemaImpl( try { items = LoaderInstances - .typedsl_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_2 + .uri_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. final String __message = "the `items` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + Array_name type; try { type = LoaderInstances - .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 + .typedsl_Array_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -209,7 +209,7 @@ public InputArraySchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.items = (Object) items; - this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type; + this.type = (Array_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java index e99b6dd..8ec7147 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java @@ -40,7 +40,7 @@ public interface InputEnumSchema extends EnumSchema, InputSchema, Saveable { * Must be `enum` * */ - enum_d961d79c225752b9fadb617367615ab176b47d77 getType(); + Enum_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java index 38d94e5..56c6f55 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.List getSymbols() { return this.symbols; } - private enum_d961d79c225752b9fadb617367615ab176b47d77 type; + private Enum_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.List getSymbols() { * Must be `enum` *
*/ - public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() { + public Enum_name getType() { return this.type; } @@ -124,7 +124,7 @@ public InputEnumSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public InputEnumSchemaImpl( try { symbols = LoaderInstances - .uri_array_of_StringInstance_True_False_None + .uri_array_of_StringInstance_True_False_None_None .loadField(__doc.get("symbols"), __baseUri, __loadingOptions); } catch (ValidationException e) { symbols = null; // won't be used but prevents compiler from complaining. final String __message = "the `symbols` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d961d79c225752b9fadb617367615ab176b47d77 type; + Enum_name type; try { type = LoaderInstances - .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 + .typedsl_Enum_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -208,10 +208,10 @@ public InputEnumSchemaImpl( if (!__errors.isEmpty()) { throw new ValidationException("Trying 'RecordField'", __errors); } + this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; - this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type; + this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; - this.name = (java.util.Optional) name; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java b/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java index eb28f74..eb3b55b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java @@ -146,5 +146,5 @@ public interface InputParameter extends Parameter, InputFormat, LoadContents, Sa * * */ - Object getDefault(); + java.util.Optional getDefault(); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java index 4dada88..53c0261 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordField
This interface is implemented by {@link InputRecordFieldImpl}
*/ -public interface InputRecordField extends RecordField, FieldBase, InputFormat, LoadContents, Saveable { +public interface InputRecordField extends CWLRecordField, FieldBase, InputFormat, LoadContents, Saveable { /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java index f6f240d..79e3c91 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java @@ -241,7 +241,7 @@ public InputRecordFieldImpl( try { name = LoaderInstances - .uri_StringInstance_True_False_None + .uri_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -346,7 +346,7 @@ public InputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java index f5e22b4..b888029 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordSchema
This interface is implemented by {@link InputRecordSchemaImpl}
*/ -public interface InputRecordSchema extends RecordSchema, InputSchema, Saveable { +public interface InputRecordSchema extends CWLRecordSchema, InputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
@@ -40,7 +40,7 @@ public interface InputRecordSchema extends RecordSchema, InputSchema, Saveable { * Must be `record` *
*/ - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType(); + Record_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java index 24fdea8..0aa4b39 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.Optional> getFields() { return this.fields; } - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + private Record_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.Optional> getFields() { * Must be `record` *
*/ - public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() { + public Record_name getType() { return this.type; } @@ -124,7 +124,7 @@ public InputRecordSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -166,11 +166,11 @@ public InputRecordSchemaImpl( } else { fields = null; } - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + Record_name type; try { type = LoaderInstances - .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 + .typedsl_Record_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -215,7 +215,7 @@ public InputRecordSchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.fields = (java.util.Optional>) fields; - this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type; + this.type = (Record_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java index d265c23..e3d2efb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java @@ -88,7 +88,7 @@ public LoadListingRequirementImpl( try { class_ = LoaderInstances - .uri_LoadListingRequirement_class_False_True_None + .uri_LoadListingRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java new file mode 100644 index 0000000..309d366 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/salad#MapSchema
This interface is implemented by {@link MapSchemaImpl}
+ */ +public interface MapSchema extends Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `map` *
+ */ + + Map_name getType(); + /** + * Getter for property https://w3id.org/cwl/salad#values
+ *
+ * Defines the type of the map elements. *
+ */ + + Object getValues(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java new file mode 100644 index 0000000..807d42e --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.LoaderInstances; +import org.w3id.cwl.cwl1_1.utils.LoadingOptions; +import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_1.utils.SaveableImpl; +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/salad#MapSchema
+ */ +public class MapSchemaImpl extends SaveableImpl implements MapSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Map_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `map` *
+ */ + + public Map_name getType() { + return this.type; + } + + private Object values; + + /** + * Getter for property https://w3id.org/cwl/salad#values
+ *
+ * Defines the type of the map elements. *
+ */ + + public Object getValues() { + return this.values; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of MapSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public MapSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("MapSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Map_name type; + try { + type = + LoaderInstances + .typedsl_Map_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Object values; + try { + values = + LoaderInstances + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("values"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + values = null; // won't be used but prevents compiler from complaining. + final String __message = "the `values` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.type = (Map_name) type; + this.values = (Object) values; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Map_name.java b/src/main/java/org/w3id/cwl/cwl1_1/Map_name.java new file mode 100644 index 0000000..3065d8e --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/Map_name.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +public enum Map_name { + MAP("map"); + + private static String[] symbols = new String[] {"map"}; + private String docVal; + + private Map_name(final String docVal) { + this.docVal = docVal; + } + + public static Map_name fromDocumentVal(final String docVal) { + for(final Map_name val : Map_name.values()) { + if(val.docVal.equals(docVal)) { + return val; + } + } + throw new ValidationException(String.format("Expected one of %s", Map_name.symbols, docVal)); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java index 6bc3207..65fa076 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java @@ -77,7 +77,7 @@ public MultipleInputFeatureRequirementImpl( try { class_ = LoaderInstances - .uri_MultipleInputFeatureRequirement_class_False_True_None + .uri_MultipleInputFeatureRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java index b985309..c0512a9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java @@ -101,7 +101,7 @@ public NetworkAccessImpl( try { class_ = LoaderInstances - .uri_NetworkAccess_class_False_True_None + .uri_NetworkAccess_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java index 623c565..41b01f8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputArraySchema
This interface is implemented by {@link OutputArraySchemaImpl}
*/ -public interface OutputArraySchema extends ArraySchema, OutputSchema, Saveable { +public interface OutputArraySchema extends CWLArraySchema, OutputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
@@ -40,7 +40,7 @@ public interface OutputArraySchema extends ArraySchema, OutputSchema, Saveable { * Must be `array` *
*/ - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType(); + Array_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java index 66f70e8..84f0975 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java @@ -52,7 +52,7 @@ public Object getItems() { return this.items; } - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + private Array_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public Object getItems() { * Must be `array` *
*/ - public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() { + public Array_name getType() { return this.type; } @@ -124,7 +124,7 @@ public OutputArraySchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public OutputArraySchemaImpl( try { items = LoaderInstances - .typedsl_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_2 + .uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. final String __message = "the `items` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type; + Array_name type; try { type = LoaderInstances - .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 + .typedsl_Array_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -209,7 +209,7 @@ public OutputArraySchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.items = (Object) items; - this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type; + this.type = (Array_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java index 76ebfc7..f1a61c4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java @@ -40,7 +40,7 @@ public interface OutputEnumSchema extends EnumSchema, OutputSchema, Saveable { * Must be `enum` *
*/ - enum_d961d79c225752b9fadb617367615ab176b47d77 getType(); + Enum_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java index 191f0bf..e643bce 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.List getSymbols() { return this.symbols; } - private enum_d961d79c225752b9fadb617367615ab176b47d77 type; + private Enum_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.List getSymbols() { * Must be `enum` *
*/ - public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() { + public Enum_name getType() { return this.type; } @@ -124,7 +124,7 @@ public OutputEnumSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -153,18 +153,18 @@ public OutputEnumSchemaImpl( try { symbols = LoaderInstances - .uri_array_of_StringInstance_True_False_None + .uri_array_of_StringInstance_True_False_None_None .loadField(__doc.get("symbols"), __baseUri, __loadingOptions); } catch (ValidationException e) { symbols = null; // won't be used but prevents compiler from complaining. final String __message = "the `symbols` field is not valid because:"; __errors.add(new ValidationException(__message, e)); } - enum_d961d79c225752b9fadb617367615ab176b47d77 type; + Enum_name type; try { type = LoaderInstances - .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 + .typedsl_Enum_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -208,10 +208,10 @@ public OutputEnumSchemaImpl( if (!__errors.isEmpty()) { throw new ValidationException("Trying 'RecordField'", __errors); } + this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; - this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type; + this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; - this.name = (java.util.Optional) name; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java index 5eb234d..5743d8c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordField
This interface is implemented by {@link OutputRecordFieldImpl}
*/ -public interface OutputRecordField extends RecordField, FieldBase, OutputFormat, Saveable { +public interface OutputRecordField extends CWLRecordField, FieldBase, OutputFormat, Saveable { /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java index 0663309..ccb8f69 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java @@ -201,7 +201,7 @@ public OutputRecordFieldImpl( try { name = LoaderInstances - .uri_StringInstance_True_False_None + .uri_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -306,7 +306,7 @@ public OutputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java index f94f735..d632e51 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordSchema
This interface is implemented by {@link OutputRecordSchemaImpl}
*/ -public interface OutputRecordSchema extends RecordSchema, OutputSchema, Saveable { +public interface OutputRecordSchema extends CWLRecordSchema, OutputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
@@ -40,7 +40,7 @@ public interface OutputRecordSchema extends RecordSchema, OutputSchema, Saveable * Must be `record` *
*/ - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType(); + Record_name getType(); /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java index e0dce22..0b04b52 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java @@ -52,7 +52,7 @@ public java.util.Optional> getFields() { return this.fields; } - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + private Record_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -60,7 +60,7 @@ public java.util.Optional> getFields() { * Must be `record` *
*/ - public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() { + public Record_name getType() { return this.type; } @@ -124,7 +124,7 @@ public OutputRecordSchemaImpl( try { name = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -166,11 +166,11 @@ public OutputRecordSchemaImpl( } else { fields = null; } - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + Record_name type; try { type = LoaderInstances - .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 + .typedsl_Record_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -215,7 +215,7 @@ public OutputRecordSchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.fields = (java.util.Optional>) fields; - this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type; + this.type = (Record_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java b/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java index 26c9eaf..d0095f6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java @@ -39,7 +39,9 @@ public interface RecordField extends Documented, Saveable { /** * Getter for property https://w3id.org/cwl/salad#type
*
- * The field type + * The field type. If it is an array, it indicates + * that the field type is a union type of its elements. + * Its elements may be duplicated. * *
*/ diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java index 3248b15..3c0d7ed 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java @@ -59,7 +59,9 @@ public Object getDoc() { /** * Getter for property https://w3id.org/cwl/salad#type
*
- * The field type + * The field type. If it is an array, it indicates + * that the field type is a union type of its elements. + * Its elements may be duplicated. * *
*/ @@ -103,7 +105,7 @@ public RecordFieldImpl( try { name = LoaderInstances - .uri_StringInstance_True_False_None + .uri_StringInstance_True_False_None_None .loadField(__doc.get("name"), __baseUri, __loadingOptions); } catch (ValidationException e) { name = null; // won't be used but prevents compiler from complaining. @@ -144,7 +146,7 @@ public RecordFieldImpl( try { type = LoaderInstances - .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2 + .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java index 151c368..a45b81f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java @@ -33,5 +33,5 @@ public interface RecordSchema extends Saveable { * Must be `record` *
*/ - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType(); + Record_name getType(); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java index f00be96..91e4030 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java @@ -40,7 +40,7 @@ public java.util.Optional> getFields() { return this.fields; } - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + private Record_name type; /** * Getter for property https://w3id.org/cwl/salad#type
@@ -48,7 +48,7 @@ public java.util.Optional> getFields() { * Must be `record` * */ - public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() { + public Record_name getType() { return this.type; } @@ -99,11 +99,11 @@ public RecordSchemaImpl( } else { fields = null; } - enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type; + Record_name type; try { type = LoaderInstances - .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 + .typedsl_Record_name_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. @@ -114,6 +114,6 @@ public RecordSchemaImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.fields = (java.util.Optional>) fields; - this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type; + this.type = (Record_name) type; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java b/src/main/java/org/w3id/cwl/cwl1_1/Record_name.java similarity index 69% rename from src/main/java/org/w3id/cwl/cwl1_1/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java rename to src/main/java/org/w3id/cwl/cwl1_1/Record_name.java index 2d3ad1e..ff3c664 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/Record_name.java @@ -16,22 +16,22 @@ import org.w3id.cwl.cwl1_1.utils.ValidationException; -public enum enum_d9cba076fca539106791a4f46d198c7fcfbdb779 { +public enum Record_name { RECORD("record"); private static String[] symbols = new String[] {"record"}; private String docVal; - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779(final String docVal) { + private Record_name(final String docVal) { this.docVal = docVal; } - public static enum_d9cba076fca539106791a4f46d198c7fcfbdb779 fromDocumentVal(final String docVal) { - for(final enum_d9cba076fca539106791a4f46d198c7fcfbdb779 val : enum_d9cba076fca539106791a4f46d198c7fcfbdb779.values()) { + public static Record_name fromDocumentVal(final String docVal) { + for(final Record_name val : Record_name.values()) { if(val.docVal.equals(docVal)) { return val; } } - throw new ValidationException(String.format("Expected one of %s", enum_d9cba076fca539106791a4f46d198c7fcfbdb779.symbols, docVal)); + throw new ValidationException(String.format("Expected one of %s", Record_name.symbols, docVal)); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java index 474f239..21988c7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java @@ -191,7 +191,7 @@ public ResourceRequirementImpl( try { class_ = LoaderInstances - .uri_ResourceRequirement_class_False_True_None + .uri_ResourceRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java index 07cbd29..9d8f9eb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java @@ -77,7 +77,7 @@ public ScatterFeatureRequirementImpl( try { class_ = LoaderInstances - .uri_ScatterFeatureRequirement_class_False_True_None + .uri_ScatterFeatureRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java index 5b8b193..9c89545 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java @@ -94,7 +94,7 @@ public SchemaDefRequirementImpl( try { class_ = LoaderInstances - .uri_SchemaDefRequirement_class_False_True_None + .uri_SchemaDefRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java index c984655..340dc19 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java @@ -82,7 +82,7 @@ public ShellCommandRequirementImpl( try { class_ = LoaderInstances - .uri_ShellCommandRequirement_class_False_True_None + .uri_ShellCommandRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java index 70147d3..1d7dddc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java @@ -174,7 +174,7 @@ public SoftwarePackageImpl( try { specs = LoaderInstances - .uri_optional_array_of_StringInstance_False_False_None + .uri_optional_array_of_StringInstance_False_False_None_True .loadField(__doc.get("specs"), __baseUri, __loadingOptions); } catch (ValidationException e) { specs = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java index 34d9d2d..fe576ff 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java @@ -89,7 +89,7 @@ public SoftwareRequirementImpl( try { class_ = LoaderInstances - .uri_SoftwareRequirement_class_False_True_None + .uri_SoftwareRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java index b6abf3a..35678f8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java @@ -77,7 +77,7 @@ public StepInputExpressionRequirementImpl( try { class_ = LoaderInstances - .uri_StepInputExpressionRequirement_class_False_True_None + .uri_StepInputExpressionRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java index 5b2d3af..36a939b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java @@ -77,7 +77,7 @@ public SubworkflowFeatureRequirementImpl( try { class_ = LoaderInstances - .uri_SubworkflowFeatureRequirement_class_False_True_None + .uri_SubworkflowFeatureRequirement_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java index 797e8af..6348642 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java @@ -96,7 +96,7 @@ public ToolTimeLimitImpl( try { class_ = LoaderInstances - .uri_ToolTimeLimit_class_False_True_None + .uri_ToolTimeLimit_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java b/src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java new file mode 100644 index 0000000..58a8e29 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/salad#UnionSchema
This interface is implemented by {@link UnionSchemaImpl}
+ */ +public interface UnionSchema extends Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#names
+ *
+ * Defines the type of the union elements. *
+ */ + + Object getNames(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `union` *
+ */ + + Union_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java new file mode 100644 index 0000000..579113b --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.LoaderInstances; +import org.w3id.cwl.cwl1_1.utils.LoadingOptions; +import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_1.utils.SaveableImpl; +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/salad#UnionSchema
+ */ +public class UnionSchemaImpl extends SaveableImpl implements UnionSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Object names; + + /** + * Getter for property https://w3id.org/cwl/salad#names
+ *
+ * Defines the type of the union elements. *
+ */ + + public Object getNames() { + return this.names; + } + + private Union_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `union` *
+ */ + + public Union_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of UnionSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public UnionSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("UnionSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Object names; + try { + names = + LoaderInstances + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("names"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + names = null; // won't be used but prevents compiler from complaining. + final String __message = "the `names` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Union_name type; + try { + type = + LoaderInstances + .typedsl_Union_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.names = (Object) names; + this.type = (Union_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Union_name.java b/src/main/java/org/w3id/cwl/cwl1_1/Union_name.java new file mode 100644 index 0000000..dbbb0e0 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/Union_name.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_1; + +import org.w3id.cwl.cwl1_1.utils.ValidationException; + +public enum Union_name { + UNION("union"); + + private static String[] symbols = new String[] {"union"}; + private String docVal; + + private Union_name(final String docVal) { + this.docVal = docVal; + } + + public static Union_name fromDocumentVal(final String docVal) { + for(final Union_name val : Union_name.values()) { + if(val.docVal.equals(docVal)) { + return val; + } + } + throw new ValidationException(String.format("Expected one of %s", Union_name.symbols, docVal)); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java index 6a60407..a909912 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java @@ -95,7 +95,7 @@ public WorkReuseImpl( try { class_ = LoaderInstances - .uri_WorkReuse_class_False_True_None + .uri_WorkReuse_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java index b650091..e94d80b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java @@ -258,7 +258,7 @@ public WorkflowImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -287,7 +287,7 @@ public WorkflowImpl( try { class_ = LoaderInstances - .uri_Workflow_class_False_True_None + .uri_Workflow_class_False_True_None_None .loadField(__doc.get("class"), __baseUri, __loadingOptions); } catch (ValidationException e) { class_ = null; // won't be used but prevents compiler from complaining. @@ -390,7 +390,7 @@ public WorkflowImpl( try { cwlVersion = LoaderInstances - .uri_optional_CWLVersion_False_True_None + .uri_optional_CWLVersion_False_True_None_None .loadField(__doc.get("cwlVersion"), __baseUri, __loadingOptions); } catch (ValidationException e) { cwlVersion = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java index aaf1f6c..76a0556 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java @@ -153,7 +153,7 @@ public interface WorkflowInputParameter extends InputParameter, Saveable { * * */ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java index c7297fa..2082674 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java @@ -191,7 +191,7 @@ public java.util.Optional getLoadListing() { return this.loadListing; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -203,7 +203,7 @@ public java.util.Optional getLoadListing() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -270,7 +270,7 @@ public WorkflowInputParameterImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -369,7 +369,7 @@ public WorkflowInputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -414,13 +414,13 @@ public WorkflowInputParameterImpl( } else { loadListing = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -470,7 +470,7 @@ public WorkflowInputParameterImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java index 999b059..a45c4aa 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java @@ -233,7 +233,7 @@ public WorkflowOutputParameterImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -332,7 +332,7 @@ public WorkflowOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -349,7 +349,7 @@ public WorkflowOutputParameterImpl( try { outputSource = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_1 + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_1_None .loadField(__doc.get("outputSource"), __baseUri, __loadingOptions); } catch (ValidationException e) { outputSource = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java index 57784b5..3f1f967 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java @@ -258,7 +258,7 @@ public WorkflowStepImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -332,7 +332,7 @@ public WorkflowStepImpl( try { out = LoaderInstances - .uri_array_of_union_of_StringInstance_or_WorkflowStepOutput_True_False_None + .uri_array_of_union_of_StringInstance_or_WorkflowStepOutput_True_False_None_None .loadField(__doc.get("out"), __baseUri, __loadingOptions); } catch (ValidationException e) { out = null; // won't be used but prevents compiler from complaining. @@ -377,7 +377,7 @@ public WorkflowStepImpl( try { run = LoaderInstances - .uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_False_False_None + .uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_False_False_None_None .loadField(__doc.get("run"), __baseUri, __loadingOptions); } catch (ValidationException e) { run = null; // won't be used but prevents compiler from complaining. @@ -390,7 +390,7 @@ public WorkflowStepImpl( try { scatter = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_0 + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_0_None .loadField(__doc.get("scatter"), __baseUri, __loadingOptions); } catch (ValidationException e) { scatter = null; // won't be used but prevents compiler from complaining. @@ -407,7 +407,7 @@ public WorkflowStepImpl( try { scatterMethod = LoaderInstances - .uri_optional_ScatterMethod_False_True_None + .uri_optional_ScatterMethod_False_True_None_None .loadField(__doc.get("scatterMethod"), __baseUri, __loadingOptions); } catch (ValidationException e) { scatterMethod = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java index 4e265a8..dae9702 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java @@ -133,7 +133,7 @@ public interface WorkflowStepInput extends Identified, Sink, LoadContents, Label * * */ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/cwl#WorkflowStepInput/valueFrom
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java index 5a46bf4..f951482 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java @@ -162,7 +162,7 @@ public java.util.Optional getLabel() { return this.label; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -173,7 +173,7 @@ public java.util.Optional getLabel() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -247,7 +247,7 @@ public WorkflowStepInputImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. @@ -278,7 +278,7 @@ public WorkflowStepInputImpl( try { source = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_2 + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_2_None .loadField(__doc.get("source"), __baseUri, __loadingOptions); } catch (ValidationException e) { source = null; // won't be used but prevents compiler from complaining. @@ -357,13 +357,13 @@ public WorkflowStepInputImpl( } else { label = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -400,7 +400,7 @@ public WorkflowStepInputImpl( this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; this.label = (java.util.Optional) label; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.valueFrom = (Object) valueFrom; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java index 803034c..1de5efa 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java @@ -85,7 +85,7 @@ public WorkflowStepOutputImpl( try { id = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .loadField(__doc.get("id"), __baseUri, __loadingOptions); } catch (ValidationException e) { id = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java index 9eda3d2..edd0729 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java @@ -25,7 +25,8 @@ public List load( for (final Object el : docList) { try { final Object loadedField = unionLoader.loadField(el, baseUri, loadingOptions); - if (loadedField instanceof List) { + final boolean flatten = !"@list".equals(loadingOptions.container); + if (flatten && loadedField instanceof List) { r.addAll((List) loadedField); } else { r.add((T) loadedField); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java index 9c4b0ee..24d01c9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java @@ -10,6 +10,11 @@ public class ConstantMaps { static { vocab.put("Any", "https://w3id.org/cwl/salad#Any"); vocab.put("ArraySchema", "https://w3id.org/cwl/salad#ArraySchema"); + vocab.put("CWLArraySchema", "https://w3id.org/cwl/cwl#CWLArraySchema"); + vocab.put("CWLInputFile", "https://w3id.org/cwl/cwl#CWLInputFile"); + vocab.put("CWLObjectType", "https://w3id.org/cwl/cwl#CWLObjectType"); + vocab.put("CWLRecordField", "https://w3id.org/cwl/cwl#CWLRecordField"); + vocab.put("CWLRecordSchema", "https://w3id.org/cwl/cwl#CWLRecordSchema"); vocab.put("CWLType", "https://w3id.org/cwl/cwl#CWLType"); vocab.put("CWLVersion", "https://w3id.org/cwl/cwl#CWLVersion"); vocab.put("CommandInputArraySchema", "https://w3id.org/cwl/cwl#CommandInputArraySchema"); @@ -58,6 +63,7 @@ public class ConstantMaps { vocab.put("LoadContents", "https://w3id.org/cwl/cwl#LoadContents"); vocab.put("LoadListingEnum", "https://w3id.org/cwl/cwl#LoadListingEnum"); vocab.put("LoadListingRequirement", "LoadListingRequirement"); + vocab.put("MapSchema", "https://w3id.org/cwl/salad#MapSchema"); vocab.put("MultipleInputFeatureRequirement", "MultipleInputFeatureRequirement"); vocab.put("NetworkAccess", "NetworkAccess"); vocab.put("OutputArraySchema", "https://w3id.org/cwl/cwl#OutputArraySchema"); @@ -85,6 +91,7 @@ public class ConstantMaps { vocab.put("StepInputExpressionRequirement", "StepInputExpressionRequirement"); vocab.put("SubworkflowFeatureRequirement", "SubworkflowFeatureRequirement"); vocab.put("ToolTimeLimit", "ToolTimeLimit"); + vocab.put("UnionSchema", "https://w3id.org/cwl/salad#UnionSchema"); vocab.put("WorkReuse", "WorkReuse"); vocab.put("Workflow", "Workflow"); vocab.put("WorkflowInputParameter", "https://w3id.org/cwl/cwl#WorkflowInputParameter"); @@ -112,6 +119,7 @@ public class ConstantMaps { vocab.put("float", "http://www.w3.org/2001/XMLSchema#float"); vocab.put("int", "http://www.w3.org/2001/XMLSchema#int"); vocab.put("long", "http://www.w3.org/2001/XMLSchema#long"); + vocab.put("map", "map"); vocab.put("merge_flattened", "https://w3id.org/cwl/cwl#LinkMergeMethod/merge_flattened"); vocab.put("merge_nested", "https://w3id.org/cwl/cwl#LinkMergeMethod/merge_nested"); vocab.put("nested_crossproduct", "https://w3id.org/cwl/cwl#ScatterMethod/nested_crossproduct"); @@ -123,6 +131,7 @@ public class ConstantMaps { vocab.put("stdin", "https://w3id.org/cwl/cwl#stdin"); vocab.put("stdout", "https://w3id.org/cwl/cwl#stdout"); vocab.put("string", "http://www.w3.org/2001/XMLSchema#string"); + vocab.put("union", "union"); vocab.put("v1.0", "https://w3id.org/cwl/cwl#v1.0"); vocab.put("v1.0.dev4", "https://w3id.org/cwl/cwl#v1.0.dev4"); vocab.put("v1.1", "https://w3id.org/cwl/cwl#v1.1"); @@ -131,6 +140,11 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/salad#Any", "Any"); rvocab.put("https://w3id.org/cwl/salad#ArraySchema", "ArraySchema"); + rvocab.put("https://w3id.org/cwl/cwl#CWLArraySchema", "CWLArraySchema"); + rvocab.put("https://w3id.org/cwl/cwl#CWLInputFile", "CWLInputFile"); + rvocab.put("https://w3id.org/cwl/cwl#CWLObjectType", "CWLObjectType"); + rvocab.put("https://w3id.org/cwl/cwl#CWLRecordField", "CWLRecordField"); + rvocab.put("https://w3id.org/cwl/cwl#CWLRecordSchema", "CWLRecordSchema"); rvocab.put("https://w3id.org/cwl/cwl#CWLType", "CWLType"); rvocab.put("https://w3id.org/cwl/cwl#CWLVersion", "CWLVersion"); rvocab.put("https://w3id.org/cwl/cwl#CommandInputArraySchema", "CommandInputArraySchema"); @@ -179,6 +193,7 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/cwl#LoadContents", "LoadContents"); rvocab.put("https://w3id.org/cwl/cwl#LoadListingEnum", "LoadListingEnum"); rvocab.put("LoadListingRequirement", "LoadListingRequirement"); + rvocab.put("https://w3id.org/cwl/salad#MapSchema", "MapSchema"); rvocab.put("MultipleInputFeatureRequirement", "MultipleInputFeatureRequirement"); rvocab.put("NetworkAccess", "NetworkAccess"); rvocab.put("https://w3id.org/cwl/cwl#OutputArraySchema", "OutputArraySchema"); @@ -206,6 +221,7 @@ public class ConstantMaps { rvocab.put("StepInputExpressionRequirement", "StepInputExpressionRequirement"); rvocab.put("SubworkflowFeatureRequirement", "SubworkflowFeatureRequirement"); rvocab.put("ToolTimeLimit", "ToolTimeLimit"); + rvocab.put("https://w3id.org/cwl/salad#UnionSchema", "UnionSchema"); rvocab.put("WorkReuse", "WorkReuse"); rvocab.put("Workflow", "Workflow"); rvocab.put("https://w3id.org/cwl/cwl#WorkflowInputParameter", "WorkflowInputParameter"); @@ -233,6 +249,7 @@ public class ConstantMaps { rvocab.put("http://www.w3.org/2001/XMLSchema#float", "float"); rvocab.put("http://www.w3.org/2001/XMLSchema#int", "int"); rvocab.put("http://www.w3.org/2001/XMLSchema#long", "long"); + rvocab.put("map", "map"); rvocab.put("https://w3id.org/cwl/cwl#LinkMergeMethod/merge_flattened", "merge_flattened"); rvocab.put("https://w3id.org/cwl/cwl#LinkMergeMethod/merge_nested", "merge_nested"); rvocab.put("https://w3id.org/cwl/cwl#ScatterMethod/nested_crossproduct", "nested_crossproduct"); @@ -244,6 +261,7 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/cwl#stdin", "stdin"); rvocab.put("https://w3id.org/cwl/cwl#stdout", "stdout"); rvocab.put("http://www.w3.org/2001/XMLSchema#string", "string"); + rvocab.put("union", "union"); rvocab.put("https://w3id.org/cwl/cwl#v1.0", "v1.0"); rvocab.put("https://w3id.org/cwl/cwl#v1.0.dev4", "v1.0.dev4"); rvocab.put("https://w3id.org/cwl/cwl#v1.1", "v1.1"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java index c3b9cad..ed30f52 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java @@ -27,9 +27,7 @@ public T load( if (doc instanceof Map) { final Map docMap = (Map) doc; final List asList = new ArrayList(); - final TreeSet sortedKeys = new TreeSet(); - sortedKeys.addAll(docMap.keySet()); - for (final String key : sortedKeys) { + for (final String key : docMap.keySet()) { final Object el = docMap.get(key); if (el instanceof Map) { final Map v2 = new HashMap((Map) el); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java index 2624728..f7f28a2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java @@ -11,121 +11,148 @@ public class LoaderInstances { public static Loader BooleanInstance = new PrimitiveLoader(Boolean.class); public static Loader NullInstance = new NullLoader(); public static Loader AnyInstance = new AnyLoader(); - public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_1.Documented.class); + public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_1.Documented.class, null, null); public static Loader PrimitiveType = new EnumLoader(PrimitiveType.class); public static Loader Any = new EnumLoader(Any.class); - public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_1.RecordFieldImpl.class); - public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.RecordSchemaImpl.class); - public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.EnumSchemaImpl.class); - public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.ArraySchemaImpl.class); - public static Loader CWLVersion = new EnumLoader(CWLVersion.class); + public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_1.RecordFieldImpl.class, null, null); + public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.RecordSchemaImpl.class, null, null); + public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.EnumSchemaImpl.class, null, null); + public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.ArraySchemaImpl.class, null, null); + public static Loader MapSchema = new RecordLoader(org.w3id.cwl.cwl1_1.MapSchemaImpl.class, null, null); + public static Loader UnionSchema = new RecordLoader(org.w3id.cwl.cwl1_1.UnionSchemaImpl.class, null, null); public static Loader CWLType = new EnumLoader(CWLType.class); - public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_1.FileImpl.class); - public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_1.DirectoryImpl.class); - public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_1.Labeled.class); - public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_1.Identified.class); + public static Loader CWLArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CWLArraySchemaImpl.class, null, null); + public static Loader CWLRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CWLRecordFieldImpl.class, null, null); + public static Loader CWLRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CWLRecordSchemaImpl.class, null, null); + public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_1.FileImpl.class, null, null); + public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_1.DirectoryImpl.class, null, null); + public static Loader CWLObjectType = new UnionLoader(new Loader[] {}); + public static Loader> optional_CWLObjectType = new OptionalLoader(CWLObjectType); + public static Loader>> array_of_optional_CWLObjectType = new ArrayLoader(optional_CWLObjectType); + public static Loader>> map_of_optional_CWLObjectType = new MapLoader(optional_CWLObjectType, null, null); + public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InlineJavascriptRequirementImpl.class, null, null); + public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SchemaDefRequirementImpl.class, null, null); + public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.LoadListingRequirementImpl.class, null, null); + public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.DockerRequirementImpl.class, null, null); + public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwareRequirementImpl.class, null, null); + public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InitialWorkDirRequirementImpl.class, null, null); + public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.EnvVarRequirementImpl.class, null, null); + public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ShellCommandRequirementImpl.class, null, null); + public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ResourceRequirementImpl.class, null, null); + public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_1.WorkReuseImpl.class, null, null); + public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_1.NetworkAccessImpl.class, null, null); + public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InplaceUpdateRequirementImpl.class, null, null); + public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_1.ToolTimeLimitImpl.class, null, null); + public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SubworkflowFeatureRequirementImpl.class, null, null); + public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ScatterFeatureRequirementImpl.class, null, null); + public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.MultipleInputFeatureRequirementImpl.class, null, null); + public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.StepInputExpressionRequirementImpl.class, null, null); + public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); + public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); + public static Loader union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new UnionLoader(new Loader[] { NullInstance, array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, CWLObjectType }); + public static Loader> map_of_union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new MapLoader(union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType, "@list", true); + public static Loader CWLVersion = new EnumLoader(CWLVersion.class); + public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_1.Labeled.class, null, null); + public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_1.Identified.class, null, null); public static Loader LoadListingEnum = new EnumLoader(LoadListingEnum.class); - public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_1.LoadContents.class); - public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_1.FieldBase.class); - public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.InputFormat.class); - public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.OutputFormat.class); - public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_1.Parameter.class); + public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_1.LoadContents.class, null, null); + public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_1.FieldBase.class, null, null); + public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.InputFormat.class, null, null); + public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.OutputFormat.class, null, null); + public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_1.Parameter.class, null, null); public static Loader Expression = new EnumLoader(Expression.class); - public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.InputBindingImpl.class); - public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_1.IOSchema.class); - public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputSchema.class); - public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputSchema.class); - public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordFieldImpl.class); - public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordSchemaImpl.class); - public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputEnumSchemaImpl.class); - public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputArraySchemaImpl.class); - public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordFieldImpl.class); - public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordSchemaImpl.class); - public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputEnumSchemaImpl.class); - public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputArraySchemaImpl.class); - public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.InputParameter.class); - public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.OutputParameter.class); - public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ProcessRequirement.class); - public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_1.Process.class); - public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InlineJavascriptRequirementImpl.class); - public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputSchema.class); - public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SchemaDefRequirementImpl.class); - public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_1.SecondaryFileSchemaImpl.class); - public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.LoadListingRequirementImpl.class); - public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_1.EnvironmentDefImpl.class); - public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindingImpl.class); - public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputBindingImpl.class); - public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindableImpl.class); - public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordFieldImpl.class); - public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordSchemaImpl.class); - public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputEnumSchemaImpl.class); - public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputArraySchemaImpl.class); - public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordFieldImpl.class); - public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordSchemaImpl.class); - public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputEnumSchemaImpl.class); - public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputArraySchemaImpl.class); - public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputParameterImpl.class); - public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputParameterImpl.class); + public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.InputBindingImpl.class, null, null); + public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_1.IOSchema.class, null, null); + public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputSchema.class, null, null); + public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputSchema.class, null, null); + public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordFieldImpl.class, null, null); + public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordSchemaImpl.class, null, null); + public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputEnumSchemaImpl.class, null, null); + public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputArraySchemaImpl.class, null, null); + public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordFieldImpl.class, null, null); + public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordSchemaImpl.class, null, null); + public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputEnumSchemaImpl.class, null, null); + public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputArraySchemaImpl.class, null, null); + public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.InputParameter.class, null, null); + public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.OutputParameter.class, null, null); + public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ProcessRequirement.class, null, null); + public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_1.Process.class, null, null); + public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputSchema.class, null, null); + public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_1.SecondaryFileSchemaImpl.class, null, null); + public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_1.EnvironmentDefImpl.class, null, null); + public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindingImpl.class, null, null); + public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputBindingImpl.class, null, null); + public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindableImpl.class, null, null); + public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordFieldImpl.class, null, null); + public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordSchemaImpl.class, null, null); + public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputEnumSchemaImpl.class, null, null); + public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputArraySchemaImpl.class, null, null); + public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordFieldImpl.class, null, null); + public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordSchemaImpl.class, null, null); + public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputEnumSchemaImpl.class, null, null); + public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputArraySchemaImpl.class, null, null); + public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputParameterImpl.class, null, null); + public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputParameterImpl.class, null, null); public static Loader stdin = new EnumLoader(stdin.class); public static Loader stdout = new EnumLoader(stdout.class); public static Loader stderr = new EnumLoader(stderr.class); - public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineToolImpl.class); - public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.DockerRequirementImpl.class); - public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwareRequirementImpl.class); - public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwarePackageImpl.class); - public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_1.DirentImpl.class); - public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InitialWorkDirRequirementImpl.class); - public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.EnvVarRequirementImpl.class); - public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ShellCommandRequirementImpl.class); - public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ResourceRequirementImpl.class); - public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_1.WorkReuseImpl.class); - public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_1.NetworkAccessImpl.class); - public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InplaceUpdateRequirementImpl.class); - public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_1.ToolTimeLimitImpl.class); - public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolOutputParameterImpl.class); - public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowInputParameterImpl.class); - public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolImpl.class); + public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineToolImpl.class, null, null); + public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwarePackageImpl.class, null, null); + public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_1.DirentImpl.class, null, null); + public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolOutputParameterImpl.class, null, null); + public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowInputParameterImpl.class, null, null); + public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolImpl.class, null, null); public static Loader LinkMergeMethod = new EnumLoader(LinkMergeMethod.class); - public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowOutputParameterImpl.class); - public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_1.Sink.class); - public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepInputImpl.class); - public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepOutputImpl.class); + public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowOutputParameterImpl.class, null, null); + public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_1.Sink.class, null, null); + public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepInputImpl.class, null, null); + public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepOutputImpl.class, null, null); public static Loader ScatterMethod = new EnumLoader(ScatterMethod.class); - public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepImpl.class); - public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowImpl.class); - public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SubworkflowFeatureRequirementImpl.class); - public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ScatterFeatureRequirementImpl.class); - public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.MultipleInputFeatureRequirementImpl.class); - public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.StepInputExpressionRequirementImpl.class); + public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepImpl.class, null, null); + public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowImpl.class, null, null); public static Loader> array_of_StringInstance = new ArrayLoader(StringInstance); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance }); - public static Loader uri_StringInstance_True_False_None = new UriLoader(StringInstance, true, false, null); - public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, StringInstance }); - public static Loader> array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance); - public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, StringInstance, array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance }); - public static Loader typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance, 2); + public static Loader uri_StringInstance_True_False_None_None = new UriLoader(StringInstance, true, false, null, null); + public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, MapSchema, UnionSchema, StringInstance }); + public static Loader> array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance); + public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, MapSchema, UnionSchema, StringInstance, array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance }); + public static Loader typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance, 2); public static Loader> array_of_RecordField = new ArrayLoader(RecordField); public static Loader>> optional_array_of_RecordField = new OptionalLoader(array_of_RecordField); public static Loader>> idmap_fields_optional_array_of_RecordField = new IdMapLoader(optional_array_of_RecordField, "name", "type"); - public static Loader enum_d9cba076fca539106791a4f46d198c7fcfbdb779 = new EnumLoader(enum_d9cba076fca539106791a4f46d198c7fcfbdb779.class); - public static Loader typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 = new TypeDslLoader(enum_d9cba076fca539106791a4f46d198c7fcfbdb779, 2); - public static Loader> uri_array_of_StringInstance_True_False_None = new UriLoader(array_of_StringInstance, true, false, null); - public static Loader enum_d961d79c225752b9fadb617367615ab176b47d77 = new EnumLoader(enum_d961d79c225752b9fadb617367615ab176b47d77.class); - public static Loader typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 = new TypeDslLoader(enum_d961d79c225752b9fadb617367615ab176b47d77, 2); - public static Loader enum_d062602be0b4b8fd33e69e29a841317b6ab665bc = new EnumLoader(enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.class); - public static Loader typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 = new TypeDslLoader(enum_d062602be0b4b8fd33e69e29a841317b6ab665bc, 2); - public static Loader File_class = new EnumLoader(File_class.class); - public static Loader uri_File_class_False_True_None = new UriLoader(File_class, false, true, null); + public static Loader Record_name = new EnumLoader(Record_name.class); + public static Loader typedsl_Record_name_2 = new TypeDslLoader(Record_name, 2); public static Loader> optional_StringInstance = new OptionalLoader(StringInstance); - public static Loader> uri_optional_StringInstance_False_False_None = new UriLoader(optional_StringInstance, false, false, null); + public static Loader> uri_optional_StringInstance_True_False_None_None = new UriLoader(optional_StringInstance, true, false, null, null); + public static Loader> uri_array_of_StringInstance_True_False_None_None = new UriLoader(array_of_StringInstance, true, false, null, null); + public static Loader Enum_name = new EnumLoader(Enum_name.class); + public static Loader typedsl_Enum_name_2 = new TypeDslLoader(Enum_name, 2); + public static Loader uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance, false, true, 2, null); + public static Loader Array_name = new EnumLoader(Array_name.class); + public static Loader typedsl_Array_name_2 = new TypeDslLoader(Array_name, 2); + public static Loader Map_name = new EnumLoader(Map_name.class); + public static Loader typedsl_Map_name_2 = new TypeDslLoader(Map_name, 2); + public static Loader Union_name = new EnumLoader(Union_name.class); + public static Loader typedsl_Union_name_2 = new TypeDslLoader(Union_name, 2); + public static Loader union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, CWLRecordSchema, EnumSchema, CWLArraySchema, StringInstance }); + public static Loader> array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance); + public static Loader union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, CWLRecordSchema, EnumSchema, CWLArraySchema, StringInstance, array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance }); + public static Loader uri_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance, false, true, 2, null); + public static Loader typedsl_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance, 2); + public static Loader> array_of_CWLRecordField = new ArrayLoader(CWLRecordField); + public static Loader>> optional_array_of_CWLRecordField = new OptionalLoader(array_of_CWLRecordField); + public static Loader>> idmap_fields_optional_array_of_CWLRecordField = new IdMapLoader(optional_array_of_CWLRecordField, "name", "type"); + public static Loader File_class = new EnumLoader(File_class.class); + public static Loader uri_File_class_False_True_None_None = new UriLoader(File_class, false, true, null, null); + public static Loader> uri_optional_StringInstance_False_False_None_None = new UriLoader(optional_StringInstance, false, false, null, null); public static Loader union_of_NullInstance_or_IntegerInstance_or_LongInstance = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance }); public static Loader union_of_File_or_Directory = new UnionLoader(new Loader[] { File, Directory }); public static Loader> array_of_union_of_File_or_Directory = new ArrayLoader(union_of_File_or_Directory); public static Loader>> optional_array_of_union_of_File_or_Directory = new OptionalLoader(array_of_union_of_File_or_Directory); public static Loader>> secondaryfilesdsl_optional_array_of_union_of_File_or_Directory = new SecondaryFilesDslLoader(optional_array_of_union_of_File_or_Directory); - public static Loader> uri_optional_StringInstance_True_False_None = new UriLoader(optional_StringInstance, true, false, null); + public static Loader> uri_optional_StringInstance_True_False_None_True = new UriLoader(optional_StringInstance, true, false, null, true); public static Loader Directory_class = new EnumLoader(Directory_class.class); - public static Loader uri_Directory_class_False_True_None = new UriLoader(Directory_class, false, true, null); + public static Loader uri_Directory_class_False_True_None_None = new UriLoader(Directory_class, false, true, null, null); public static Loader> optional_BooleanInstance = new OptionalLoader(BooleanInstance); public static Loader> optional_LoadListingEnum = new OptionalLoader(LoadListingEnum); public static Loader> array_of_SecondaryFileSchema = new ArrayLoader(SecondaryFileSchema); @@ -133,9 +160,9 @@ public class LoaderInstances { public static Loader secondaryfilesdsl_union_of_NullInstance_or_SecondaryFileSchema_or_array_of_SecondaryFileSchema = new SecondaryFilesDslLoader(union_of_NullInstance_or_SecondaryFileSchema_or_array_of_SecondaryFileSchema); public static Loader ExpressionLoader = new ExpressionLoader(); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance, ExpressionLoader }); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader, true, false, null); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader, true, false, null, true); public static Loader union_of_NullInstance_or_StringInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, StringInstance, ExpressionLoader }); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_ExpressionLoader, true, false, null); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True = new UriLoader(union_of_NullInstance_or_StringInstance_or_ExpressionLoader, true, false, null, true); public static Loader union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, InputRecordSchema, InputEnumSchema, InputArraySchema, StringInstance }); public static Loader> array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance); public static Loader union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, InputRecordSchema, InputEnumSchema, InputArraySchema, StringInstance, array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance }); @@ -143,6 +170,7 @@ public class LoaderInstances { public static Loader> array_of_InputRecordField = new ArrayLoader(InputRecordField); public static Loader>> optional_array_of_InputRecordField = new OptionalLoader(array_of_InputRecordField); public static Loader>> idmap_fields_optional_array_of_InputRecordField = new IdMapLoader(optional_array_of_InputRecordField, "name", "type"); + public static Loader uri_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance, false, true, 2, null); public static Loader union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, OutputRecordSchema, OutputEnumSchema, OutputArraySchema, StringInstance }); public static Loader> array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance); public static Loader union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, OutputRecordSchema, OutputEnumSchema, OutputArraySchema, StringInstance, array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance }); @@ -150,15 +178,13 @@ public class LoaderInstances { public static Loader> array_of_OutputRecordField = new ArrayLoader(OutputRecordField); public static Loader>> optional_array_of_OutputRecordField = new OptionalLoader(array_of_OutputRecordField); public static Loader>> idmap_fields_optional_array_of_OutputRecordField = new IdMapLoader(optional_array_of_OutputRecordField, "name", "type"); - public static Loader union_of_NullInstance_or_File_or_Directory_or_AnyInstance = new UnionLoader(new Loader[] { NullInstance, File, Directory, AnyInstance }); + public static Loader uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance, false, true, 2, null); public static Loader union_of_CommandInputParameter_or_WorkflowInputParameter = new UnionLoader(new Loader[] { CommandInputParameter, WorkflowInputParameter }); public static Loader> array_of_union_of_CommandInputParameter_or_WorkflowInputParameter = new ArrayLoader(union_of_CommandInputParameter_or_WorkflowInputParameter); public static Loader> idmap_inputs_array_of_union_of_CommandInputParameter_or_WorkflowInputParameter = new IdMapLoader(array_of_union_of_CommandInputParameter_or_WorkflowInputParameter, "id", "type"); public static Loader union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter = new UnionLoader(new Loader[] { CommandOutputParameter, ExpressionToolOutputParameter, WorkflowOutputParameter }); public static Loader> array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter = new ArrayLoader(union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter); public static Loader> idmap_outputs_array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter = new IdMapLoader(array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter, "id", "type"); - public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); - public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader>> optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new OptionalLoader(array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader>> idmap_requirements_optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new IdMapLoader(optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, "class", "None"); public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement, AnyInstance }); @@ -166,18 +192,18 @@ public class LoaderInstances { public static Loader>> optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance = new OptionalLoader(array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance); public static Loader>> idmap_hints_optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance = new IdMapLoader(optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance, "class", "None"); public static Loader> optional_CWLVersion = new OptionalLoader(CWLVersion); - public static Loader> uri_optional_CWLVersion_False_True_None = new UriLoader(optional_CWLVersion, false, true, null); + public static Loader> uri_optional_CWLVersion_False_True_None_None = new UriLoader(optional_CWLVersion, false, true, null, null); public static Loader InlineJavascriptRequirement_class = new EnumLoader(InlineJavascriptRequirement_class.class); - public static Loader uri_InlineJavascriptRequirement_class_False_True_None = new UriLoader(InlineJavascriptRequirement_class, false, true, null); + public static Loader uri_InlineJavascriptRequirement_class_False_True_None_None = new UriLoader(InlineJavascriptRequirement_class, false, true, null, null); public static Loader>> optional_array_of_StringInstance = new OptionalLoader(array_of_StringInstance); public static Loader SchemaDefRequirement_class = new EnumLoader(SchemaDefRequirement_class.class); - public static Loader uri_SchemaDefRequirement_class_False_True_None = new UriLoader(SchemaDefRequirement_class, false, true, null); + public static Loader uri_SchemaDefRequirement_class_False_True_None_None = new UriLoader(SchemaDefRequirement_class, false, true, null, null); public static Loader union_of_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema = new UnionLoader(new Loader[] { CommandInputRecordSchema, CommandInputEnumSchema, CommandInputArraySchema }); public static Loader> array_of_union_of_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema = new ArrayLoader(union_of_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema); public static Loader union_of_StringInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { StringInstance, ExpressionLoader }); public static Loader union_of_NullInstance_or_BooleanInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, BooleanInstance, ExpressionLoader }); public static Loader LoadListingRequirement_class = new EnumLoader(LoadListingRequirement_class.class); - public static Loader uri_LoadListingRequirement_class_False_True_None = new UriLoader(LoadListingRequirement_class, false, true, null); + public static Loader uri_LoadListingRequirement_class_False_True_None_None = new UriLoader(LoadListingRequirement_class, false, true, null, null); public static Loader union_of_NullInstance_or_IntegerInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, ExpressionLoader }); public static Loader union_of_NullInstance_or_StringInstance_or_ExpressionLoader_or_array_of_StringInstance = new UnionLoader(new Loader[] { NullInstance, StringInstance, ExpressionLoader, array_of_StringInstance }); public static Loader> optional_ExpressionLoader = new OptionalLoader(ExpressionLoader); @@ -189,6 +215,7 @@ public class LoaderInstances { public static Loader> array_of_CommandInputRecordField = new ArrayLoader(CommandInputRecordField); public static Loader>> optional_array_of_CommandInputRecordField = new OptionalLoader(array_of_CommandInputRecordField); public static Loader>> idmap_fields_optional_array_of_CommandInputRecordField = new IdMapLoader(optional_array_of_CommandInputRecordField, "name", "type"); + public static Loader uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance, false, true, 2, null); public static Loader union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance }); public static Loader> array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance); public static Loader union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance }); @@ -197,12 +224,13 @@ public class LoaderInstances { public static Loader> array_of_CommandOutputRecordField = new ArrayLoader(CommandOutputRecordField); public static Loader>> optional_array_of_CommandOutputRecordField = new OptionalLoader(array_of_CommandOutputRecordField); public static Loader>> idmap_fields_optional_array_of_CommandOutputRecordField = new IdMapLoader(optional_array_of_CommandOutputRecordField, "name", "type"); + public static Loader uri_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance, false, true, 2, null); public static Loader union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, stdin, CommandInputRecordSchema, CommandInputEnumSchema, CommandInputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance }); public static Loader typedsl_union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance, 2); public static Loader union_of_CWLType_or_stdout_or_stderr_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, stdout, stderr, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance }); public static Loader typedsl_union_of_CWLType_or_stdout_or_stderr_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_CWLType_or_stdout_or_stderr_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance, 2); public static Loader CommandLineTool_class = new EnumLoader(CommandLineTool_class.class); - public static Loader uri_CommandLineTool_class_False_True_None = new UriLoader(CommandLineTool_class, false, true, null); + public static Loader uri_CommandLineTool_class_False_True_None_None = new UriLoader(CommandLineTool_class, false, true, null, null); public static Loader> array_of_CommandInputParameter = new ArrayLoader(CommandInputParameter); public static Loader> idmap_inputs_array_of_CommandInputParameter = new IdMapLoader(array_of_CommandInputParameter, "id", "type"); public static Loader> array_of_CommandOutputParameter = new ArrayLoader(CommandOutputParameter); @@ -213,75 +241,79 @@ public class LoaderInstances { public static Loader> array_of_IntegerInstance = new ArrayLoader(IntegerInstance); public static Loader>> optional_array_of_IntegerInstance = new OptionalLoader(array_of_IntegerInstance); public static Loader DockerRequirement_class = new EnumLoader(DockerRequirement_class.class); - public static Loader uri_DockerRequirement_class_False_True_None = new UriLoader(DockerRequirement_class, false, true, null); + public static Loader uri_DockerRequirement_class_False_True_None_None = new UriLoader(DockerRequirement_class, false, true, null, null); public static Loader SoftwareRequirement_class = new EnumLoader(SoftwareRequirement_class.class); - public static Loader uri_SoftwareRequirement_class_False_True_None = new UriLoader(SoftwareRequirement_class, false, true, null); + public static Loader uri_SoftwareRequirement_class_False_True_None_None = new UriLoader(SoftwareRequirement_class, false, true, null, null); public static Loader> array_of_SoftwarePackage = new ArrayLoader(SoftwarePackage); public static Loader> idmap_packages_array_of_SoftwarePackage = new IdMapLoader(array_of_SoftwarePackage, "package", "specs"); - public static Loader>> uri_optional_array_of_StringInstance_False_False_None = new UriLoader(optional_array_of_StringInstance, false, false, null); + public static Loader>> uri_optional_array_of_StringInstance_False_False_None_True = new UriLoader(optional_array_of_StringInstance, false, false, null, true); public static Loader InitialWorkDirRequirement_class = new EnumLoader(InitialWorkDirRequirement_class.class); - public static Loader uri_InitialWorkDirRequirement_class_False_True_None = new UriLoader(InitialWorkDirRequirement_class, false, true, null); + public static Loader uri_InitialWorkDirRequirement_class_False_True_None_None = new UriLoader(InitialWorkDirRequirement_class, false, true, null, null); public static Loader union_of_NullInstance_or_File_or_array_of_union_of_File_or_Directory_or_Directory_or_Dirent_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, File, array_of_union_of_File_or_Directory, Directory, Dirent, ExpressionLoader }); public static Loader> array_of_union_of_NullInstance_or_File_or_array_of_union_of_File_or_Directory_or_Directory_or_Dirent_or_ExpressionLoader = new ArrayLoader(union_of_NullInstance_or_File_or_array_of_union_of_File_or_Directory_or_Directory_or_Dirent_or_ExpressionLoader); public static Loader union_of_array_of_union_of_NullInstance_or_File_or_array_of_union_of_File_or_Directory_or_Directory_or_Dirent_or_ExpressionLoader_or_ExpressionLoader = new UnionLoader(new Loader[] { array_of_union_of_NullInstance_or_File_or_array_of_union_of_File_or_Directory_or_Directory_or_Dirent_or_ExpressionLoader, ExpressionLoader }); public static Loader EnvVarRequirement_class = new EnumLoader(EnvVarRequirement_class.class); - public static Loader uri_EnvVarRequirement_class_False_True_None = new UriLoader(EnvVarRequirement_class, false, true, null); + public static Loader uri_EnvVarRequirement_class_False_True_None_None = new UriLoader(EnvVarRequirement_class, false, true, null, null); public static Loader> array_of_EnvironmentDef = new ArrayLoader(EnvironmentDef); public static Loader> idmap_envDef_array_of_EnvironmentDef = new IdMapLoader(array_of_EnvironmentDef, "envName", "envValue"); public static Loader ShellCommandRequirement_class = new EnumLoader(ShellCommandRequirement_class.class); - public static Loader uri_ShellCommandRequirement_class_False_True_None = new UriLoader(ShellCommandRequirement_class, false, true, null); + public static Loader uri_ShellCommandRequirement_class_False_True_None_None = new UriLoader(ShellCommandRequirement_class, false, true, null, null); public static Loader ResourceRequirement_class = new EnumLoader(ResourceRequirement_class.class); - public static Loader uri_ResourceRequirement_class_False_True_None = new UriLoader(ResourceRequirement_class, false, true, null); + public static Loader uri_ResourceRequirement_class_False_True_None_None = new UriLoader(ResourceRequirement_class, false, true, null, null); public static Loader union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance, ExpressionLoader }); public static Loader WorkReuse_class = new EnumLoader(WorkReuse_class.class); - public static Loader uri_WorkReuse_class_False_True_None = new UriLoader(WorkReuse_class, false, true, null); + public static Loader uri_WorkReuse_class_False_True_None_None = new UriLoader(WorkReuse_class, false, true, null, null); public static Loader union_of_BooleanInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { BooleanInstance, ExpressionLoader }); public static Loader NetworkAccess_class = new EnumLoader(NetworkAccess_class.class); - public static Loader uri_NetworkAccess_class_False_True_None = new UriLoader(NetworkAccess_class, false, true, null); + public static Loader uri_NetworkAccess_class_False_True_None_None = new UriLoader(NetworkAccess_class, false, true, null, null); public static Loader InplaceUpdateRequirement_class = new EnumLoader(InplaceUpdateRequirement_class.class); - public static Loader uri_InplaceUpdateRequirement_class_False_True_None = new UriLoader(InplaceUpdateRequirement_class, false, true, null); + public static Loader uri_InplaceUpdateRequirement_class_False_True_None_None = new UriLoader(InplaceUpdateRequirement_class, false, true, null, null); public static Loader ToolTimeLimit_class = new EnumLoader(ToolTimeLimit_class.class); - public static Loader uri_ToolTimeLimit_class_False_True_None = new UriLoader(ToolTimeLimit_class, false, true, null); + public static Loader uri_ToolTimeLimit_class_False_True_None_None = new UriLoader(ToolTimeLimit_class, false, true, null, null); public static Loader union_of_IntegerInstance_or_LongInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { IntegerInstance, LongInstance, ExpressionLoader }); public static Loader> optional_InputBinding = new OptionalLoader(InputBinding); public static Loader ExpressionTool_class = new EnumLoader(ExpressionTool_class.class); - public static Loader uri_ExpressionTool_class_False_True_None = new UriLoader(ExpressionTool_class, false, true, null); + public static Loader uri_ExpressionTool_class_False_True_None_None = new UriLoader(ExpressionTool_class, false, true, null, null); public static Loader> array_of_WorkflowInputParameter = new ArrayLoader(WorkflowInputParameter); public static Loader> idmap_inputs_array_of_WorkflowInputParameter = new IdMapLoader(array_of_WorkflowInputParameter, "id", "type"); public static Loader> array_of_ExpressionToolOutputParameter = new ArrayLoader(ExpressionToolOutputParameter); public static Loader> idmap_outputs_array_of_ExpressionToolOutputParameter = new IdMapLoader(array_of_ExpressionToolOutputParameter, "id", "type"); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_1 = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 1); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_1_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 1, null); public static Loader> optional_LinkMergeMethod = new OptionalLoader(LinkMergeMethod); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_2 = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 2); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_2_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 2, null); public static Loader> array_of_WorkflowStepInput = new ArrayLoader(WorkflowStepInput); public static Loader> idmap_in_array_of_WorkflowStepInput = new IdMapLoader(array_of_WorkflowStepInput, "id", "source"); public static Loader union_of_StringInstance_or_WorkflowStepOutput = new UnionLoader(new Loader[] { StringInstance, WorkflowStepOutput }); public static Loader> array_of_union_of_StringInstance_or_WorkflowStepOutput = new ArrayLoader(union_of_StringInstance_or_WorkflowStepOutput); - public static Loader> uri_array_of_union_of_StringInstance_or_WorkflowStepOutput_True_False_None = new UriLoader(array_of_union_of_StringInstance_or_WorkflowStepOutput, true, false, null); + public static Loader> uri_array_of_union_of_StringInstance_or_WorkflowStepOutput_True_False_None_None = new UriLoader(array_of_union_of_StringInstance_or_WorkflowStepOutput, true, false, null, null); public static Loader> array_of_AnyInstance = new ArrayLoader(AnyInstance); public static Loader>> optional_array_of_AnyInstance = new OptionalLoader(array_of_AnyInstance); public static Loader>> idmap_hints_optional_array_of_AnyInstance = new IdMapLoader(optional_array_of_AnyInstance, "class", "None"); public static Loader union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow = new UnionLoader(new Loader[] { StringInstance, CommandLineTool, ExpressionTool, Workflow }); - public static Loader uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_False_False_None = new UriLoader(union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow, false, false, null); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_0 = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 0); + public static Loader uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_False_False_None_None = new UriLoader(union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow, false, false, null, null); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_False_False_0_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance, false, false, 0, null); public static Loader> optional_ScatterMethod = new OptionalLoader(ScatterMethod); - public static Loader> uri_optional_ScatterMethod_False_True_None = new UriLoader(optional_ScatterMethod, false, true, null); + public static Loader> uri_optional_ScatterMethod_False_True_None_None = new UriLoader(optional_ScatterMethod, false, true, null, null); public static Loader Workflow_class = new EnumLoader(Workflow_class.class); - public static Loader uri_Workflow_class_False_True_None = new UriLoader(Workflow_class, false, true, null); + public static Loader uri_Workflow_class_False_True_None_None = new UriLoader(Workflow_class, false, true, null, null); public static Loader> array_of_WorkflowOutputParameter = new ArrayLoader(WorkflowOutputParameter); public static Loader> idmap_outputs_array_of_WorkflowOutputParameter = new IdMapLoader(array_of_WorkflowOutputParameter, "id", "type"); public static Loader> array_of_WorkflowStep = new ArrayLoader(WorkflowStep); public static Loader> idmap_steps_array_of_WorkflowStep = new IdMapLoader(array_of_WorkflowStep, "id", "None"); public static Loader SubworkflowFeatureRequirement_class = new EnumLoader(SubworkflowFeatureRequirement_class.class); - public static Loader uri_SubworkflowFeatureRequirement_class_False_True_None = new UriLoader(SubworkflowFeatureRequirement_class, false, true, null); + public static Loader uri_SubworkflowFeatureRequirement_class_False_True_None_None = new UriLoader(SubworkflowFeatureRequirement_class, false, true, null, null); public static Loader ScatterFeatureRequirement_class = new EnumLoader(ScatterFeatureRequirement_class.class); - public static Loader uri_ScatterFeatureRequirement_class_False_True_None = new UriLoader(ScatterFeatureRequirement_class, false, true, null); + public static Loader uri_ScatterFeatureRequirement_class_False_True_None_None = new UriLoader(ScatterFeatureRequirement_class, false, true, null, null); public static Loader MultipleInputFeatureRequirement_class = new EnumLoader(MultipleInputFeatureRequirement_class.class); - public static Loader uri_MultipleInputFeatureRequirement_class_False_True_None = new UriLoader(MultipleInputFeatureRequirement_class, false, true, null); + public static Loader uri_MultipleInputFeatureRequirement_class_False_True_None_None = new UriLoader(MultipleInputFeatureRequirement_class, false, true, null, null); public static Loader StepInputExpressionRequirement_class = new EnumLoader(StepInputExpressionRequirement_class.class); - public static Loader uri_StepInputExpressionRequirement_class_False_True_None = new UriLoader(StepInputExpressionRequirement_class, false, true, null); + public static Loader uri_StepInputExpressionRequirement_class_False_True_None_None = new UriLoader(StepInputExpressionRequirement_class, false, true, null, null); public static Loader union_of_CommandLineTool_or_ExpressionTool_or_Workflow = new UnionLoader(new Loader[] { CommandLineTool, ExpressionTool, Workflow }); public static Loader> array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow = new ArrayLoader(union_of_CommandLineTool_or_ExpressionTool_or_Workflow); public static Loader union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow = new UnionLoader(new Loader[] { CommandLineTool, ExpressionTool, Workflow, array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow }); + static { + ((UnionLoader) CWLObjectType).addLoaders(new Loader[] { BooleanInstance, IntegerInstance, LongInstance, DoubleInstance, DoubleInstance, StringInstance, File, Directory, array_of_optional_CWLObjectType, map_of_optional_CWLObjectType }); + } + } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java index 2eac592..8e4cd36 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java @@ -11,6 +11,8 @@ public class LoadingOptions { String fileUri; Map namespaces; List schemas; + Boolean noLinkCheck; + String container; Map idx; Map vocab; Map rvocab; @@ -20,11 +22,15 @@ public class LoadingOptions { final String fileUri, final Map namespaces, final List schemas, + final Boolean noLinkCheck, + final String container, final Map idx) { this.fetcher = fetcher; this.fileUri = fileUri; this.namespaces = namespaces; this.schemas = schemas; + this.noLinkCheck = noLinkCheck; + this.container = container; this.idx = idx; if (namespaces != null) { diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java index 5a7fcc9..f3c3677 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java @@ -11,6 +11,8 @@ public class LoadingOptionsBuilder { private Optional> namespaces = Optional.empty(); private Optional> schemas = Optional.empty(); private Optional copyFrom = Optional.empty(); + private Optional noLinkCheck = Optional.empty(); + private Optional container = Optional.empty(); public LoadingOptionsBuilder() {} @@ -34,11 +36,23 @@ public LoadingOptionsBuilder setNamespaces(final Map namespaces) return this; } + public LoadingOptionsBuilder setNoLinkCheck(final Boolean noLinkCheck) { + this.noLinkCheck = Optional.of(noLinkCheck); + return this; + } + + public LoadingOptionsBuilder setContainer(final String container) { + this.container = Optional.of(container); + return this; + } + public LoadingOptions build() { Fetcher fetcher = this.fetcher.orElse(null); String fileUri = this.fileUri.orElse(null); List schemas = this.schemas.orElse(null); Map namespaces = this.namespaces.orElse(null); + Boolean noLinkCheck = this.noLinkCheck.orElse(null); + String container = this.container.orElse(null); Map idx = new HashMap(); if (this.copyFrom.isPresent()) { final LoadingOptions copyFrom = this.copyFrom.get(); @@ -53,10 +67,16 @@ public LoadingOptions build() { namespaces = copyFrom.namespaces; schemas = copyFrom.schemas; // Bug in Python codegen? } + if (noLinkCheck == null) { + noLinkCheck = copyFrom.noLinkCheck; + } + if (container == null) { + container = copyFrom.container; + } } if (fetcher == null) { fetcher = new DefaultFetcher(); } - return new LoadingOptions(fetcher, fileUri, namespaces, schemas, idx); + return new LoadingOptions(fetcher, fileUri, namespaces, schemas, noLinkCheck, container, idx); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java new file mode 100644 index 0000000..71b7731 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java @@ -0,0 +1,51 @@ +package org.w3id.cwl.cwl1_1.utils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class MapLoader implements Loader> { + private final Loader valueLoader; + private final String container; + private final Boolean noLinkCheck; + + public MapLoader(Loader valueLoader, final String container, final Boolean noLinkCheck) { + this.valueLoader = valueLoader; + this.container = container; + this.noLinkCheck = noLinkCheck; + } + + public Map load( + final Object doc, + final String baseUri, + final LoadingOptions loadingOptions, + final String docRoot) { + final Map docMap = (Map) Loader.validateOfJavaType(Map.class, doc); + LoadingOptions innerLoadingOptions = loadingOptions; + if (this.container != null || this.noLinkCheck != null) { + LoadingOptionsBuilder builder = new LoadingOptionsBuilder().copiedFrom(loadingOptions); + if (this.container != null) { + builder.setContainer(this.container); + } + if (this.noLinkCheck != null) { + builder.setNoLinkCheck(this.noLinkCheck); + } + innerLoadingOptions = builder.build(); + } + final Map r = new HashMap(); + final List errors = new ArrayList(); + for (final Map.Entry entry : docMap.entrySet()) { + try { + final Object loadedField = this.valueLoader.loadField(entry.getValue(), baseUri, innerLoadingOptions); + r.put(entry.getKey(), (T) loadedField); + } catch (final ValidationException e) { + errors.add(e); + } + } + if (!errors.isEmpty()) { + throw new ValidationException("", errors); + } + return r; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java new file mode 100644 index 0000000..9643dc3 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java @@ -0,0 +1,48 @@ +package org.w3id.cwl.cwl1_1.utils; + +import java.util.List; +import java.util.Optional; + +public class OneOrListOf { + private Optional object; + private Optional> objects; + + private OneOrListOf(final T object, final List objects) { + this.object = Optional.ofNullable(object); + this.objects = Optional.ofNullable(objects); + } + + public static OneOrListOf oneOf(T object) { + return new OneOrListOf(object, null); + } + + public static OneOrListOf listOf(List objects) { + assert objects != null; + return new OneOrListOf(null, objects); + } + + public boolean isOne() { + return this.getOneOptional().isPresent(); + } + + public boolean isList() { + return this.getListOptional().isPresent(); + } + + public Optional getOneOptional() { + return this.object; + } + + public Optional> getListOptional() { + return this.objects; + } + + public T getOne() { + return this.getOneOptional().get(); + } + + public List getList() { + return this.getListOptional().get(); + } + +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java new file mode 100644 index 0000000..94d1125 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java @@ -0,0 +1,35 @@ +package org.w3id.cwl.cwl1_1.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + + +public class OneOrListOfLoader implements Loader> { + private final Loader oneLoader; + private final Loader> listLoader; + + public OneOrListOfLoader(Loader oneLoader, Loader> listLoader) { + this.oneLoader = oneLoader; + this.listLoader = listLoader; + } + + public OneOrListOf load( + final Object doc, + final String baseUri, + final LoadingOptions loadingOptions, + final String docRoot) { + final List errors = new ArrayList(); + try { + return OneOrListOf.oneOf(this.oneLoader.load(doc, baseUri, loadingOptions, docRoot)); + } catch (ValidationException e) { + errors.add(e); + } + try { + return OneOrListOf.listOf(this.listLoader.load(doc, baseUri, loadingOptions, docRoot)); + } catch (ValidationException e) { + errors.add(e); + } + throw new ValidationException("Failed to one or list of of type", errors); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java index 709c0b1..bf23309 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java @@ -5,9 +5,13 @@ public class RecordLoader implements Loader { private final Class saveableClass; + private final String container; + private final Boolean noLinkCheck; - public RecordLoader(final Class saveableClass) { + public RecordLoader(final Class saveableClass, final String container, final Boolean noLinkCheck) { this.saveableClass = saveableClass; + this.container = container; + this.noLinkCheck = noLinkCheck; } public T load( @@ -20,7 +24,18 @@ public T load( final Constructor constructor = this.saveableClass.getConstructor( new Class[] {Object.class, String.class, LoadingOptions.class, String.class}); - final T ret = constructor.newInstance(doc, baseUri, loadingOptions, docRoot); + LoadingOptions innerLoadingOptions = loadingOptions; + if (this.container != null || this.noLinkCheck != null) { + LoadingOptionsBuilder builder = new LoadingOptionsBuilder().copiedFrom(loadingOptions); + if (this.container != null) { + builder.setContainer(this.container); + } + if (this.noLinkCheck != null) { + builder.setNoLinkCheck(this.noLinkCheck); + } + innerLoadingOptions = builder.build(); + } + final T ret = constructor.newInstance(doc, baseUri, innerLoadingOptions, docRoot); return ret; } catch (InvocationTargetException e) { final Throwable cause = e.getCause(); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java index 1761c6a..b9d4f80 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java @@ -5,16 +5,24 @@ import java.util.List; public class UnionLoader implements Loader { - private final List alternates; + private final ArrayList alternates; public UnionLoader(List alternates) { - this.alternates = alternates; + this.alternates = new ArrayList(alternates); } public UnionLoader(Loader[] alternates) { this(Arrays.asList(alternates)); } + public void addLoaders(List loaders) { + this.alternates.addAll(loaders); + } + + public void addLoaders(Loader[] loaders) { + this.addLoaders(Arrays.asList(loaders)); + } + public Object load( final Object doc, final String baseUri, diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java index be6efe8..9630057 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java @@ -8,16 +8,19 @@ public class UriLoader implements Loader { private final boolean scopedId; private final boolean vocabTerm; private final Integer scopedRef; + private final Boolean noLinkCheck; public UriLoader( final Loader innerLoader, final boolean scopedId, final boolean vocabTerm, - final Integer scopedRef) { + final Integer scopedRef, + final Boolean noLinkCheck) { this.innerLoader = innerLoader; this.scopedId = scopedId; this.vocabTerm = vocabTerm; this.scopedRef = scopedRef; + this.noLinkCheck = noLinkCheck; } private Object expandUrl( @@ -35,18 +38,22 @@ public T load( final String baseUri, final LoadingOptions loadingOptions, final String docRoot) { + LoadingOptions innerLoadingOptions = loadingOptions; + if (this.noLinkCheck != null) { + innerLoadingOptions = new LoadingOptionsBuilder().copiedFrom(loadingOptions).setNoLinkCheck(this.noLinkCheck).build(); + } Object doc = doc_; if (doc instanceof List) { List docList = (List) doc; List docWithExpansion = new ArrayList(); for (final Object el : docList) { - docWithExpansion.add(this.expandUrl(el, baseUri, loadingOptions)); + docWithExpansion.add(this.expandUrl(el, baseUri, innerLoadingOptions)); } doc = docWithExpansion; } if (doc instanceof String) { - doc = this.expandUrl(doc, baseUri, loadingOptions); + doc = this.expandUrl(doc, baseUri, innerLoadingOptions); } - return this.innerLoader.load(doc, baseUri, loadingOptions); + return this.innerLoader.load(doc, baseUri, innerLoadingOptions); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java index 4d276fb..3886b2e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java @@ -86,7 +86,7 @@ public ArraySchemaImpl( try { items = LoaderInstances - .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2_None + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None .loadField(__doc.get("items"), __baseUri, __loadingOptions); } catch (ValidationException e) { items = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java new file mode 100644 index 0000000..9da2378 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLArraySchema
This interface is implemented by {@link CWLArraySchemaImpl}
+ */ +public interface CWLArraySchema extends ArraySchema, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#items
+ *
+ * Defines the type of the array elements. *
+ */ + + Object getItems(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `array` *
+ */ + + Array_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java new file mode 100644 index 0000000..6937355 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.LoaderInstances; +import org.w3id.cwl.cwl1_2.utils.LoadingOptions; +import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_2.utils.SaveableImpl; +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLArraySchema
+ */ +public class CWLArraySchemaImpl extends SaveableImpl implements CWLArraySchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Object items; + + /** + * Getter for property https://w3id.org/cwl/salad#items
+ *
+ * Defines the type of the array elements. *
+ */ + + public Object getItems() { + return this.items; + } + + private Array_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `array` *
+ */ + + public Array_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLArraySchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLArraySchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLArraySchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Object items; + try { + items = + LoaderInstances + .uri_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("items"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + items = null; // won't be used but prevents compiler from complaining. + final String __message = "the `items` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Array_name type; + try { + type = + LoaderInstances + .typedsl_Array_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.items = (Object) items; + this.type = (Array_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java new file mode 100644 index 0000000..bd5eb89 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java @@ -0,0 +1,46 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordField
This interface is implemented by {@link CWLRecordFieldImpl}
+ */ +public interface CWLRecordField extends RecordField, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#RecordField/name
+ *
+ * The name of the field + * *
+ */ + + String getName(); + /** + * Getter for property https://w3id.org/cwl/salad#Documented/doc
+ *
+ * A documentation string for this object, or an array of strings which should be concatenated. *
+ */ + + Object getDoc(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * The field type + * *
+ */ + + Object getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java new file mode 100644 index 0000000..76a2999 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java @@ -0,0 +1,160 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.LoaderInstances; +import org.w3id.cwl.cwl1_2.utils.LoadingOptions; +import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_2.utils.SaveableImpl; +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordField
+ */ +public class CWLRecordFieldImpl extends SaveableImpl implements CWLRecordField { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private String name; + + /** + * Getter for property https://w3id.org/cwl/salad#RecordField/name
+ *
+ * The name of the field + * *
+ */ + + public String getName() { + return this.name; + } + + private Object doc; + + /** + * Getter for property https://w3id.org/cwl/salad#Documented/doc
+ *
+ * A documentation string for this object, or an array of strings which should be concatenated. *
+ */ + + public Object getDoc() { + return this.doc; + } + + private Object type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * The field type + * *
+ */ + + public Object getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLRecordFieldImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLRecordFieldImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLRecordFieldImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + String name; + + if (__doc.containsKey("name")) { + try { + name = + LoaderInstances + .uri_StringInstance_True_False_None_None + .loadField(__doc.get("name"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + name = null; // won't be used but prevents compiler from complaining. + final String __message = "the `name` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + name = null; + } + + if (name == null) { + if (__docRoot != null) { + name = __docRoot; + } else { + throw new ValidationException("Missing name"); + } + } + __baseUri = (String) name; + Object doc; + + if (__doc.containsKey("doc")) { + try { + doc = + LoaderInstances + .union_of_NullInstance_or_StringInstance_or_array_of_StringInstance + .loadField(__doc.get("doc"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + doc = null; // won't be used but prevents compiler from complaining. + final String __message = "the `doc` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + doc = null; + } + Object type; + try { + type = + LoaderInstances + .typedsl_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.doc = (Object) doc; + this.name = (String) name; + this.type = (Object) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java new file mode 100644 index 0000000..6bc1936 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordSchema
This interface is implemented by {@link CWLRecordSchemaImpl}
+ */ +public interface CWLRecordSchema extends RecordSchema, Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#fields
+ *
+ * Defines the fields of the record. *
+ */ + + java.util.Optional> getFields(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `record` *
+ */ + + Record_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java new file mode 100644 index 0000000..7d1dbc2 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java @@ -0,0 +1,119 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.LoaderInstances; +import org.w3id.cwl.cwl1_2.utils.LoadingOptions; +import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_2.utils.SaveableImpl; +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordSchema
+ */ +public class CWLRecordSchemaImpl extends SaveableImpl implements CWLRecordSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private java.util.Optional> fields; + + /** + * Getter for property https://w3id.org/cwl/salad#fields
+ *
+ * Defines the fields of the record. *
+ */ + + public java.util.Optional> getFields() { + return this.fields; + } + + private Record_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `record` *
+ */ + + public Record_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public CWLRecordSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("CWLRecordSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + java.util.Optional> fields; + + if (__doc.containsKey("fields")) { + try { + fields = + LoaderInstances + .idmap_fields_optional_array_of_CWLRecordField + .loadField(__doc.get("fields"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + fields = null; // won't be used but prevents compiler from complaining. + final String __message = "the `fields` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + + } else { + fields = null; + } + Record_name type; + try { + type = + LoaderInstances + .typedsl_Record_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.fields = (java.util.Optional>) fields; + this.type = (Record_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java index 20b2531..8c5117a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java @@ -158,7 +158,7 @@ public interface CommandInputParameter extends InputParameter, Saveable { * * */ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java index 226eb25..75c2a78 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java @@ -196,7 +196,7 @@ public java.util.Optional getLoadListing() { return this.loadListing; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -208,7 +208,7 @@ public java.util.Optional getLoadListing() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -374,7 +374,7 @@ public CommandInputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -419,13 +419,13 @@ public CommandInputParameterImpl( } else { loadListing = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -475,7 +475,7 @@ public CommandInputParameterImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java index 2038cac..621c435 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java @@ -362,7 +362,7 @@ public CommandInputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java index e92bc9b..6a43384 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java @@ -312,7 +312,7 @@ public CommandOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java index b7739e1..e2a02e9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java @@ -320,7 +320,7 @@ public CommandOutputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java index 27b04e7..2c18c5a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java @@ -301,7 +301,7 @@ public ExpressionToolOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java index a38653b..b9079c2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java @@ -549,7 +549,7 @@ public FileImpl( try { format = LoaderInstances - .uri_optional_StringInstance_True_False_None_None + .uri_optional_StringInstance_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java index ef2a55d..f18c972 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputArraySchema
This interface is implemented by {@link InputArraySchemaImpl}
*/ -public interface InputArraySchema extends ArraySchema, InputSchema, Saveable { +public interface InputArraySchema extends CWLArraySchema, InputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java index 42f3b28..f0a737c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java @@ -150,5 +150,5 @@ public interface InputParameter extends Parameter, InputFormat, LoadContents, Sa * *
*/ - Object getDefault(); + java.util.Optional getDefault(); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java index 9cc9aa5..23fcfef 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordField
This interface is implemented by {@link InputRecordFieldImpl}
*/ -public interface InputRecordField extends RecordField, FieldBase, InputFormat, LoadContents, Saveable { +public interface InputRecordField extends CWLRecordField, FieldBase, InputFormat, LoadContents, Saveable { /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java index 546ba92..1a7e7f2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java @@ -350,7 +350,7 @@ public InputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java index e07c447..815d6b6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordSchema
This interface is implemented by {@link InputRecordSchemaImpl}
*/ -public interface InputRecordSchema extends RecordSchema, InputSchema, Saveable { +public interface InputRecordSchema extends CWLRecordSchema, InputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java new file mode 100644 index 0000000..2d6bbbb --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/salad#MapSchema
This interface is implemented by {@link MapSchemaImpl}
+ */ +public interface MapSchema extends Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `map` *
+ */ + + Map_name getType(); + /** + * Getter for property https://w3id.org/cwl/salad#values
+ *
+ * Defines the type of the map elements. *
+ */ + + Object getValues(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java new file mode 100644 index 0000000..0c8c12b --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.LoaderInstances; +import org.w3id.cwl.cwl1_2.utils.LoadingOptions; +import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_2.utils.SaveableImpl; +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/salad#MapSchema
+ */ +public class MapSchemaImpl extends SaveableImpl implements MapSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Map_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `map` *
+ */ + + public Map_name getType() { + return this.type; + } + + private Object values; + + /** + * Getter for property https://w3id.org/cwl/salad#values
+ *
+ * Defines the type of the map elements. *
+ */ + + public Object getValues() { + return this.values; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of MapSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public MapSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("MapSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Map_name type; + try { + type = + LoaderInstances + .typedsl_Map_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Object values; + try { + values = + LoaderInstances + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("values"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + values = null; // won't be used but prevents compiler from complaining. + final String __message = "the `values` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.type = (Map_name) type; + this.values = (Object) values; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Map_name.java b/src/main/java/org/w3id/cwl/cwl1_2/Map_name.java new file mode 100644 index 0000000..7672c11 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/Map_name.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +public enum Map_name { + MAP("map"); + + private static String[] symbols = new String[] {"map"}; + private String docVal; + + private Map_name(final String docVal) { + this.docVal = docVal; + } + + public static Map_name fromDocumentVal(final String docVal) { + for(final Map_name val : Map_name.values()) { + if(val.docVal.equals(docVal)) { + return val; + } + } + throw new ValidationException(String.format("Expected one of %s", Map_name.symbols, docVal)); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java index bcbd504..42ed252 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java @@ -159,7 +159,7 @@ public interface OperationInputParameter extends InputParameter, Saveable { * *
*/ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java index 1543288..7b86d54 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java @@ -197,7 +197,7 @@ public java.util.Optional getLoadListing() { return this.loadListing; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -209,7 +209,7 @@ public java.util.Optional getLoadListing() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -361,7 +361,7 @@ public OperationInputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -406,13 +406,13 @@ public OperationInputParameterImpl( } else { loadListing = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -445,7 +445,7 @@ public OperationInputParameterImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.type = (Object) type; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java index 2cb50b0..9ada43f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java @@ -301,7 +301,7 @@ public OperationOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java index 32a3f19..1370e74 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputArraySchema
This interface is implemented by {@link OutputArraySchemaImpl}
*/ -public interface OutputArraySchema extends ArraySchema, OutputSchema, Saveable { +public interface OutputArraySchema extends CWLArraySchema, OutputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java index 32f825d..30250e7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordField
This interface is implemented by {@link OutputRecordFieldImpl}
*/ -public interface OutputRecordField extends RecordField, FieldBase, OutputFormat, Saveable { +public interface OutputRecordField extends CWLRecordField, FieldBase, OutputFormat, Saveable { /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java index 3d2d91e..729db07 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java @@ -306,7 +306,7 @@ public OutputRecordFieldImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java index f249db8..b20c624 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java @@ -19,7 +19,7 @@ /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordSchema
This interface is implemented by {@link OutputRecordSchemaImpl}
*/ -public interface OutputRecordSchema extends RecordSchema, OutputSchema, Saveable { +public interface OutputRecordSchema extends CWLRecordSchema, OutputSchema, Saveable { /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java b/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java index 4b23b65..9dcbac9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java @@ -39,7 +39,9 @@ public interface RecordField extends Documented, Saveable { /** * Getter for property https://w3id.org/cwl/salad#type
*
- * The field type + * The field type. If it is an array, it indicates + * that the field type is a union type of its elements. + * Its elements may be duplicated. * *
*/ diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java index 3e027fc..bae2a5c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java @@ -59,7 +59,9 @@ public Object getDoc() { /** * Getter for property https://w3id.org/cwl/salad#type
*
- * The field type + * The field type. If it is an array, it indicates + * that the field type is a union type of its elements. + * Its elements may be duplicated. * *
*/ @@ -144,7 +146,7 @@ public RecordFieldImpl( try { type = LoaderInstances - .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2 + .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_2 .loadField(__doc.get("type"), __baseUri, __loadingOptions); } catch (ValidationException e) { type = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java new file mode 100644 index 0000000..4201126 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.Saveable; + +/** +* Auto-generated interface for https://w3id.org/cwl/salad#UnionSchema
This interface is implemented by {@link UnionSchemaImpl}
+ */ +public interface UnionSchema extends Saveable { + /** + * Getter for property https://w3id.org/cwl/salad#names
+ *
+ * Defines the type of the union elements. *
+ */ + + Object getNames(); + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `union` *
+ */ + + Union_name getType(); +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java new file mode 100644 index 0000000..ee1fd04 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java @@ -0,0 +1,113 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.LoaderInstances; +import org.w3id.cwl.cwl1_2.utils.LoadingOptions; +import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; +import org.w3id.cwl.cwl1_2.utils.SaveableImpl; +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +/** +* Auto-generated class implementation for https://w3id.org/cwl/salad#UnionSchema
+ */ +public class UnionSchemaImpl extends SaveableImpl implements UnionSchema { + private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); + private java.util.Map extensionFields_ = + new java.util.HashMap(); + + private Object names; + + /** + * Getter for property https://w3id.org/cwl/salad#names
+ *
+ * Defines the type of the union elements. *
+ */ + + public Object getNames() { + return this.names; + } + + private Union_name type; + + /** + * Getter for property https://w3id.org/cwl/salad#type
+ *
+ * Must be `union` *
+ */ + + public Union_name getType() { + return this.type; + } + + /** + * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of UnionSchemaImpl. + * + * @param __doc_ Document fragment to load this record object from (presumably a + {@link java.util.Map}). + * @param __baseUri_ Base URI to generate child document IDs against. + * @param __loadingOptions Context for loading URIs and populating objects. + * @param __docRoot_ ID at this position in the document (if available) (maybe?) + * @throws ValidationException If the document fragment is not a {@link java.util.Map} + * or validation of fields fails. + */ + public UnionSchemaImpl( + final Object __doc_, + final String __baseUri_, + LoadingOptions __loadingOptions, + final String __docRoot_) { + super(__doc_, __baseUri_, __loadingOptions, __docRoot_); + // Prefix plumbing variables with '__' to reduce likelihood of collision with + // generated names. + String __baseUri = __baseUri_; + String __docRoot = __docRoot_; + if (!(__doc_ instanceof java.util.Map)) { + throw new ValidationException("UnionSchemaImpl called on non-map"); + } + final java.util.Map __doc = (java.util.Map) __doc_; + final java.util.List __errors = + new java.util.ArrayList(); + if (__loadingOptions != null) { + this.loadingOptions_ = __loadingOptions; + } + Object names; + try { + names = + LoaderInstances + .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None + .loadField(__doc.get("names"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + names = null; // won't be used but prevents compiler from complaining. + final String __message = "the `names` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + Union_name type; + try { + type = + LoaderInstances + .typedsl_Union_name_2 + .loadField(__doc.get("type"), __baseUri, __loadingOptions); + } catch (ValidationException e) { + type = null; // won't be used but prevents compiler from complaining. + final String __message = "the `type` field is not valid because:"; + __errors.add(new ValidationException(__message, e)); + } + if (!__errors.isEmpty()) { + throw new ValidationException("Trying 'RecordField'", __errors); + } + this.names = (Object) names; + this.type = (Union_name) type; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Union_name.java b/src/main/java/org/w3id/cwl/cwl1_2/Union_name.java new file mode 100644 index 0000000..e64be46 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/Union_name.java @@ -0,0 +1,37 @@ +// Copyright Common Workflow Language project contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.w3id.cwl.cwl1_2; + +import org.w3id.cwl.cwl1_2.utils.ValidationException; + +public enum Union_name { + UNION("union"); + + private static String[] symbols = new String[] {"union"}; + private String docVal; + + private Union_name(final String docVal) { + this.docVal = docVal; + } + + public static Union_name fromDocumentVal(final String docVal) { + for(final Union_name val : Union_name.values()) { + if(val.docVal.equals(docVal)) { + return val; + } + } + throw new ValidationException(String.format("Expected one of %s", Union_name.symbols, docVal)); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java index 66700d3..2683dcb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java @@ -157,7 +157,7 @@ public interface WorkflowInputParameter extends InputParameter, Saveable { * *
*/ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java index d9d011d..f5b6ecb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java @@ -195,7 +195,7 @@ public java.util.Optional getLoadListing() { return this.loadListing; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -207,7 +207,7 @@ public java.util.Optional getLoadListing() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -373,7 +373,7 @@ public WorkflowInputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -418,13 +418,13 @@ public WorkflowInputParameterImpl( } else { loadListing = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -474,7 +474,7 @@ public WorkflowInputParameterImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java index 4bd6024..0670f73 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java @@ -351,7 +351,7 @@ public WorkflowOutputParameterImpl( try { format = LoaderInstances - .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None + .uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java index 9c99f22..ee18289 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java @@ -210,7 +210,7 @@ public interface WorkflowStepInput extends Identified, Sink, LoadContents, Label * * */ - Object getDefault(); + java.util.Optional getDefault(); /** * Getter for property https://w3id.org/cwl/cwl#WorkflowStepInput/valueFrom
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java index 8c5e722..bce2038 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java @@ -244,7 +244,7 @@ public java.util.Optional getLabel() { return this.label; } - private Object default_; + private java.util.Optional default_; /** * Getter for property https://w3id.org/cwl/salad#default
@@ -255,7 +255,7 @@ public java.util.Optional getLabel() { * * */ - public Object getDefault() { + public java.util.Optional getDefault() { return this.default_; } @@ -456,13 +456,13 @@ public WorkflowStepInputImpl( } else { label = null; } - Object default_; + java.util.Optional default_; if (__doc.containsKey("default")) { try { default_ = LoaderInstances - .union_of_NullInstance_or_File_or_Directory_or_AnyInstance + .optional_CWLObjectType .loadField(__doc.get("default"), __baseUri, __loadingOptions); } catch (ValidationException e) { default_ = null; // won't be used but prevents compiler from complaining. @@ -500,7 +500,7 @@ public WorkflowStepInputImpl( this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; this.label = (java.util.Optional) label; - this.default_ = (Object) default_; + this.default_ = (java.util.Optional) default_; this.valueFrom = (Object) valueFrom; } } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java index da53ad1..62637fd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java @@ -25,7 +25,8 @@ public List load( for (final Object el : docList) { try { final Object loadedField = unionLoader.loadField(el, baseUri, loadingOptions); - if (loadedField instanceof List) { + final boolean flatten = !"@list".equals(loadingOptions.container); + if (flatten && loadedField instanceof List) { r.addAll((List) loadedField); } else { r.add((T) loadedField); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java index bc57ffc..a917680 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java @@ -10,6 +10,11 @@ public class ConstantMaps { static { vocab.put("Any", "https://w3id.org/cwl/salad#Any"); vocab.put("ArraySchema", "https://w3id.org/cwl/salad#ArraySchema"); + vocab.put("CWLArraySchema", "https://w3id.org/cwl/cwl#CWLArraySchema"); + vocab.put("CWLInputFile", "https://w3id.org/cwl/cwl#CWLInputFile"); + vocab.put("CWLObjectType", "https://w3id.org/cwl/cwl#CWLObjectType"); + vocab.put("CWLRecordField", "https://w3id.org/cwl/cwl#CWLRecordField"); + vocab.put("CWLRecordSchema", "https://w3id.org/cwl/cwl#CWLRecordSchema"); vocab.put("CWLType", "https://w3id.org/cwl/cwl#CWLType"); vocab.put("CWLVersion", "https://w3id.org/cwl/cwl#CWLVersion"); vocab.put("CommandInputArraySchema", "https://w3id.org/cwl/cwl#CommandInputArraySchema"); @@ -58,6 +63,7 @@ public class ConstantMaps { vocab.put("LoadContents", "https://w3id.org/cwl/cwl#LoadContents"); vocab.put("LoadListingEnum", "https://w3id.org/cwl/cwl#LoadListingEnum"); vocab.put("LoadListingRequirement", "LoadListingRequirement"); + vocab.put("MapSchema", "https://w3id.org/cwl/salad#MapSchema"); vocab.put("MultipleInputFeatureRequirement", "MultipleInputFeatureRequirement"); vocab.put("NetworkAccess", "NetworkAccess"); vocab.put("Operation", "Operation"); @@ -89,6 +95,7 @@ public class ConstantMaps { vocab.put("StepInputExpressionRequirement", "StepInputExpressionRequirement"); vocab.put("SubworkflowFeatureRequirement", "SubworkflowFeatureRequirement"); vocab.put("ToolTimeLimit", "ToolTimeLimit"); + vocab.put("UnionSchema", "https://w3id.org/cwl/salad#UnionSchema"); vocab.put("WorkReuse", "WorkReuse"); vocab.put("Workflow", "Workflow"); vocab.put("WorkflowInputParameter", "https://w3id.org/cwl/cwl#WorkflowInputParameter"); @@ -118,6 +125,7 @@ public class ConstantMaps { vocab.put("float", "http://www.w3.org/2001/XMLSchema#float"); vocab.put("int", "http://www.w3.org/2001/XMLSchema#int"); vocab.put("long", "http://www.w3.org/2001/XMLSchema#long"); + vocab.put("map", "map"); vocab.put("merge_flattened", "https://w3id.org/cwl/cwl#LinkMergeMethod/merge_flattened"); vocab.put("merge_nested", "https://w3id.org/cwl/cwl#LinkMergeMethod/merge_nested"); vocab.put("nested_crossproduct", "https://w3id.org/cwl/cwl#ScatterMethod/nested_crossproduct"); @@ -130,6 +138,7 @@ public class ConstantMaps { vocab.put("stdout", "https://w3id.org/cwl/cwl#stdout"); vocab.put("string", "http://www.w3.org/2001/XMLSchema#string"); vocab.put("the_only_non_null", "https://w3id.org/cwl/cwl#PickValueMethod/the_only_non_null"); + vocab.put("union", "union"); vocab.put("v1.0", "https://w3id.org/cwl/cwl#v1.0"); vocab.put("v1.0.dev4", "https://w3id.org/cwl/cwl#v1.0.dev4"); vocab.put("v1.1", "https://w3id.org/cwl/cwl#v1.1"); @@ -144,6 +153,11 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/salad#Any", "Any"); rvocab.put("https://w3id.org/cwl/salad#ArraySchema", "ArraySchema"); + rvocab.put("https://w3id.org/cwl/cwl#CWLArraySchema", "CWLArraySchema"); + rvocab.put("https://w3id.org/cwl/cwl#CWLInputFile", "CWLInputFile"); + rvocab.put("https://w3id.org/cwl/cwl#CWLObjectType", "CWLObjectType"); + rvocab.put("https://w3id.org/cwl/cwl#CWLRecordField", "CWLRecordField"); + rvocab.put("https://w3id.org/cwl/cwl#CWLRecordSchema", "CWLRecordSchema"); rvocab.put("https://w3id.org/cwl/cwl#CWLType", "CWLType"); rvocab.put("https://w3id.org/cwl/cwl#CWLVersion", "CWLVersion"); rvocab.put("https://w3id.org/cwl/cwl#CommandInputArraySchema", "CommandInputArraySchema"); @@ -192,6 +206,7 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/cwl#LoadContents", "LoadContents"); rvocab.put("https://w3id.org/cwl/cwl#LoadListingEnum", "LoadListingEnum"); rvocab.put("LoadListingRequirement", "LoadListingRequirement"); + rvocab.put("https://w3id.org/cwl/salad#MapSchema", "MapSchema"); rvocab.put("MultipleInputFeatureRequirement", "MultipleInputFeatureRequirement"); rvocab.put("NetworkAccess", "NetworkAccess"); rvocab.put("Operation", "Operation"); @@ -223,6 +238,7 @@ public class ConstantMaps { rvocab.put("StepInputExpressionRequirement", "StepInputExpressionRequirement"); rvocab.put("SubworkflowFeatureRequirement", "SubworkflowFeatureRequirement"); rvocab.put("ToolTimeLimit", "ToolTimeLimit"); + rvocab.put("https://w3id.org/cwl/salad#UnionSchema", "UnionSchema"); rvocab.put("WorkReuse", "WorkReuse"); rvocab.put("Workflow", "Workflow"); rvocab.put("https://w3id.org/cwl/cwl#WorkflowInputParameter", "WorkflowInputParameter"); @@ -252,6 +268,7 @@ public class ConstantMaps { rvocab.put("http://www.w3.org/2001/XMLSchema#float", "float"); rvocab.put("http://www.w3.org/2001/XMLSchema#int", "int"); rvocab.put("http://www.w3.org/2001/XMLSchema#long", "long"); + rvocab.put("map", "map"); rvocab.put("https://w3id.org/cwl/cwl#LinkMergeMethod/merge_flattened", "merge_flattened"); rvocab.put("https://w3id.org/cwl/cwl#LinkMergeMethod/merge_nested", "merge_nested"); rvocab.put("https://w3id.org/cwl/cwl#ScatterMethod/nested_crossproduct", "nested_crossproduct"); @@ -264,6 +281,7 @@ public class ConstantMaps { rvocab.put("https://w3id.org/cwl/cwl#stdout", "stdout"); rvocab.put("http://www.w3.org/2001/XMLSchema#string", "string"); rvocab.put("https://w3id.org/cwl/cwl#PickValueMethod/the_only_non_null", "the_only_non_null"); + rvocab.put("union", "union"); rvocab.put("https://w3id.org/cwl/cwl#v1.0", "v1.0"); rvocab.put("https://w3id.org/cwl/cwl#v1.0.dev4", "v1.0.dev4"); rvocab.put("https://w3id.org/cwl/cwl#v1.1", "v1.1"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java index 6489578..de4b00e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java @@ -27,9 +27,7 @@ public T load( if (doc instanceof Map) { final Map docMap = (Map) doc; final List asList = new ArrayList(); - final TreeSet sortedKeys = new TreeSet(); - sortedKeys.addAll(docMap.keySet()); - for (final String key : sortedKeys) { + for (final String key : docMap.keySet()) { final Object el = docMap.get(key); if (el instanceof Map) { final Map v2 = new HashMap((Map) el); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java index d1e9a7b..b66719b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java @@ -11,103 +11,116 @@ public class LoaderInstances { public static Loader BooleanInstance = new PrimitiveLoader(Boolean.class); public static Loader NullInstance = new NullLoader(); public static Loader AnyInstance = new AnyLoader(); - public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_2.Documented.class); + public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_2.Documented.class, null, null); public static Loader PrimitiveType = new EnumLoader(PrimitiveType.class); public static Loader Any = new EnumLoader(Any.class); - public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_2.RecordFieldImpl.class); - public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.RecordSchemaImpl.class); - public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.EnumSchemaImpl.class); - public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.ArraySchemaImpl.class); - public static Loader CWLVersion = new EnumLoader(CWLVersion.class); + public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_2.RecordFieldImpl.class, null, null); + public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.RecordSchemaImpl.class, null, null); + public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.EnumSchemaImpl.class, null, null); + public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.ArraySchemaImpl.class, null, null); + public static Loader MapSchema = new RecordLoader(org.w3id.cwl.cwl1_2.MapSchemaImpl.class, null, null); + public static Loader UnionSchema = new RecordLoader(org.w3id.cwl.cwl1_2.UnionSchemaImpl.class, null, null); public static Loader CWLType = new EnumLoader(CWLType.class); - public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_2.FileImpl.class); - public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_2.DirectoryImpl.class); - public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_2.Labeled.class); - public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_2.Identified.class); + public static Loader CWLArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CWLArraySchemaImpl.class, null, null); + public static Loader CWLRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CWLRecordFieldImpl.class, null, null); + public static Loader CWLRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CWLRecordSchemaImpl.class, null, null); + public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_2.FileImpl.class, null, null); + public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_2.DirectoryImpl.class, null, null); + public static Loader CWLObjectType = new UnionLoader(new Loader[] {}); + public static Loader> optional_CWLObjectType = new OptionalLoader(CWLObjectType); + public static Loader>> array_of_optional_CWLObjectType = new ArrayLoader(optional_CWLObjectType); + public static Loader>> map_of_optional_CWLObjectType = new MapLoader(optional_CWLObjectType, null, null); + public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InlineJavascriptRequirementImpl.class, null, null); + public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SchemaDefRequirementImpl.class, null, null); + public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.LoadListingRequirementImpl.class, null, null); + public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.DockerRequirementImpl.class, null, null); + public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwareRequirementImpl.class, null, null); + public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InitialWorkDirRequirementImpl.class, null, null); + public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.EnvVarRequirementImpl.class, null, null); + public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ShellCommandRequirementImpl.class, null, null); + public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ResourceRequirementImpl.class, null, null); + public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_2.WorkReuseImpl.class, null, null); + public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_2.NetworkAccessImpl.class, null, null); + public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InplaceUpdateRequirementImpl.class, null, null); + public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_2.ToolTimeLimitImpl.class, null, null); + public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SubworkflowFeatureRequirementImpl.class, null, null); + public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ScatterFeatureRequirementImpl.class, null, null); + public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.MultipleInputFeatureRequirementImpl.class, null, null); + public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.StepInputExpressionRequirementImpl.class, null, null); + public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); + public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); + public static Loader union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new UnionLoader(new Loader[] { NullInstance, array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, CWLObjectType }); + public static Loader> map_of_union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new MapLoader(union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType, "@list", true); + public static Loader CWLVersion = new EnumLoader(CWLVersion.class); + public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_2.Labeled.class, null, null); + public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_2.Identified.class, null, null); public static Loader LoadListingEnum = new EnumLoader(LoadListingEnum.class); - public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_2.LoadContents.class); - public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_2.FieldBase.class); - public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.InputFormat.class); - public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.OutputFormat.class); - public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_2.Parameter.class); + public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_2.LoadContents.class, null, null); + public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_2.FieldBase.class, null, null); + public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.InputFormat.class, null, null); + public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.OutputFormat.class, null, null); + public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_2.Parameter.class, null, null); public static Loader Expression = new EnumLoader(Expression.class); - public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.InputBindingImpl.class); - public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_2.IOSchema.class); - public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputSchema.class); - public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputSchema.class); - public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordFieldImpl.class); - public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordSchemaImpl.class); - public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputEnumSchemaImpl.class); - public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputArraySchemaImpl.class); - public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordFieldImpl.class); - public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordSchemaImpl.class); - public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputEnumSchemaImpl.class); - public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputArraySchemaImpl.class); - public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.InputParameter.class); - public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OutputParameter.class); - public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ProcessRequirement.class); - public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_2.Process.class); - public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InlineJavascriptRequirementImpl.class); - public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputSchema.class); - public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SchemaDefRequirementImpl.class); - public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_2.SecondaryFileSchemaImpl.class); - public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.LoadListingRequirementImpl.class); - public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_2.EnvironmentDefImpl.class); - public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindingImpl.class); - public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputBindingImpl.class); - public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindableImpl.class); - public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordFieldImpl.class); - public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordSchemaImpl.class); - public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputEnumSchemaImpl.class); - public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputArraySchemaImpl.class); - public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordFieldImpl.class); - public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordSchemaImpl.class); - public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputEnumSchemaImpl.class); - public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputArraySchemaImpl.class); - public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputParameterImpl.class); - public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputParameterImpl.class); + public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.InputBindingImpl.class, null, null); + public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_2.IOSchema.class, null, null); + public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputSchema.class, null, null); + public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputSchema.class, null, null); + public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordFieldImpl.class, null, null); + public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordSchemaImpl.class, null, null); + public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputEnumSchemaImpl.class, null, null); + public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputArraySchemaImpl.class, null, null); + public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordFieldImpl.class, null, null); + public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordSchemaImpl.class, null, null); + public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputEnumSchemaImpl.class, null, null); + public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputArraySchemaImpl.class, null, null); + public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.InputParameter.class, null, null); + public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OutputParameter.class, null, null); + public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ProcessRequirement.class, null, null); + public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_2.Process.class, null, null); + public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputSchema.class, null, null); + public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_2.SecondaryFileSchemaImpl.class, null, null); + public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_2.EnvironmentDefImpl.class, null, null); + public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindingImpl.class, null, null); + public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputBindingImpl.class, null, null); + public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindableImpl.class, null, null); + public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordFieldImpl.class, null, null); + public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordSchemaImpl.class, null, null); + public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputEnumSchemaImpl.class, null, null); + public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputArraySchemaImpl.class, null, null); + public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordFieldImpl.class, null, null); + public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordSchemaImpl.class, null, null); + public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputEnumSchemaImpl.class, null, null); + public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputArraySchemaImpl.class, null, null); + public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputParameterImpl.class, null, null); + public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputParameterImpl.class, null, null); public static Loader stdin = new EnumLoader(stdin.class); public static Loader stdout = new EnumLoader(stdout.class); public static Loader stderr = new EnumLoader(stderr.class); - public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineToolImpl.class); - public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.DockerRequirementImpl.class); - public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwareRequirementImpl.class); - public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwarePackageImpl.class); - public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_2.DirentImpl.class); - public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InitialWorkDirRequirementImpl.class); - public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.EnvVarRequirementImpl.class); - public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ShellCommandRequirementImpl.class); - public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ResourceRequirementImpl.class); - public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_2.WorkReuseImpl.class); - public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_2.NetworkAccessImpl.class); - public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InplaceUpdateRequirementImpl.class); - public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_2.ToolTimeLimitImpl.class); - public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolOutputParameterImpl.class); - public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowInputParameterImpl.class); - public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolImpl.class); + public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineToolImpl.class, null, null); + public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwarePackageImpl.class, null, null); + public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_2.DirentImpl.class, null, null); + public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolOutputParameterImpl.class, null, null); + public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowInputParameterImpl.class, null, null); + public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolImpl.class, null, null); public static Loader LinkMergeMethod = new EnumLoader(LinkMergeMethod.class); public static Loader PickValueMethod = new EnumLoader(PickValueMethod.class); - public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowOutputParameterImpl.class); - public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_2.Sink.class); - public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepInputImpl.class); - public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepOutputImpl.class); + public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowOutputParameterImpl.class, null, null); + public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_2.Sink.class, null, null); + public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepInputImpl.class, null, null); + public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepOutputImpl.class, null, null); public static Loader ScatterMethod = new EnumLoader(ScatterMethod.class); - public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepImpl.class); - public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowImpl.class); - public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SubworkflowFeatureRequirementImpl.class); - public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ScatterFeatureRequirementImpl.class); - public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.MultipleInputFeatureRequirementImpl.class); - public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.StepInputExpressionRequirementImpl.class); - public static Loader OperationInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationInputParameterImpl.class); - public static Loader OperationOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationOutputParameterImpl.class); - public static Loader Operation = new RecordLoader(org.w3id.cwl.cwl1_2.OperationImpl.class); + public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepImpl.class, null, null); + public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowImpl.class, null, null); + public static Loader OperationInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationInputParameterImpl.class, null, null); + public static Loader OperationOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationOutputParameterImpl.class, null, null); + public static Loader Operation = new RecordLoader(org.w3id.cwl.cwl1_2.OperationImpl.class, null, null); public static Loader> array_of_StringInstance = new ArrayLoader(StringInstance); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance }); public static Loader uri_StringInstance_True_False_None_None = new UriLoader(StringInstance, true, false, null, null); - public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, StringInstance }); - public static Loader> array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance); - public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, StringInstance, array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance }); - public static Loader typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance, 2); + public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, MapSchema, UnionSchema, StringInstance }); + public static Loader> array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance); + public static Loader union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, RecordSchema, EnumSchema, ArraySchema, MapSchema, UnionSchema, StringInstance, array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance }); + public static Loader typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance, 2); public static Loader> array_of_RecordField = new ArrayLoader(RecordField); public static Loader>> optional_array_of_RecordField = new OptionalLoader(array_of_RecordField); public static Loader>> idmap_fields_optional_array_of_RecordField = new IdMapLoader(optional_array_of_RecordField, "name", "type"); @@ -118,9 +131,21 @@ public class LoaderInstances { public static Loader> uri_array_of_StringInstance_True_False_None_None = new UriLoader(array_of_StringInstance, true, false, null, null); public static Loader Enum_name = new EnumLoader(Enum_name.class); public static Loader typedsl_Enum_name_2 = new TypeDslLoader(Enum_name, 2); - public static Loader uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance, false, true, 2, null); + public static Loader uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_MapSchema_or_UnionSchema_or_StringInstance, false, true, 2, null); public static Loader Array_name = new EnumLoader(Array_name.class); public static Loader typedsl_Array_name_2 = new TypeDslLoader(Array_name, 2); + public static Loader Map_name = new EnumLoader(Map_name.class); + public static Loader typedsl_Map_name_2 = new TypeDslLoader(Map_name, 2); + public static Loader Union_name = new EnumLoader(Union_name.class); + public static Loader typedsl_Union_name_2 = new TypeDslLoader(Union_name, 2); + public static Loader union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, CWLRecordSchema, EnumSchema, CWLArraySchema, StringInstance }); + public static Loader> array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new ArrayLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance); + public static Loader union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance = new UnionLoader(new Loader[] { PrimitiveType, CWLRecordSchema, EnumSchema, CWLArraySchema, StringInstance, array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance }); + public static Loader uri_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance, false, true, 2, null); + public static Loader typedsl_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_CWLRecordSchema_or_EnumSchema_or_CWLArraySchema_or_StringInstance, 2); + public static Loader> array_of_CWLRecordField = new ArrayLoader(CWLRecordField); + public static Loader>> optional_array_of_CWLRecordField = new OptionalLoader(array_of_CWLRecordField); + public static Loader>> idmap_fields_optional_array_of_CWLRecordField = new IdMapLoader(optional_array_of_CWLRecordField, "name", "type"); public static Loader File_class = new EnumLoader(File_class.class); public static Loader uri_File_class_False_True_None_None = new UriLoader(File_class, false, true, null, null); public static Loader> uri_optional_StringInstance_False_False_None_None = new UriLoader(optional_StringInstance, false, false, null, null); @@ -129,6 +154,7 @@ public class LoaderInstances { public static Loader> array_of_union_of_File_or_Directory = new ArrayLoader(union_of_File_or_Directory); public static Loader>> optional_array_of_union_of_File_or_Directory = new OptionalLoader(array_of_union_of_File_or_Directory); public static Loader>> secondaryfilesdsl_optional_array_of_union_of_File_or_Directory = new SecondaryFilesDslLoader(optional_array_of_union_of_File_or_Directory); + public static Loader> uri_optional_StringInstance_True_False_None_True = new UriLoader(optional_StringInstance, true, false, null, true); public static Loader Directory_class = new EnumLoader(Directory_class.class); public static Loader uri_Directory_class_False_True_None_None = new UriLoader(Directory_class, false, true, null, null); public static Loader> optional_BooleanInstance = new OptionalLoader(BooleanInstance); @@ -138,9 +164,9 @@ public class LoaderInstances { public static Loader secondaryfilesdsl_union_of_NullInstance_or_SecondaryFileSchema_or_array_of_SecondaryFileSchema = new SecondaryFilesDslLoader(union_of_NullInstance_or_SecondaryFileSchema_or_array_of_SecondaryFileSchema); public static Loader ExpressionLoader = new ExpressionLoader(); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance, ExpressionLoader }); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader, true, false, null, null); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader_True_False_None_True = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader, true, false, null, true); public static Loader union_of_NullInstance_or_StringInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, StringInstance, ExpressionLoader }); - public static Loader uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_ExpressionLoader, true, false, null, null); + public static Loader uri_union_of_NullInstance_or_StringInstance_or_ExpressionLoader_True_False_None_True = new UriLoader(union_of_NullInstance_or_StringInstance_or_ExpressionLoader, true, false, null, true); public static Loader union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, InputRecordSchema, InputEnumSchema, InputArraySchema, StringInstance }); public static Loader> array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance); public static Loader union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, InputRecordSchema, InputEnumSchema, InputArraySchema, StringInstance, array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance }); @@ -157,15 +183,12 @@ public class LoaderInstances { public static Loader>> optional_array_of_OutputRecordField = new OptionalLoader(array_of_OutputRecordField); public static Loader>> idmap_fields_optional_array_of_OutputRecordField = new IdMapLoader(optional_array_of_OutputRecordField, "name", "type"); public static Loader uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2_None = new UriLoader(union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance, false, true, 2, null); - public static Loader union_of_NullInstance_or_File_or_Directory_or_AnyInstance = new UnionLoader(new Loader[] { NullInstance, File, Directory, AnyInstance }); public static Loader union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter = new UnionLoader(new Loader[] { CommandInputParameter, WorkflowInputParameter, OperationInputParameter }); public static Loader> array_of_union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter = new ArrayLoader(union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter); public static Loader> idmap_inputs_array_of_union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter = new IdMapLoader(array_of_union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter, "id", "type"); public static Loader union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter_or_OperationOutputParameter = new UnionLoader(new Loader[] { CommandOutputParameter, ExpressionToolOutputParameter, WorkflowOutputParameter, OperationOutputParameter }); public static Loader> array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter_or_OperationOutputParameter = new ArrayLoader(union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter_or_OperationOutputParameter); public static Loader> idmap_outputs_array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter_or_OperationOutputParameter = new IdMapLoader(array_of_union_of_CommandOutputParameter_or_ExpressionToolOutputParameter_or_WorkflowOutputParameter_or_OperationOutputParameter, "id", "type"); - public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); - public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader>> optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new OptionalLoader(array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader>> idmap_requirements_optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new IdMapLoader(optional_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, "class", "None"); public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_AnyInstance = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement, AnyInstance }); @@ -301,4 +324,8 @@ public class LoaderInstances { public static Loader> array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation = new ArrayLoader(union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation); public static Loader union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation_or_array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation = new UnionLoader(new Loader[] { CommandLineTool, ExpressionTool, Workflow, Operation, array_of_union_of_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation }); + static { + ((UnionLoader) CWLObjectType).addLoaders(new Loader[] { BooleanInstance, IntegerInstance, LongInstance, DoubleInstance, DoubleInstance, StringInstance, File, Directory, array_of_optional_CWLObjectType, map_of_optional_CWLObjectType }); + } + } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java index 5058d8a..bc9879e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java @@ -12,6 +12,7 @@ public class LoadingOptions { Map namespaces; List schemas; Boolean noLinkCheck; + String container; Map idx; Map vocab; Map rvocab; @@ -22,12 +23,14 @@ public class LoadingOptions { final Map namespaces, final List schemas, final Boolean noLinkCheck, + final String container, final Map idx) { this.fetcher = fetcher; this.fileUri = fileUri; this.namespaces = namespaces; this.schemas = schemas; this.noLinkCheck = noLinkCheck; + this.container = container; this.idx = idx; if (namespaces != null) { diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java index 6ed5a52..53af9b7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java @@ -12,6 +12,7 @@ public class LoadingOptionsBuilder { private Optional> schemas = Optional.empty(); private Optional copyFrom = Optional.empty(); private Optional noLinkCheck = Optional.empty(); + private Optional container = Optional.empty(); public LoadingOptionsBuilder() {} @@ -40,12 +41,18 @@ public LoadingOptionsBuilder setNoLinkCheck(final Boolean noLinkCheck) { return this; } + public LoadingOptionsBuilder setContainer(final String container) { + this.container = Optional.of(container); + return this; + } + public LoadingOptions build() { Fetcher fetcher = this.fetcher.orElse(null); String fileUri = this.fileUri.orElse(null); List schemas = this.schemas.orElse(null); Map namespaces = this.namespaces.orElse(null); Boolean noLinkCheck = this.noLinkCheck.orElse(null); + String container = this.container.orElse(null); Map idx = new HashMap(); if (this.copyFrom.isPresent()) { final LoadingOptions copyFrom = this.copyFrom.get(); @@ -63,10 +70,13 @@ public LoadingOptions build() { if (noLinkCheck == null) { noLinkCheck = copyFrom.noLinkCheck; } + if (container == null) { + container = copyFrom.container; + } } if (fetcher == null) { fetcher = new DefaultFetcher(); } - return new LoadingOptions(fetcher, fileUri, namespaces, schemas, noLinkCheck, idx); + return new LoadingOptions(fetcher, fileUri, namespaces, schemas, noLinkCheck, container, idx); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java new file mode 100644 index 0000000..a284809 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java @@ -0,0 +1,51 @@ +package org.w3id.cwl.cwl1_2.utils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class MapLoader implements Loader> { + private final Loader valueLoader; + private final String container; + private final Boolean noLinkCheck; + + public MapLoader(Loader valueLoader, final String container, final Boolean noLinkCheck) { + this.valueLoader = valueLoader; + this.container = container; + this.noLinkCheck = noLinkCheck; + } + + public Map load( + final Object doc, + final String baseUri, + final LoadingOptions loadingOptions, + final String docRoot) { + final Map docMap = (Map) Loader.validateOfJavaType(Map.class, doc); + LoadingOptions innerLoadingOptions = loadingOptions; + if (this.container != null || this.noLinkCheck != null) { + LoadingOptionsBuilder builder = new LoadingOptionsBuilder().copiedFrom(loadingOptions); + if (this.container != null) { + builder.setContainer(this.container); + } + if (this.noLinkCheck != null) { + builder.setNoLinkCheck(this.noLinkCheck); + } + innerLoadingOptions = builder.build(); + } + final Map r = new HashMap(); + final List errors = new ArrayList(); + for (final Map.Entry entry : docMap.entrySet()) { + try { + final Object loadedField = this.valueLoader.loadField(entry.getValue(), baseUri, innerLoadingOptions); + r.put(entry.getKey(), (T) loadedField); + } catch (final ValidationException e) { + errors.add(e); + } + } + if (!errors.isEmpty()) { + throw new ValidationException("", errors); + } + return r; + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java new file mode 100644 index 0000000..862be31 --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java @@ -0,0 +1,48 @@ +package org.w3id.cwl.cwl1_2.utils; + +import java.util.List; +import java.util.Optional; + +public class OneOrListOf { + private Optional object; + private Optional> objects; + + private OneOrListOf(final T object, final List objects) { + this.object = Optional.ofNullable(object); + this.objects = Optional.ofNullable(objects); + } + + public static OneOrListOf oneOf(T object) { + return new OneOrListOf(object, null); + } + + public static OneOrListOf listOf(List objects) { + assert objects != null; + return new OneOrListOf(null, objects); + } + + public boolean isOne() { + return this.getOneOptional().isPresent(); + } + + public boolean isList() { + return this.getListOptional().isPresent(); + } + + public Optional getOneOptional() { + return this.object; + } + + public Optional> getListOptional() { + return this.objects; + } + + public T getOne() { + return this.getOneOptional().get(); + } + + public List getList() { + return this.getListOptional().get(); + } + +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java new file mode 100644 index 0000000..622c6ea --- /dev/null +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java @@ -0,0 +1,35 @@ +package org.w3id.cwl.cwl1_2.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + + +public class OneOrListOfLoader implements Loader> { + private final Loader oneLoader; + private final Loader> listLoader; + + public OneOrListOfLoader(Loader oneLoader, Loader> listLoader) { + this.oneLoader = oneLoader; + this.listLoader = listLoader; + } + + public OneOrListOf load( + final Object doc, + final String baseUri, + final LoadingOptions loadingOptions, + final String docRoot) { + final List errors = new ArrayList(); + try { + return OneOrListOf.oneOf(this.oneLoader.load(doc, baseUri, loadingOptions, docRoot)); + } catch (ValidationException e) { + errors.add(e); + } + try { + return OneOrListOf.listOf(this.listLoader.load(doc, baseUri, loadingOptions, docRoot)); + } catch (ValidationException e) { + errors.add(e); + } + throw new ValidationException("Failed to one or list of of type", errors); + } +} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java index 4d04c40..b40d4f5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java @@ -5,9 +5,13 @@ public class RecordLoader implements Loader { private final Class saveableClass; + private final String container; + private final Boolean noLinkCheck; - public RecordLoader(final Class saveableClass) { + public RecordLoader(final Class saveableClass, final String container, final Boolean noLinkCheck) { this.saveableClass = saveableClass; + this.container = container; + this.noLinkCheck = noLinkCheck; } public T load( @@ -20,7 +24,18 @@ public T load( final Constructor constructor = this.saveableClass.getConstructor( new Class[] {Object.class, String.class, LoadingOptions.class, String.class}); - final T ret = constructor.newInstance(doc, baseUri, loadingOptions, docRoot); + LoadingOptions innerLoadingOptions = loadingOptions; + if (this.container != null || this.noLinkCheck != null) { + LoadingOptionsBuilder builder = new LoadingOptionsBuilder().copiedFrom(loadingOptions); + if (this.container != null) { + builder.setContainer(this.container); + } + if (this.noLinkCheck != null) { + builder.setNoLinkCheck(this.noLinkCheck); + } + innerLoadingOptions = builder.build(); + } + final T ret = constructor.newInstance(doc, baseUri, innerLoadingOptions, docRoot); return ret; } catch (InvocationTargetException e) { final Throwable cause = e.getCause(); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java index c02ff19..105741b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java @@ -5,16 +5,24 @@ import java.util.List; public class UnionLoader implements Loader { - private final List alternates; + private final ArrayList alternates; public UnionLoader(List alternates) { - this.alternates = alternates; + this.alternates = new ArrayList(alternates); } public UnionLoader(Loader[] alternates) { this(Arrays.asList(alternates)); } + public void addLoaders(List loaders) { + this.alternates.addAll(loaders); + } + + public void addLoaders(Loader[] loaders) { + this.addLoaders(Arrays.asList(loaders)); + } + public Object load( final Object doc, final String baseUri, diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java b/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java index 07671c5..ed9e34d 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java +++ b/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java @@ -1,6 +1,5 @@ package org.w3id.cwl.cwl1_1.utils; - public class AnonymousRecordTest { @org.junit.Test diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java b/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java index 3605618..444181a 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java +++ b/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java @@ -18,29 +18,30 @@ public SecondaryFilesTest() throws URISyntaxException { super(); this.doc = (List) - RootLoader.loadDocument( - Paths.get(getClass().getResource("525.cwl").toURI())); + RootLoader.loadDocument(Paths.get(getClass().getResource("525.cwl").toURI())); } @SuppressWarnings("unchecked") -@Test + @Test public void workflowInputSecFiles() { Workflow workflow = (Workflow) doc.get(0); String workflow_id = workflow.getId().get(); List inputs = workflow.getInputs(); WorkflowInputParameter wf_file_input = (WorkflowInputParameter) inputs.get(1); Assert.assertEquals(workflow_id + "/wf_file_input", wf_file_input.getId().get()); - List sec_files_l1 = (List) wf_file_input.getSecondaryFiles(); + List sec_files_l1 = + (List) wf_file_input.getSecondaryFiles(); Assert.assertEquals(1, sec_files_l1.size()); SecondaryFileSchema sec_files1 = sec_files_l1.get(0); Assert.assertEquals(".also", sec_files1.getPattern()); Assert.assertEquals(true, sec_files1.getRequired()); WorkflowInputParameter wf_file_input_array = (WorkflowInputParameter) inputs.get(2); Assert.assertEquals(workflow_id + "/wf_file_input_array", wf_file_input_array.getId().get()); - List sec_files_l2 = (List) wf_file_input_array.getSecondaryFiles(); - Assert.assertEquals(1, sec_files_l2.size()); + List sec_files_l2 = + (List) wf_file_input_array.getSecondaryFiles(); + Assert.assertEquals(1, sec_files_l2.size()); SecondaryFileSchema sec_files2 = sec_files_l2.get(0); Assert.assertEquals(".also", sec_files2.getPattern()); - Assert.assertEquals(true, sec_files2.getRequired()); + Assert.assertEquals(true, sec_files2.getRequired()); } } diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java b/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java index 8eeb319..a449b5b 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java +++ b/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java @@ -1,6 +1,5 @@ package org.w3id.cwl.cwl1_2.utils; - public class AnonymousRecordTest { @org.junit.Test diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java b/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java index 222b590..6bf5d27 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java +++ b/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java @@ -18,29 +18,30 @@ public SecondaryFilesTest() throws URISyntaxException { super(); this.doc = (List) - RootLoader.loadDocument( - Paths.get(getClass().getResource("525.cwl").toURI())); + RootLoader.loadDocument(Paths.get(getClass().getResource("525.cwl").toURI())); } @SuppressWarnings("unchecked") -@Test + @Test public void workflowInputSecFiles() { Workflow workflow = (Workflow) doc.get(0); String workflow_id = workflow.getId().get(); List inputs = workflow.getInputs(); WorkflowInputParameter wf_file_input = (WorkflowInputParameter) inputs.get(1); Assert.assertEquals(workflow_id + "/wf_file_input", wf_file_input.getId().get()); - List sec_files_l1 = (List) wf_file_input.getSecondaryFiles(); + List sec_files_l1 = + (List) wf_file_input.getSecondaryFiles(); Assert.assertEquals(1, sec_files_l1.size()); SecondaryFileSchema sec_files1 = sec_files_l1.get(0); Assert.assertEquals(".also", sec_files1.getPattern()); Assert.assertEquals(true, sec_files1.getRequired()); WorkflowInputParameter wf_file_input_array = (WorkflowInputParameter) inputs.get(2); Assert.assertEquals(workflow_id + "/wf_file_input_array", wf_file_input_array.getId().get()); - List sec_files_l2 = (List) wf_file_input_array.getSecondaryFiles(); - Assert.assertEquals(1, sec_files_l2.size()); + List sec_files_l2 = + (List) wf_file_input_array.getSecondaryFiles(); + Assert.assertEquals(1, sec_files_l2.size()); SecondaryFileSchema sec_files2 = sec_files_l2.get(0); Assert.assertEquals(".also", sec_files2.getPattern()); - Assert.assertEquals(true, sec_files2.getRequired()); + Assert.assertEquals(true, sec_files2.getRequired()); } }