Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java

This file was deleted.

35 changes: 0 additions & 35 deletions src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ public interface ArraySchema extends Saveable {
* Must be `array` * </BLOCKQUOTE>
*/

enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
Array_name getType();
}
12 changes: 6 additions & 6 deletions src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ public Object getItems() {
return this.items;
}

private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
private Array_name type;

/**
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
* <BLOCKQUOTE>
* Must be `array` * </BLOCKQUOTE>
*/

public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
public Array_name getType() {
return this.type;
}

Expand Down Expand Up @@ -86,18 +86,18 @@ public ArraySchemaImpl(
try {
items =
LoaderInstances
.typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2
.uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
items = null; // won't be used but prevents compiler from complaining.
final String __message = "the `items` field is not valid because:";
__errors.add(new ValidationException(__message, e));
}
enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
Array_name type;
try {
type =
LoaderInstances
.typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
.typedsl_Array_name_2
.loadField(__doc.get("type"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
type = null; // won't be used but prevents compiler from complaining.
Expand All @@ -108,6 +108,6 @@ public ArraySchemaImpl(
throw new ValidationException("Trying 'RecordField'", __errors);
}
this.items = (Object) items;
this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
this.type = (Array_name) type;
}
}
37 changes: 37 additions & 0 deletions src/main/java/org/w3id/cwl/cwl1_2/Array_name.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Copyright Common Workflow Language project contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.w3id.cwl.cwl1_2;

import org.w3id.cwl.cwl1_2.utils.ValidationException;

public enum Array_name {
ARRAY("array");

private static String[] symbols = new String[] {"array"};
private String docVal;

private Array_name(final String docVal) {
this.docVal = docVal;
}

public static Array_name fromDocumentVal(final String docVal) {
for(final Array_name val : Array_name.values()) {
if(val.docVal.equals(docVal)) {
return val;
}
}
throw new ValidationException(String.format("Expected one of %s", Array_name.symbols, docVal));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface CommandInputArraySchema extends InputArraySchema, CommandInputS
* Must be `array` * </BLOCKQUOTE>
*/

enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
Array_name getType();
/**
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
* <BLOCKQUOTE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public Object getItems() {
return this.items;
}

private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
private Array_name type;

/**
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
* <BLOCKQUOTE>
* Must be `array` * </BLOCKQUOTE>
*/

public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
public Array_name getType() {
return this.type;
}

Expand Down Expand Up @@ -165,18 +165,18 @@ public CommandInputArraySchemaImpl(
try {
items =
LoaderInstances
.typedsl_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2
.uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
items = null; // won't be used but prevents compiler from complaining.
final String __message = "the `items` field is not valid because:";
__errors.add(new ValidationException(__message, e));
}
enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
Array_name type;
try {
type =
LoaderInstances
.typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
.typedsl_Array_name_2
.loadField(__doc.get("type"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
type = null; // won't be used but prevents compiler from complaining.
Expand Down Expand Up @@ -238,7 +238,7 @@ public CommandInputArraySchemaImpl(
throw new ValidationException("Trying 'RecordField'", __errors);
}
this.items = (Object) items;
this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
this.type = (Array_name) type;
this.label = (java.util.Optional<String>) label;
this.doc = (Object) doc;
this.name = (java.util.Optional<String>) name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSch
* Must be `enum` * </BLOCKQUOTE>
*/

enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
Enum_name getType();
/**
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
* <BLOCKQUOTE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public java.util.List<String> getSymbols() {
return this.symbols;
}

private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
private Enum_name type;

/**
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
* <BLOCKQUOTE>
* Must be `enum` * </BLOCKQUOTE>
*/

public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
public Enum_name getType() {
return this.type;
}

Expand Down Expand Up @@ -172,11 +172,11 @@ public CommandInputEnumSchemaImpl(
final String __message = "the `symbols` field is not valid because:";
__errors.add(new ValidationException(__message, e));
}
enum_d961d79c225752b9fadb617367615ab176b47d77 type;
Enum_name type;
try {
type =
LoaderInstances
.typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
.typedsl_Enum_name_2
.loadField(__doc.get("type"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
type = null; // won't be used but prevents compiler from complaining.
Expand Down Expand Up @@ -237,11 +237,11 @@ public CommandInputEnumSchemaImpl(
if (!__errors.isEmpty()) {
throw new ValidationException("Trying 'RecordField'", __errors);
}
this.name = (java.util.Optional<String>) name;
this.symbols = (java.util.List<String>) symbols;
this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
this.type = (Enum_name) type;
this.label = (java.util.Optional<String>) label;
this.doc = (Object) doc;
this.name = (java.util.Optional<String>) name;
this.inputBinding = (java.util.Optional<CommandLineBinding>) inputBinding;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface CommandInputRecordSchema extends InputRecordSchema, CommandInpu
* Must be `record` * </BLOCKQUOTE>
*/

enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
Record_name getType();
/**
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
* <BLOCKQUOTE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public java.util.Optional<java.util.List<Object>> getFields() {
return this.fields;
}

private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
private Record_name type;

/**
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
* <BLOCKQUOTE>
* Must be `record` * </BLOCKQUOTE>
*/

public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
public Record_name getType() {
return this.type;
}

Expand Down Expand Up @@ -178,11 +178,11 @@ public CommandInputRecordSchemaImpl(
} else {
fields = null;
}
enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
Record_name type;
try {
type =
LoaderInstances
.typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
.typedsl_Record_name_2
.loadField(__doc.get("type"), __baseUri, __loadingOptions);
} catch (ValidationException e) {
type = null; // won't be used but prevents compiler from complaining.
Expand Down Expand Up @@ -244,7 +244,7 @@ public CommandInputRecordSchemaImpl(
throw new ValidationException("Trying 'RecordField'", __errors);
}
this.fields = (java.util.Optional<java.util.List<Object>>) fields;
this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
this.type = (Record_name) type;
this.label = (java.util.Optional<String>) label;
this.doc = (Object) doc;
this.name = (java.util.Optional<String>) name;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ public interface CommandLineTool extends Process, Saveable {
* Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
* <BLOCKQUOTE>
* An identifier for the type of computational operation, of this Process.
* Especially useful for "class: Operation", but can also be used for
* CommandLineTool, Workflow, or ExpressionTool.
* Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
* [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
* [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
*
* If provided, then this must be an IRI of a concept node that
* represents the type of operation, preferably defined within an ontology.
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
* Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
* <BLOCKQUOTE>
* An identifier for the type of computational operation, of this Process.
* Especially useful for "class: Operation", but can also be used for
* CommandLineTool, Workflow, or ExpressionTool.
* Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
* [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
* [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
*
* If provided, then this must be an IRI of a concept node that
* represents the type of operation, preferably defined within an ontology.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface CommandOutputArraySchema extends OutputArraySchema, Saveable {
* Must be `array` * </BLOCKQUOTE>
*/

enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
Array_name getType();
/**
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
* <BLOCKQUOTE>
Expand Down
Loading