Skip to content

Commit 0f22722

Browse files
mr-cmr-c
committed
check "class" fields early
1 parent b2fa6dd commit 0f22722

File tree

8 files changed

+112
-112
lines changed

8 files changed

+112
-112
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ public interface CommandLineTool extends Process, Savable {
2929
*/
3030

3131
java.util.Optional<String> getId();
32+
/**
33+
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineTool/class</I><BR>
34+
35+
*/
36+
37+
CommandLineTool_class getClass_();
3238
/**
3339
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
3440
* <BLOCKQUOTE>
@@ -123,12 +129,6 @@ public interface CommandLineTool extends Process, Savable {
123129
*/
124130

125131
java.util.Optional<java.util.List<Object>> getIntent();
126-
/**
127-
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineTool/class</I><BR>
128-
129-
*/
130-
131-
CommandLineTool_class getClass_();
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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,17 @@ public java.util.Optional<String> getId() {
4242
return this.id;
4343
}
4444

45+
private CommandLineTool_class class_;
46+
47+
/**
48+
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineTool/class</I><BR>
49+
50+
*/
51+
52+
public CommandLineTool_class getClass_() {
53+
return this.class_;
54+
}
55+
4556
private java.util.Optional<String> label;
4657

4758
/**
@@ -176,17 +187,6 @@ public java.util.Optional<java.util.List<Object>> getIntent() {
176187
return this.intent;
177188
}
178189

179-
private CommandLineTool_class class_;
180-
181-
/**
182-
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineTool/class</I><BR>
183-
184-
*/
185-
186-
public CommandLineTool_class getClass_() {
187-
return this.class_;
188-
}
189-
190190
private Object baseCommand;
191191

192192
/**
@@ -392,6 +392,17 @@ public CommandLineToolImpl(
392392
} else {
393393
__baseUri = (String) id.orElse(null);
394394
}
395+
CommandLineTool_class class_;
396+
try {
397+
class_ =
398+
LoaderInstances
399+
.uri_CommandLineTool_class_False_True_None
400+
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
401+
} catch (ValidationException e) {
402+
class_ = null; // won't be used but prevents compiler from complaining.
403+
final String __message = "the `class` field is not valid because:";
404+
__errors.add(new ValidationException(__message, e));
405+
}
395406
java.util.Optional<String> label;
396407

397408
if (__doc.containsKey("label")) {
@@ -516,17 +527,6 @@ public CommandLineToolImpl(
516527
} else {
517528
intent = null;
518529
}
519-
CommandLineTool_class class_;
520-
try {
521-
class_ =
522-
LoaderInstances
523-
.uri_CommandLineTool_class_False_True_None
524-
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
525-
} catch (ValidationException e) {
526-
class_ = null; // won't be used but prevents compiler from complaining.
527-
final String __message = "the `class` field is not valid because:";
528-
__errors.add(new ValidationException(__message, e));
529-
}
530530
Object baseCommand;
531531

532532
if (__doc.containsKey("baseCommand")) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ public interface ExpressionTool extends Process, Savable {
3535
*/
3636

3737
java.util.Optional<String> getId();
38+
/**
39+
* Getter for property <I>https://w3id.org/cwl/cwl#ExpressionTool/class</I><BR>
40+
41+
*/
42+
43+
ExpressionTool_class getClass_();
3844
/**
3945
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
4046
* <BLOCKQUOTE>
@@ -129,12 +135,6 @@ public interface ExpressionTool extends Process, Savable {
129135
*/
130136

131137
java.util.Optional<java.util.List<Object>> getIntent();
132-
/**
133-
* Getter for property <I>https://w3id.org/cwl/cwl#ExpressionTool/class</I><BR>
134-
135-
*/
136-
137-
ExpressionTool_class getClass_();
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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ public java.util.Optional<String> getId() {
4848
return this.id;
4949
}
5050

51+
private ExpressionTool_class class_;
52+
53+
/**
54+
* Getter for property <I>https://w3id.org/cwl/cwl#ExpressionTool/class</I><BR>
55+
56+
*/
57+
58+
public ExpressionTool_class getClass_() {
59+
return this.class_;
60+
}
61+
5162
private java.util.Optional<String> label;
5263

5364
/**
@@ -182,17 +193,6 @@ public java.util.Optional<java.util.List<Object>> getIntent() {
182193
return this.intent;
183194
}
184195

185-
private ExpressionTool_class class_;
186-
187-
/**
188-
* Getter for property <I>https://w3id.org/cwl/cwl#ExpressionTool/class</I><BR>
189-
190-
*/
191-
192-
public ExpressionTool_class getClass_() {
193-
return this.class_;
194-
}
195-
196196
private String expression;
197197

198198
/**
@@ -269,6 +269,17 @@ public ExpressionToolImpl(
269269
} else {
270270
__baseUri = (String) id.orElse(null);
271271
}
272+
ExpressionTool_class class_;
273+
try {
274+
class_ =
275+
LoaderInstances
276+
.uri_ExpressionTool_class_False_True_None
277+
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
278+
} catch (ValidationException e) {
279+
class_ = null; // won't be used but prevents compiler from complaining.
280+
final String __message = "the `class` field is not valid because:";
281+
__errors.add(new ValidationException(__message, e));
282+
}
272283
java.util.Optional<String> label;
273284

274285
if (__doc.containsKey("label")) {
@@ -393,17 +404,6 @@ public ExpressionToolImpl(
393404
} else {
394405
intent = null;
395406
}
396-
ExpressionTool_class class_;
397-
try {
398-
class_ =
399-
LoaderInstances
400-
.uri_ExpressionTool_class_False_True_None
401-
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
402-
} catch (ValidationException e) {
403-
class_ = null; // won't be used but prevents compiler from complaining.
404-
final String __message = "the `class` field is not valid because:";
405-
__errors.add(new ValidationException(__message, e));
406-
}
407407
String expression;
408408
try {
409409
expression =

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ public interface Operation extends Process, Savable {
3535
*/
3636

3737
java.util.Optional<String> getId();
38+
/**
39+
* Getter for property <I>https://w3id.org/cwl/cwl#Operation/class</I><BR>
40+
41+
*/
42+
43+
Operation_class getClass_();
3844
/**
3945
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
4046
* <BLOCKQUOTE>
@@ -129,10 +135,4 @@ public interface Operation extends Process, Savable {
129135
*/
130136

131137
java.util.Optional<java.util.List<Object>> getIntent();
132-
/**
133-
* Getter for property <I>https://w3id.org/cwl/cwl#Operation/class</I><BR>
134-
135-
*/
136-
137-
Operation_class getClass_();
138138
}

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ public java.util.Optional<String> getId() {
4848
return this.id;
4949
}
5050

