Skip to content

Commit 61ddfed

Browse files
committed
refresh codegen to pick up secfiles DSL fix
1 parent fd2d2bb commit 61ddfed

40 files changed

+345
-199
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSch
3333
* Defines the set of valid symbols. * </BLOCKQUOTE>
3434
*/
3535

36-
java.util.List<Object> getSymbols();
36+
java.util.List<String> getSymbols();
3737
/**
3838
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
3939
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public java.util.Optional<String> getName() {
4040
return this.name;
4141
}
4242

43-
private java.util.List<Object> symbols;
43+
private java.util.List<String> symbols;
4444

4545
/**
4646
* Getter for property <I>https://w3id.org/cwl/salad#symbols</I><BR>
4747
* <BLOCKQUOTE>
4848
* Defines the set of valid symbols. * </BLOCKQUOTE>
4949
*/
5050

51-
public java.util.List<Object> getSymbols() {
51+
public java.util.List<String> getSymbols() {
5252
return this.symbols;
5353
}
5454

@@ -161,7 +161,7 @@ public CommandInputEnumSchemaImpl(
161161
} else {
162162
__baseUri = (String) name.orElse(null);
163163
}
164-
java.util.List<Object> symbols;
164+
java.util.List<String> symbols;
165165
try {
166166
symbols =
167167
LoaderInstances
@@ -237,7 +237,7 @@ public CommandInputEnumSchemaImpl(
237237
if (!__errors.isEmpty()) {
238238
throw new ValidationException("Trying 'RecordField'", __errors);
239239
}
240-
this.symbols = (java.util.List<Object>) symbols;
240+
this.symbols = (java.util.List<String>) symbols;
241241
this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
242242
this.label = (java.util.Optional<String>) label;
243243
this.doc = (Object) doc;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public interface CommandLineBinding extends InputBinding, Savable {
6060
* Getter for property <I>https://w3id.org/cwl/cwl#InputBinding/loadContents</I><BR>
6161
* <BLOCKQUOTE>
6262
* Use of `loadContents` in `InputBinding` is deprecated.
63-
* Preserved for v1.0 backwards compatability. Will be removed in
63+
* Preserved for v1.0 backwards compatibility. Will be removed in
6464
* CWL v2.0. Use `InputParameter.loadContents` instead.
6565
* * </BLOCKQUOTE>
6666
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class CommandLineBindingImpl extends SavableImpl implements CommandLineBi
7070
* Getter for property <I>https://w3id.org/cwl/cwl#InputBinding/loadContents</I><BR>
7171
* <BLOCKQUOTE>
7272
* Use of `loadContents` in `InputBinding` is deprecated.
73-
* Preserved for v1.0 backwards compatability. Will be removed in
73+
* Preserved for v1.0 backwards compatibility. Will be removed in
7474
* CWL v2.0. Use `InputParameter.loadContents` instead.
7575
* * </BLOCKQUOTE>
7676
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public interface CommandLineTool extends Process, Savable {
128128
* * </BLOCKQUOTE>
129129
*/
130130

131-
java.util.Optional<java.util.List<Object>> getIntent();
131+
java.util.Optional<java.util.List<String>> getIntent();
132132
/**
133133
* Getter for property <I>https://w3id.org/cwl/cwl#baseCommand</I><BR>
134134
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
162162
return this.cwlVersion;
163163
}
164164

165-
private java.util.Optional<java.util.List<Object>> intent;
165+
private java.util.Optional<java.util.List<String>> intent;
166166

167167
/**
168168
* Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
@@ -183,7 +183,7 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
183183
* * </BLOCKQUOTE>
184184
*/
185185

186-
public java.util.Optional<java.util.List<Object>> getIntent() {
186+
public java.util.Optional<java.util.List<String>> getIntent() {
187187
return this.intent;
188188
}
189189

@@ -510,7 +510,7 @@ public CommandLineToolImpl(
510510
} else {
511511
cwlVersion = null;
512512
}
513-
java.util.Optional<java.util.List<Object>> intent;
513+
java.util.Optional<java.util.List<String>> intent;
514514

515515
if (__doc.containsKey("intent")) {
516516
try {
@@ -674,7 +674,7 @@ public CommandLineToolImpl(
674674
this.requirements = (java.util.Optional<java.util.List<Object>>) requirements;
675675
this.hints = (java.util.Optional<java.util.List<Object>>) hints;
676676
this.cwlVersion = (java.util.Optional<CWLVersion>) cwlVersion;
677-
this.intent = (java.util.Optional<java.util.List<Object>>) intent;
677+
this.intent = (java.util.Optional<java.util.List<String>>) intent;
678678
this.class_ = (CommandLineTool_class) class_;
679679
this.baseCommand = (Object) baseCommand;
680680
this.arguments = (java.util.Optional<java.util.List<Object>>) arguments;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public interface CommandOutputEnumSchema extends OutputEnumSchema, Savable {
3333
* Defines the set of valid symbols. * </BLOCKQUOTE>
3434
*/
3535

36-
java.util.List<Object> getSymbols();
36+
java.util.List<String> getSymbols();
3737
/**
3838
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
3939
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public java.util.Optional<String> getName() {
4040
return this.name;
4141
}
4242

43-
private java.util.List<Object> symbols;
43+
private java.util.List<String> symbols;
4444

4545
/**
4646
* Getter for property <I>https://w3id.org/cwl/salad#symbols</I><BR>
4747
* <BLOCKQUOTE>
4848
* Defines the set of valid symbols. * </BLOCKQUOTE>
4949
*/
5050

51-
public java.util.List<Object> getSymbols() {
51+
public java.util.List<String> getSymbols() {
5252
return this.symbols;
5353
}
5454

@@ -149,7 +149,7 @@ public CommandOutputEnumSchemaImpl(
149149
} else {
150150
__baseUri = (String) name.orElse(null);
151151
}
152-
java.util.List<Object> symbols;
152+
java.util.List<String> symbols;
153153
try {
154154
symbols =
155155
LoaderInstances
@@ -208,7 +208,7 @@ public CommandOutputEnumSchemaImpl(
208208
if (!__errors.isEmpty()) {
209209
throw new ValidationException("Trying 'RecordField'", __errors);
210210
}
211-
this.symbols = (java.util.List<Object>) symbols;
211+
this.symbols = (java.util.List<String>) symbols;
212212
this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
213213
this.label = (java.util.Optional<String>) label;
214214
this.doc = (Object) doc;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public interface EnumSchema extends Savable {
2828
* Defines the set of valid symbols. * </BLOCKQUOTE>
2929
*/
3030

31-
java.util.List<Object> getSymbols();
31+
java.util.List<String> getSymbols();
3232
/**
3333
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
3434
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public class EnumSchemaImpl extends SavableImpl implements EnumSchema {
3030
private java.util.Map<String, Object> extensionFields_ =
3131
new java.util.HashMap<String, Object>();
3232

33-
private java.util.List<Object> symbols;
33+
private java.util.List<String> symbols;
3434

3535
/**
3636
* Getter for property <I>https://w3id.org/cwl/salad#symbols</I><BR>
3737
* <BLOCKQUOTE>
3838
* Defines the set of valid symbols. * </BLOCKQUOTE>
3939
*/
4040

41-
public java.util.List<Object> getSymbols() {
41+
public java.util.List<String> getSymbols() {
4242
return this.symbols;
4343
}
4444

@@ -84,7 +84,7 @@ public EnumSchemaImpl(
8484
if (__loadingOptions != null) {
8585
this.loadingOptions_ = __loadingOptions;
8686
}
87-
java.util.List<Object> symbols;
87+
java.util.List<String> symbols;
8888
try {
8989
symbols =
9090
LoaderInstances
@@ -109,7 +109,7 @@ public EnumSchemaImpl(
109109
if (!__errors.isEmpty()) {
110110
throw new ValidationException("Trying 'RecordField'", __errors);
111111
}
112-
this.symbols = (java.util.List<Object>) symbols;
112+
this.symbols = (java.util.List<String>) symbols;
113113
this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
114114
}
115115
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public interface ExpressionTool extends Process, Savable {
134134
* * </BLOCKQUOTE>
135135
*/
136136

137-
java.util.Optional<java.util.List<Object>> getIntent();
137+
java.util.Optional<java.util.List<String>> getIntent();
138138
/**
139139
* Getter for property <I>https://w3id.org/cwl/cwl#ExpressionTool/expression</I><BR>
140140
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
168168
return this.cwlVersion;
169169
}
170170

171-
private java.util.Optional<java.util.List<Object>> intent;
171+
private java.util.Optional<java.util.List<String>> intent;
172172

173173
/**
174174
* Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
@@ -189,7 +189,7 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
189189
* * </BLOCKQUOTE>
190190
*/
191191

192-
public java.util.Optional<java.util.List<Object>> getIntent() {
192+
public java.util.Optional<java.util.List<String>> getIntent() {
193193
return this.intent;
194194
}
195195

@@ -387,7 +387,7 @@ public ExpressionToolImpl(
387387
} else {
388388
cwlVersion = null;
389389
}
390-
java.util.Optional<java.util.List<Object>> intent;
390+
java.util.Optional<java.util.List<String>> intent;
391391

392392
if (__doc.containsKey("intent")) {
393393
try {
@@ -426,7 +426,7 @@ public ExpressionToolImpl(
426426
this.requirements = (java.util.Optional<java.util.List<Object>>) requirements;
427427
this.hints = (java.util.Optional<java.util.List<Object>>) hints;
428428
this.cwlVersion = (java.util.Optional<CWLVersion>) cwlVersion;
429-
this.intent = (java.util.Optional<java.util.List<Object>>) intent;
429+
this.intent = (java.util.Optional<java.util.List<String>>) intent;
430430
this.class_ = (ExpressionTool_class) class_;
431431
this.expression = (String) expression;
432432
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public interface File extends Savable {
239239
* represents the file format, preferrably defined within an ontology.
240240
* If no ontology is available, file formats may be tested by exact match.
241241
*
242-
* Reasoning about format compatability must be done by checking that an
242+
* Reasoning about format compatibility must be done by checking that an
243243
* input file format is the same, `owl:equivalentClass` or
244244
* `rdfs:subClassOf` the format required by the input parameter.
245245
* `owl:equivalentClass` is transitive with `rdfs:subClassOf`, e.g. if

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public java.util.Optional<java.util.List<Object>> getSecondaryFiles() {
299299
* represents the file format, preferrably defined within an ontology.
300300
* If no ontology is available, file formats may be tested by exact match.
301301
*
302-
* Reasoning about format compatability must be done by checking that an
302+
* Reasoning about format compatibility must be done by checking that an
303303
* input file format is the same, `owl:equivalentClass` or
304304
* `rdfs:subClassOf` the format required by the input parameter.
305305
* `owl:equivalentClass` is transitive with `rdfs:subClassOf`, e.g. if

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ public interface InlineJavascriptRequirement extends ProcessRequirement, Savable
4040
* * </BLOCKQUOTE>
4141
*/
4242

43-
java.util.Optional<java.util.List<Object>> getExpressionLib();
43+
java.util.Optional<java.util.List<String>> getExpressionLib();
4444
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public InlineJavascriptRequirement_class getClass_() {
4444
return this.class_;
4545
}
4646

47-
private java.util.Optional<java.util.List<Object>> expressionLib;
47+
private java.util.Optional<java.util.List<String>> expressionLib;
4848

4949
/**
5050
* Getter for property <I>https://w3id.org/cwl/cwl#InlineJavascriptRequirement/expressionLib</I><BR>
@@ -55,7 +55,7 @@ public InlineJavascriptRequirement_class getClass_() {
5555
* * </BLOCKQUOTE>
5656
*/
5757

58-
public java.util.Optional<java.util.List<Object>> getExpressionLib() {
58+
public java.util.Optional<java.util.List<String>> getExpressionLib() {
5959
return this.expressionLib;
6060
}
6161

@@ -100,7 +100,7 @@ public InlineJavascriptRequirementImpl(
100100
final String __message = "the `class` field is not valid because:";
101101
__errors.add(new ValidationException(__message, e));
102102
}
103-
java.util.Optional<java.util.List<Object>> expressionLib;
103+
java.util.Optional<java.util.List<String>> expressionLib;
104104

105105
if (__doc.containsKey("expressionLib")) {
106106
try {
@@ -121,6 +121,6 @@ public InlineJavascriptRequirementImpl(
121121
throw new ValidationException("Trying 'RecordField'", __errors);
122122
}
123123
this.class_ = (InlineJavascriptRequirement_class) class_;
124-
this.expressionLib = (java.util.Optional<java.util.List<Object>>) expressionLib;
124+
this.expressionLib = (java.util.Optional<java.util.List<String>>) expressionLib;
125125
}
126126
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public interface InputBinding extends Savable {
2424
* Getter for property <I>https://w3id.org/cwl/cwl#InputBinding/loadContents</I><BR>
2525
* <BLOCKQUOTE>
2626
* Use of `loadContents` in `InputBinding` is deprecated.
27-
* Preserved for v1.0 backwards compatability. Will be removed in
27+
* Preserved for v1.0 backwards compatibility. Will be removed in
2828
* CWL v2.0. Use `InputParameter.loadContents` instead.
2929
* * </BLOCKQUOTE>
3030
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class InputBindingImpl extends SavableImpl implements InputBinding {
3434
* Getter for property <I>https://w3id.org/cwl/cwl#InputBinding/loadContents</I><BR>
3535
* <BLOCKQUOTE>
3636
* Use of `loadContents` in `InputBinding` is deprecated.
37-
* Preserved for v1.0 backwards compatability. Will be removed in
37+
* Preserved for v1.0 backwards compatibility. Will be removed in
3838
* CWL v2.0. Use `InputParameter.loadContents` instead.
3939
* * </BLOCKQUOTE>
4040
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public interface InputEnumSchema extends EnumSchema, InputSchema, Savable {
3333
* Defines the set of valid symbols. * </BLOCKQUOTE>
3434
*/
3535

36-
java.util.List<Object> getSymbols();
36+
java.util.List<String> getSymbols();
3737
/**
3838
* Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
3939
* <BLOCKQUOTE>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public java.util.Optional<String> getName() {
4040
return this.name;
4141
}
4242

43-
private java.util.List<Object> symbols;
43+
private java.util.List<String> symbols;
4444

4545
/**
4646
* Getter for property <I>https://w3id.org/cwl/salad#symbols</I><BR>
4747
* <BLOCKQUOTE>
4848
* Defines the set of valid symbols. * </BLOCKQUOTE>
4949
*/
5050

51-
public java.util.List<Object> getSymbols() {
51+
public java.util.List<String> getSymbols() {
5252
return this.symbols;
5353
}
5454

@@ -149,7 +149,7 @@ public InputEnumSchemaImpl(
149149
} else {
150150
__baseUri = (String) name.orElse(null);
151151
}
152-
java.util.List<Object> symbols;
152+
java.util.List<String> symbols;
153153
try {
154154
symbols =
155155
LoaderInstances
@@ -208,7 +208,7 @@ public InputEnumSchemaImpl(
208208
if (!__errors.isEmpty()) {
209209
throw new ValidationException("Trying 'RecordField'", __errors);
210210
}
211-
this.symbols = (java.util.List<Object>) symbols;
211+
this.symbols = (java.util.List<String>) symbols;
212212
this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
213213
this.label = (java.util.Optional<String>) label;
214214
this.doc = (Object) doc;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,5 @@ public interface Operation extends Process, Savable {
134134
* * </BLOCKQUOTE>
135135
*/
136136

137-
java.util.Optional<java.util.List<Object>> getIntent();
137+
java.util.Optional<java.util.List<String>> getIntent();
138138
}

0 commit comments

Comments
 (0)