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 8a0005e5..4d276fbe 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 + .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 .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/CommandInputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java index c3b59c61..c943f609 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java @@ -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,7 +165,7 @@ public CommandInputArraySchemaImpl( try { items = LoaderInstances - .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 + .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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java index 5e23bc52..ee904baa 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java @@ -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,7 +165,7 @@ 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. 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 d776d18d..226eb25e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java @@ -275,7 +275,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. @@ -374,7 +374,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_None .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/CommandInputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java index 92c0ad1b..2038caca 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java @@ -257,7 +257,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. @@ -362,7 +362,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_None .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/CommandInputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java index e43d10b6..a13f4bea 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java @@ -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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java index abd925f8..28e37f0d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java @@ -376,7 +376,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. @@ -405,7 +405,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. @@ -508,7 +508,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. @@ -525,7 +525,7 @@ public CommandLineToolImpl( try { intent = LoaderInstances - .uri_optional_array_of_StringInstance_True_False_None + .uri_optional_array_of_StringInstance_True_False_None_None .loadField(__doc.get("intent"), __baseUri, __loadingOptions); } catch (ValidationException e) { intent = null; // won't be used but prevents compiler from complaining. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java index 251a420d..df000f3b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java @@ -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,7 +153,7 @@ public CommandOutputArraySchemaImpl( try { items = LoaderInstances - .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 + .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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java index 0414472d..3a6b1d53 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java @@ -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,7 +153,7 @@ 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. 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 c5c9b42a..e92bc9ba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_None .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 1bf6bc13..b7739e17 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_None .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/CommandOutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java index 17215bad..c3c71bba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java @@ -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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java index ce7b0422..037c3f82 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/DockerRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirementImpl.java index f98931d4..27fbb962 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/EnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java index cd0c8c8c..3c262391 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java @@ -101,7 +101,7 @@ public EnumSchemaImpl( 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. @@ -130,7 +130,7 @@ public EnumSchemaImpl( 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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java index ff365688..2e8eb0ec 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/ExpressionToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java index efab2913..c105dbf2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java @@ -249,7 +249,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. @@ -278,7 +278,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. @@ -381,7 +381,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. @@ -398,7 +398,7 @@ public ExpressionToolImpl( try { intent = LoaderInstances - .uri_optional_array_of_StringInstance_True_False_None + .uri_optional_array_of_StringInstance_True_False_None_None .loadField(__doc.get("intent"), __baseUri, __loadingOptions); } catch (ValidationException e) { intent = 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 2dc6c4e5..27b04e77 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java @@ -202,7 +202,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. @@ -301,7 +301,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_None .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 7e0b5aa8..a38653b8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java @@ -383,7 +383,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. @@ -396,7 +396,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. @@ -413,7 +413,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. @@ -549,7 +549,7 @@ public FileImpl( try { format = LoaderInstances - .uri_optional_StringInstance_True_False_None + .uri_optional_StringInstance_True_False_None_None .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/InitialWorkDirRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java index 4c137c97..5cb4ae1c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java @@ -112,7 +112,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_2/InlineJavascriptRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirementImpl.java index 9c52c393..a94acc2c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/InplaceUpdateRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirementImpl.java index dfd890c5..329303e6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/InputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java index 42ff1a3d..baea3fd9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java @@ -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,7 +153,7 @@ public InputArraySchemaImpl( try { items = LoaderInstances - .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 + .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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java index 2f0251b2..8771c05a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java @@ -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,7 +153,7 @@ 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. 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 97d2b7b2..546ba922 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java @@ -245,7 +245,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. @@ -350,7 +350,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_None .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/InputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java index 223c3f65..87990241 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java @@ -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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java index 18bddc8b..1a6f74bf 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/MultipleInputFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirementImpl.java index 0700dbdc..56d813f4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/NetworkAccessImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccessImpl.java index 5c5072b6..a8ccfa1f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccessImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/OperationImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java index 7f06613e..a36cbf84 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java @@ -234,7 +234,7 @@ public OperationImpl( 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. @@ -263,7 +263,7 @@ public OperationImpl( try { class_ = LoaderInstances - .uri_Operation_class_False_True_None + .uri_Operation_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. @@ -366,7 +366,7 @@ public OperationImpl( 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. @@ -383,7 +383,7 @@ public OperationImpl( try { intent = LoaderInstances - .uri_optional_array_of_StringInstance_True_False_None + .uri_optional_array_of_StringInstance_True_False_None_None .loadField(__doc.get("intent"), __baseUri, __loadingOptions); } catch (ValidationException e) { intent = null; // won't be used but prevents compiler from complaining. 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 62cf8c2d..15432885 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java @@ -262,7 +262,7 @@ public OperationInputParameterImpl( 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. @@ -361,7 +361,7 @@ public OperationInputParameterImpl( 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_None .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/OperationOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java index cd8e795c..2cb50b0c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java @@ -202,7 +202,7 @@ public OperationOutputParameterImpl( 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. @@ -301,7 +301,7 @@ public OperationOutputParameterImpl( 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_None .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/OutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java index a7d4475b..00c8471a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java @@ -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,7 +153,7 @@ public OutputArraySchemaImpl( try { items = LoaderInstances - .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 + .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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java index 90f05dae..03a5f07f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java @@ -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,7 +153,7 @@ 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. 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 1e3bcb00..3d2d91e7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_None .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/OutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java index 82dc76d7..46078b99 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java @@ -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. 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 9727cb20..3e027fc6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java @@ -103,7 +103,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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java index 6fb8ce4e..a83e993a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java @@ -254,7 +254,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_2/ScatterFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirementImpl.java index fe107c80..6359f05a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/SchemaDefRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java index 9c35413a..51688f89 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java @@ -99,7 +99,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_2/ShellCommandRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java index 7136002f..79385dd9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/SoftwarePackageImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackageImpl.java index ee6ebcab..c2603afd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackageImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/SoftwareRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirementImpl.java index 51e7ef4b..1b173683 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/StepInputExpressionRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirementImpl.java index f7558127..5f022e01 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/SubworkflowFeatureRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirementImpl.java index 2faeef7b..f4af5100 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirementImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/ToolTimeLimitImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimitImpl.java index 37fa68f6..4e505dfd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimitImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/WorkReuseImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkReuseImpl.java index 71f9418b..30d2d92a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuseImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/WorkflowImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java index aed7b140..153ef028 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java @@ -294,7 +294,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. @@ -323,7 +323,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. @@ -426,7 +426,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. @@ -443,7 +443,7 @@ public WorkflowImpl( try { intent = LoaderInstances - .uri_optional_array_of_StringInstance_True_False_None + .uri_optional_array_of_StringInstance_True_False_None_None .loadField(__doc.get("intent"), __baseUri, __loadingOptions); } catch (ValidationException e) { intent = null; // won't be used but prevents compiler from complaining. 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 53df3c7b..d9d011de 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java @@ -274,7 +274,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. @@ -373,7 +373,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_None .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/WorkflowOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java index 2370af6c..4bd60245 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java @@ -252,7 +252,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. @@ -351,7 +351,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_None .loadField(__doc.get("format"), __baseUri, __loadingOptions); } catch (ValidationException e) { format = null; // won't be used but prevents compiler from complaining. @@ -368,7 +368,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_2/WorkflowStepImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java index 2e49175a..1d6ff382 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java @@ -298,7 +298,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. @@ -372,7 +372,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. @@ -417,7 +417,7 @@ public WorkflowStepImpl( try { run = LoaderInstances - .uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation_False_False_None + .uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation_False_False_None_None .loadField(__doc.get("run"), __baseUri, __loadingOptions); } catch (ValidationException e) { run = null; // won't be used but prevents compiler from complaining. @@ -447,7 +447,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. @@ -464,7 +464,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_2/WorkflowStepInputImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java index c524cd16..8c5e722d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java @@ -329,7 +329,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. @@ -360,7 +360,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. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java index 9f174968..e85fa40a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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_2/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java b/src/main/java/org/w3id/cwl/cwl1_2/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java deleted file mode 100644 index b35973a6..00000000 --- a/src/main/java/org/w3id/cwl/cwl1_2/enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.java +++ /dev/null @@ -1,37 +0,0 @@ -// 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 enum_d062602be0b4b8fd33e69e29a841317b6ab665bc { - ARRAY("array"); - - private static String[] symbols = new String[] {"array"}; - private String docVal; - - private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc(final String docVal) { - this.docVal = docVal; - } - - public static enum_d062602be0b4b8fd33e69e29a841317b6ab665bc fromDocumentVal(final String docVal) { - for(final enum_d062602be0b4b8fd33e69e29a841317b6ab665bc val : enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.values()) { - if(val.docVal.equals(docVal)) { - return val; - } - } - throw new ValidationException(String.format("Expected one of %s", enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.symbols, docVal)); - } -} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/enum_d961d79c225752b9fadb617367615ab176b47d77.java b/src/main/java/org/w3id/cwl/cwl1_2/enum_d961d79c225752b9fadb617367615ab176b47d77.java deleted file mode 100644 index e993f936..00000000 --- a/src/main/java/org/w3id/cwl/cwl1_2/enum_d961d79c225752b9fadb617367615ab176b47d77.java +++ /dev/null @@ -1,37 +0,0 @@ -// 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 enum_d961d79c225752b9fadb617367615ab176b47d77 { - ENUM("enum"); - - private static String[] symbols = new String[] {"enum"}; - private String docVal; - - private enum_d961d79c225752b9fadb617367615ab176b47d77(final String docVal) { - this.docVal = docVal; - } - - public static enum_d961d79c225752b9fadb617367615ab176b47d77 fromDocumentVal(final String docVal) { - for(final enum_d961d79c225752b9fadb617367615ab176b47d77 val : enum_d961d79c225752b9fadb617367615ab176b47d77.values()) { - if(val.docVal.equals(docVal)) { - return val; - } - } - throw new ValidationException(String.format("Expected one of %s", enum_d961d79c225752b9fadb617367615ab176b47d77.symbols, docVal)); - } -} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java b/src/main/java/org/w3id/cwl/cwl1_2/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java deleted file mode 100644 index 35e1ebd5..00000000 --- a/src/main/java/org/w3id/cwl/cwl1_2/enum_d9cba076fca539106791a4f46d198c7fcfbdb779.java +++ /dev/null @@ -1,37 +0,0 @@ -// 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 enum_d9cba076fca539106791a4f46d198c7fcfbdb779 { - RECORD("record"); - - private static String[] symbols = new String[] {"record"}; - private String docVal; - - private enum_d9cba076fca539106791a4f46d198c7fcfbdb779(final String docVal) { - this.docVal = docVal; - } - - public static enum_d9cba076fca539106791a4f46d198c7fcfbdb779 fromDocumentVal(final String docVal) { - for(final enum_d9cba076fca539106791a4f46d198c7fcfbdb779 val : enum_d9cba076fca539106791a4f46d198c7fcfbdb779.values()) { - if(val.docVal.equals(docVal)) { - return val; - } - } - throw new ValidationException(String.format("Expected one of %s", enum_d9cba076fca539106791a4f46d198c7fcfbdb779.symbols, docVal)); - } -} 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 3255d41a..d1e9a7bf 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 @@ -103,7 +103,7 @@ public class LoaderInstances { public static Loader Operation = new RecordLoader(org.w3id.cwl.cwl1_2.OperationImpl.class); 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 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 }); @@ -114,23 +114,23 @@ public class LoaderInstances { 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_True_False_None = new UriLoader(optional_StringInstance, true, false, null); - public static Loader> uri_array_of_StringInstance_True_False_None = new UriLoader(array_of_StringInstance, true, 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_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2 = 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); + 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 Array_name = new EnumLoader(Array_name.class); public static Loader typedsl_Array_name_2 = new TypeDslLoader(Array_name, 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> uri_optional_StringInstance_False_False_None = new UriLoader(optional_StringInstance, false, false, null); + 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 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); @@ -138,9 +138,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_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_array_of_StringInstance_or_ExpressionLoader, true, false, null, null); 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_None = new UriLoader(union_of_NullInstance_or_StringInstance_or_ExpressionLoader, true, false, null, null); 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 }); @@ -148,7 +148,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 = 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); + 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 }); @@ -156,7 +156,7 @@ 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 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 = 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); + 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); @@ -173,19 +173,19 @@ 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>> optional_array_of_StringInstance = new OptionalLoader(array_of_StringInstance); - public static Loader>> uri_optional_array_of_StringInstance_True_False_None = new UriLoader(optional_array_of_StringInstance, true, false, null); + public static Loader>> uri_optional_array_of_StringInstance_True_False_None_None = new UriLoader(optional_array_of_StringInstance, true, false, 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 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); @@ -197,7 +197,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 = 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); + 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 }); @@ -206,13 +206,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 = 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); + 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); @@ -223,76 +223,76 @@ 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_Dirent_or_ExpressionLoader_or_File_or_Directory_or_array_of_union_of_File_or_Directory = new UnionLoader(new Loader[] { NullInstance, Dirent, ExpressionLoader, File, Directory, array_of_union_of_File_or_Directory }); public static Loader> array_of_union_of_NullInstance_or_Dirent_or_ExpressionLoader_or_File_or_Directory_or_array_of_union_of_File_or_Directory = new ArrayLoader(union_of_NullInstance_or_Dirent_or_ExpressionLoader_or_File_or_Directory_or_array_of_union_of_File_or_Directory); public static Loader union_of_ExpressionLoader_or_array_of_union_of_NullInstance_or_Dirent_or_ExpressionLoader_or_File_or_Directory_or_array_of_union_of_File_or_Directory = new UnionLoader(new Loader[] { ExpressionLoader, array_of_union_of_NullInstance_or_Dirent_or_ExpressionLoader_or_File_or_Directory_or_array_of_union_of_File_or_Directory }); 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_DoubleInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance, DoubleInstance, 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> optional_PickValueMethod = new OptionalLoader(PickValueMethod); - 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_or_Operation = new UnionLoader(new Loader[] { StringInstance, CommandLineTool, ExpressionTool, Workflow, Operation }); - public static Loader uri_union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation_False_False_None = new UriLoader(union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation, 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_or_Operation_False_False_None_None = new UriLoader(union_of_StringInstance_or_CommandLineTool_or_ExpressionTool_or_Workflow_or_Operation, 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 Operation_class = new EnumLoader(Operation_class.class); - public static Loader uri_Operation_class_False_True_None = new UriLoader(Operation_class, false, true, null); + public static Loader uri_Operation_class_False_True_None_None = new UriLoader(Operation_class, false, true, null, null); public static Loader> array_of_OperationInputParameter = new ArrayLoader(OperationInputParameter); public static Loader> idmap_inputs_array_of_OperationInputParameter = new IdMapLoader(array_of_OperationInputParameter, "id", "type"); public static Loader> array_of_OperationOutputParameter = new ArrayLoader(OperationOutputParameter); 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 d287d200..5058d8a8 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 @@ -11,6 +11,7 @@ public class LoadingOptions { String fileUri; Map namespaces; List schemas; + Boolean noLinkCheck; Map idx; Map vocab; Map rvocab; @@ -20,11 +21,13 @@ public class LoadingOptions { final String fileUri, final Map namespaces, final List schemas, + final Boolean noLinkCheck, final Map idx) { this.fetcher = fetcher; this.fileUri = fileUri; this.namespaces = namespaces; this.schemas = schemas; + this.noLinkCheck = noLinkCheck; 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 148898c4..6ed5a522 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 @@ -11,6 +11,7 @@ public class LoadingOptionsBuilder { private Optional> namespaces = Optional.empty(); private Optional> schemas = Optional.empty(); private Optional copyFrom = Optional.empty(); + private Optional noLinkCheck = Optional.empty(); public LoadingOptionsBuilder() {} @@ -34,11 +35,17 @@ public LoadingOptionsBuilder setNamespaces(final Map namespaces) return this; } + public LoadingOptionsBuilder setNoLinkCheck(final Boolean noLinkCheck) { + this.noLinkCheck = Optional.of(noLinkCheck); + 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); Map idx = new HashMap(); if (this.copyFrom.isPresent()) { final LoadingOptions copyFrom = this.copyFrom.get(); @@ -53,10 +60,13 @@ public LoadingOptions build() { namespaces = copyFrom.namespaces; schemas = copyFrom.schemas; // Bug in Python codegen? } + if (noLinkCheck == null) { + noLinkCheck = copyFrom.noLinkCheck; + } } if (fetcher == null) { fetcher = new DefaultFetcher(); } - return new LoadingOptions(fetcher, fileUri, namespaces, schemas, idx); + return new LoadingOptions(fetcher, fileUri, namespaces, schemas, noLinkCheck, idx); } } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java index 210cae9e..3ba92ad4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java +++ b/src/main/java/org/w3id/cwl/cwl1_2/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); } }