51+
private Operation_class class_;
52+
53+
/**
54+
* Getter for property <I>https://w3id.org/cwl/cwl#Operation/class</I><BR>
55+
56+
*/
57+
58+
public Operation_class getClass_() {
59+
return this.class_;
60+
}
61+
5162
private java.util.Optional<String> label;
5263

5364
/**
@@ -182,17 +193,6 @@ public java.util.Optional<java.util.List<Object>> getIntent() {
182193
return this.intent;
183194
}
184195

185-
private Operation_class class_;
186-
187-
/**
188-
* Getter for property <I>https://w3id.org/cwl/cwl#Operation/class</I><BR>
189-
190-
*/
191-
192-
public Operation_class getClass_() {
193-
return this.class_;
194-
}
195-
196196
/**
197197
* Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OperationImpl.
198198
*
@@ -254,6 +254,17 @@ public OperationImpl(
254254
} else {
255255
__baseUri = (String) id.orElse(null);
256256
}
257+
Operation_class class_;
258+
try {
259+
class_ =
260+
LoaderInstances
261+
.uri_Operation_class_False_True_None
262+
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
263+
} catch (ValidationException e) {
264+
class_ = null; // won't be used but prevents compiler from complaining.
265+
final String __message = "the `class` field is not valid because:";
266+
__errors.add(new ValidationException(__message, e));
267+
}
257268
java.util.Optional<String> label;
258269

259270
if (__doc.containsKey("label")) {
@@ -378,17 +389,6 @@ public OperationImpl(
378389
} else {
379390
intent = null;
380391
}
381-
Operation_class class_;
382-
try {
383-
class_ =
384-
LoaderInstances
385-
.uri_Operation_class_False_True_None
386-
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
387-
} catch (ValidationException e) {
388-
class_ = null; // won't be used but prevents compiler from complaining.
389-
final String __message = "the `class` field is not valid because:";
390-
__errors.add(new ValidationException(__message, e));
391-
}
392392
if (!__errors.isEmpty()) {
393393
throw new ValidationException("Trying 'RecordField'", __errors);
394394
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ public interface Workflow extends Process, Savable {
7979
*/
8080

