Skip to content

Commit 594349b

Browse files
mr-cmr-c
committed
freshen & enable proper baseUris for anonymous items
1 parent f1babbb commit 594349b

32 files changed

+230
-50
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,19 @@ public CommandInputArraySchemaImpl(
148148
name = null;
149149
}
150150

151+
Boolean __original_is_null = name == null;
151152
if (name == null) {
152153
if (__docRoot != null) {
153154
name = java.util.Optional.of(__docRoot);
154155
} else {
155156
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
156157
}
157158
}
158-
__baseUri = (String) name.orElse(null);
159+
if (__original_is_null) {
160+
__baseUri = __baseUri_;
161+
} else {
162+
__baseUri = (String) name.orElse(null);
163+
}
159164
Object items;
160165
try {
161166
items =

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,19 @@ public CommandInputEnumSchemaImpl(
148148
name = null;
149149
}
150150

151+
Boolean __original_is_null = name == null;
151152
if (name == null) {
152153
if (__docRoot != null) {
153154
name = java.util.Optional.of(__docRoot);
154155
} else {
155156
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
156157
}
157158
}
158-
__baseUri = (String) name.orElse(null);
159+
if (__original_is_null) {
160+
__baseUri = __baseUri_;
161+
} else {
162+
__baseUri = (String) name.orElse(null);
163+
}
159164
java.util.List<Object> symbols;
160165
try {
161166
symbols =

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,19 @@ public CommandInputParameterImpl(
287287
id = null;
288288
}
289289

290+
Boolean __original_is_null = id == null;
290291
if (id == null) {
291292
if (__docRoot != null) {
292293
id = java.util.Optional.of(__docRoot);
293294
} else {
294295
id = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
295296
}
296297
}
297-
__baseUri = (String) id.orElse(null);
298+
if (__original_is_null) {
299+
__baseUri = __baseUri_;
300+
} else {
301+
__baseUri = (String) id.orElse(null);
302+
}
298303
java.util.Optional<String> label;
299304

300305
if (__doc.containsKey("label")) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,19 @@ public CommandInputRecordSchemaImpl(
148148
name = null;
149149
}
150150

151+
Boolean __original_is_null = name == null;
151152
if (name == null) {
152153
if (__docRoot != null) {
153154
name = java.util.Optional.of(__docRoot);
154155
} else {
155156
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
156157
}
157158
}
158-
__baseUri = (String) name.orElse(null);
159+
if (__original_is_null) {
160+
__baseUri = __baseUri_;
161+
} else {
162+
__baseUri = (String) name.orElse(null);
163+
}
159164
java.util.Optional<java.util.List<Object>> fields;
160165

161166
if (__doc.containsKey("fields")) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,14 +379,19 @@ public CommandLineToolImpl(
379379
id = null;
380380
}
381381

382+
Boolean __original_is_null = id == null;
382383
if (id == null) {
383384
if (__docRoot != null) {
384385
id = java.util.Optional.of(__docRoot);
385386
} else {
386387
id = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
387388
}
388389
}
389-
__baseUri = (String) id.orElse(null);
390+
if (__original_is_null) {
391+
__baseUri = __baseUri_;
392+
} else {
393+
__baseUri = (String) id.orElse(null);
394+
}
390395
java.util.Optional<String> label;
391396

392397
if (__doc.containsKey("label")) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,19 @@ public CommandOutputArraySchemaImpl(
136136
name = null;
137137
}
138138

139+
Boolean __original_is_null = name == null;
139140
if (name == null) {
140141
if (__docRoot != null) {
141142
name = java.util.Optional.of(__docRoot);
142143
} else {
143144
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
144145
}
145146
}
146-
__baseUri = (String) name.orElse(null);
147+
if (__original_is_null) {
148+
__baseUri = __baseUri_;
149+
} else {
150+
__baseUri = (String) name.orElse(null);
151+
}
147152
Object items;
148153
try {
149154
items =

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,19 @@ public CommandOutputEnumSchemaImpl(
136136
name = null;
137137
}
138138

139+
Boolean __original_is_null = name == null;
139140
if (name == null) {
140141
if (__docRoot != null) {
141142
name = java.util.Optional.of(__docRoot);
142143
} else {
143144
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
144145
}
145146
}
146-
__baseUri = (String) name.orElse(null);
147+
if (__original_is_null) {
148+
__baseUri = __baseUri_;
149+
} else {
150+
__baseUri = (String) name.orElse(null);
151+
}
147152
java.util.List<Object> symbols;
148153
try {
149154
symbols =

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,19 @@ public CommandOutputParameterImpl(
225225
id = null;
226226
}
227227

228+
Boolean __original_is_null = id == null;
228229
if (id == null) {
229230
if (__docRoot != null) {
230231
id = java.util.Optional.of(__docRoot);
231232
} else {
232233
id = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
233234
}
234235
}
235-
__baseUri = (String) id.orElse(null);
236+
if (__original_is_null) {
237+
__baseUri = __baseUri_;
238+
} else {
239+
__baseUri = (String) id.orElse(null);
240+
}
236241
java.util.Optional<String> label;
237242

238243
if (__doc.containsKey("label")) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,19 @@ public CommandOutputRecordSchemaImpl(
136136
name = null;
137137
}
138138

139+
Boolean __original_is_null = name == null;
139140
if (name == null) {
140141
if (__docRoot != null) {
141142
name = java.util.Optional.of(__docRoot);
142143
} else {
143144
name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
144145
}
145146
}
146-
__baseUri = (String) name.orElse(null);
147+
if (__original_is_null) {
148+
__baseUri = __baseUri_;
149+
} else {
150+
__baseUri = (String) name.orElse(null);
151+
}
147152
java.util.Optional<java.util.List<Object>> fields;
148153

149154
if (__doc.containsKey("fields")) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,19 @@ public ExpressionToolImpl(
256256
id = null;
257257
}
258258

259+
Boolean __original_is_null = id == null;
259260
if (id == null) {
260261
if (__docRoot != null) {
261262
id = java.util.Optional.of(__docRoot);
262263
} else {
263264
id = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
264265
}
265266
}
266-
__baseUri = (String) id.orElse(null);
267+
if (__original_is_null) {
268+
__baseUri = __baseUri_;
269+
} else {
270+
__baseUri = (String) id.orElse(null);
271+
}
267272
java.util.Optional<String> label;
268273

269274
if (__doc.containsKey("label")) {

0 commit comments

Comments
 (0)