@@ -36,15 +36,15 @@ public java.util.Map<String, Object> getExtensionFields() {
3636 return this .extensionFields_ ;
3737 }
3838
39- private java . util . Optional < String > id ;
39+ private String id ;
4040
4141 /**
42- * Getter for property <I>https://w3id.org/cwl/cwl#Identified /id</I><BR>
42+ * Getter for property <I>https://w3id.org/cwl/cwl#Parameter /id</I><BR>
4343 * <BLOCKQUOTE>
44- * The unique identifier for this object . * </BLOCKQUOTE>
44+ * The unique identifier for this Parameter . * </BLOCKQUOTE>
4545 */
4646
47- public java . util . Optional < String > getId () {
47+ public String getId () {
4848 return this .id ;
4949 }
5050
@@ -262,13 +262,13 @@ public OperationInputParameterImpl(
262262 if (__loadingOptions != null ) {
263263 this .loadingOptions_ = __loadingOptions ;
264264 }
265- java . util . Optional < String > id ;
265+ String id ;
266266
267267 if (__doc .containsKey ("id" )) {
268268 try {
269269 id =
270270 LoaderInstances
271- .uri_optional_StringInstance_True_False_None_None
271+ .uri_StringInstance_True_False_None_None
272272 .loadField (__doc .get ("id" ), __baseUri , __loadingOptions );
273273 } catch (ValidationException e ) {
274274 id = null ; // won't be used but prevents compiler from complaining.
@@ -280,19 +280,14 @@ public OperationInputParameterImpl(
280280 id = null ;
281281 }
282282
283- Boolean __original_is_null = id == null ;
284283 if (id == null ) {
285284 if (__docRoot != null ) {
286- id = java . util . Optional . of ( __docRoot ) ;
285+ id = __docRoot ;
287286 } else {
288- id = java . util . Optional . of ( "_:" + java . util . UUID . randomUUID (). toString () );
287+ throw new ValidationException ( "Missing id" );
289288 }
290289 }
291- if (__original_is_null ) {
292- __baseUri = __baseUri_ ;
293- } else {
294- __baseUri = (String ) id .orElse (null );
295- }
290+ __baseUri = (String ) id ;
296291 java .util .Optional <String > label ;
297292
298293 if (__doc .containsKey ("label" )) {
@@ -447,7 +442,7 @@ public OperationInputParameterImpl(
447442 this .secondaryFiles = (Object ) secondaryFiles ;
448443 this .streamable = (java .util .Optional <Boolean >) streamable ;
449444 this .doc = (Object ) doc ;
450- this .id = (java . util . Optional < String > ) id ;
445+ this .id = (String ) id ;
451446 this .format = (Object ) format ;
452447 this .loadContents = (java .util .Optional <Boolean >) loadContents ;
453448 this .loadListing = (java .util .Optional <LoadListingEnum >) loadListing ;
0 commit comments