8181
java.util.Optional<String> getId();
82+
/**
83+
* Getter for property <I>https://w3id.org/cwl/cwl#Workflow/class</I><BR>
84+
85+
*/
86+
87+
Workflow_class getClass_();
8288
/**
8389
* Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
8490
* <BLOCKQUOTE>
@@ -173,12 +179,6 @@ public interface Workflow extends Process, Savable {
173179
*/
174180

175181
java.util.Optional<java.util.List<Object>> getIntent();
176-
/**
177-
* Getter for property <I>https://w3id.org/cwl/cwl#Workflow/class</I><BR>
178-
179-
*/
180-
181-
Workflow_class getClass_();
182182
/**
183183
* Getter for property <I>https://w3id.org/cwl/cwl#Workflow/steps</I><BR>
184184
* <BLOCKQUOTE>

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ public java.util.Optional<String> getId() {
9292
return this.id;
9393
}
9494

95+
private Workflow_class class_;
96+
97+
/**
98+
* Getter for property <I>https://w3id.org/cwl/cwl#Workflow/class</I><BR>
99+
100+
*/
101+
102+
public Workflow_class getClass_() {
103+
return this.class_;
104+
}
105+
95106
private java.util.Optional<String> label;
96107

97108
/**
@@ -226,17 +237,6 @@ public java.util.Optional<java.util.List<Object>> getIntent() {
226237
return this.intent;
227238
}
228239

229-
private Workflow_class class_;
230-
231-
/**
232-
* Getter for property <I>https://w3id.org/cwl/cwl#Workflow/class</I><BR>
233-
234-
*/
235-
236-
public Workflow_class getClass_() {
237-
return this.class_;
238-
}
239-
240240
private java.util.List<Object> steps;
241241

242242
/**
@@ -314,6 +314,17 @@ public WorkflowImpl(
314314
} else {
315315
__baseUri = (String) id.orElse(null);
316316
}
317+
Workflow_class class_;
318+
try {
319+
class_ =
320+
LoaderInstances
321+
.uri_Workflow_class_False_True_None
322+
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
323+
} catch (ValidationException e) {
324+
class_ = null; // won't be used but prevents compiler from complaining.
325+
final String __message = "the `class` field is not valid because:";
326+
__errors.add(new ValidationException(__message, e));
327+
}
317328
java.util.Optional<String> label;
318329

319330
if (__doc.containsKey("label")) {
@@ -438,17 +449,6 @@ public WorkflowImpl(
438449
} else {
439450
intent = null;
440451
}
441-
Workflow_class class_;
442-
try {
443-
class_ =
444-
LoaderInstances
445-
.uri_Workflow_class_False_True_None
446-
.loadField(__doc.get("class"), __baseUri, __loadingOptions);
447-
} catch (ValidationException e) {
448-
class_ = null; // won't be used but prevents compiler from complaining.
449-
final String __message = "the `class` field is not valid because:";
450-
__errors.add(new ValidationException(__message, e));
451-
}
452452
java.util.List<Object> steps;
453453
try {
454454
steps =

0 commit comments

Comments
 (0)