fix 8 more tests

Author: mr-c

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

@@ -204,7 +204,7 @@ public interface File extends Savable {
    * Optional file size   * </BLOCKQUOTE>
    */
 
-  java.util.Optional<Long> getSize();
+  Object getSize();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#secondaryFiles</I><BR>
    * <BLOCKQUOTE>

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

@@ -246,15 +246,15 @@ public java.util.Optional<String> getChecksum() {
     return this.checksum;
   }
 
-  private java.util.Optional<Long> size;
+  private Object size;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#File/size</I><BR>
    * <BLOCKQUOTE>
    * Optional file size   * </BLOCKQUOTE>
    */
 
-  public java.util.Optional<Long> getSize() {
+  public Object getSize() {
     return this.size;
   }
 
@@ -495,13 +495,13 @@ public FileImpl(
     } else {
       checksum = null;
     }
-    java.util.Optional<Long> size;
+    Object size;
 
     if (__doc.containsKey("size")) {
       try {
         size =
             LoaderInstances
-                .optional_LongInstance
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance
                 .loadField(__doc.get("size"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         size = null; // won't be used but prevents compiler from complaining.
@@ -574,7 +574,7 @@ public FileImpl(
     this.nameroot = (java.util.Optional<String>) nameroot;
     this.nameext = (java.util.Optional<String>) nameext;
     this.checksum = (java.util.Optional<String>) checksum;
-    this.size = (java.util.Optional<Long>) size;
+    this.size = (Object) size;
     this.secondaryFiles = (java.util.Optional<java.util.List<Object>>) secondaryFiles;
     this.format = (java.util.Optional<String>) format;
     this.contents = (java.util.Optional<String>) contents;

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

@@ -253,7 +253,7 @@ public ResourceRequirementImpl(
       try {
         coresMin =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("coresMin"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         coresMin = null; // won't be used but prevents compiler from complaining.
@@ -270,7 +270,7 @@ public ResourceRequirementImpl(
       try {
         coresMax =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("coresMax"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         coresMax = null; // won't be used but prevents compiler from complaining.
@@ -287,7 +287,7 @@ public ResourceRequirementImpl(
       try {
         ramMin =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("ramMin"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         ramMin = null; // won't be used but prevents compiler from complaining.
@@ -304,7 +304,7 @@ public ResourceRequirementImpl(
       try {
         ramMax =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("ramMax"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         ramMax = null; // won't be used but prevents compiler from complaining.
@@ -321,7 +321,7 @@ public ResourceRequirementImpl(
       try {
         tmpdirMin =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("tmpdirMin"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         tmpdirMin = null; // won't be used but prevents compiler from complaining.
@@ -338,7 +338,7 @@ public ResourceRequirementImpl(
       try {
         tmpdirMax =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("tmpdirMax"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         tmpdirMax = null; // won't be used but prevents compiler from complaining.
@@ -355,7 +355,7 @@ public ResourceRequirementImpl(
       try {
         outdirMin =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("outdirMin"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         outdirMin = null; // won't be used but prevents compiler from complaining.
@@ -372,7 +372,7 @@ public ResourceRequirementImpl(
       try {
         outdirMax =
             LoaderInstances
-                .union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
                 .loadField(__doc.get("outdirMax"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         outdirMax = null; // won't be used but prevents compiler from complaining.

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

@@ -93,7 +93,7 @@ public ToolTimeLimitImpl(
     try {
       timelimit =
           LoaderInstances
-              .union_of_LongInstance_or_ExpressionLoader
+              .union_of_IntegerInstance_or_LongInstance_or_ExpressionLoader
               .loadField(__doc.get("timelimit"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       timelimit = null; // won't be used but prevents compiler from complaining.

src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java

@@ -125,7 +125,7 @@ public class LoaderInstances {
   public static Loader<File_class> uri_File_class_False_True_None = new UriLoader(File_class, false, true, null);
   public static Loader<java.util.Optional<String>> optional_StringInstance = new OptionalLoader(StringInstance);
   public static Loader<java.util.Optional<String>> uri_optional_StringInstance_False_False_None = new UriLoader(optional_StringInstance, false, false, null);
-  public static Loader<java.util.Optional<Long>> optional_LongInstance = new OptionalLoader(LongInstance);
+  public static Loader<Object> union_of_NullInstance_or_IntegerInstance_or_LongInstance = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance });
   public static Loader<Object> union_of_File_or_Directory = new UnionLoader(new Loader[] { File, Directory });
   public static Loader<java.util.List<Object>> array_of_union_of_File_or_Directory = new ArrayLoader(union_of_File_or_Directory);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_union_of_File_or_Directory = new OptionalLoader(array_of_union_of_File_or_Directory);
@@ -242,7 +242,7 @@ public class LoaderInstances {
   public static Loader<ShellCommandRequirement_class> uri_ShellCommandRequirement_class_False_True_None = new UriLoader(ShellCommandRequirement_class, false, true, null);
   public static Loader<ResourceRequirement_class> ResourceRequirement_class = new EnumLoader(ResourceRequirement_class.class);
   public static Loader<ResourceRequirement_class> uri_ResourceRequirement_class_False_True_None = new UriLoader(ResourceRequirement_class, false, true, null);
-  public static Loader<Object> union_of_NullInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, LongInstance, FloatInstance, ExpressionLoader });
+  public static Loader<Object> union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance, FloatInstance, ExpressionLoader });
   public static Loader<WorkReuse_class> WorkReuse_class = new EnumLoader(WorkReuse_class.class);
   public static Loader<WorkReuse_class> uri_WorkReuse_class_False_True_None = new UriLoader(WorkReuse_class, false, true, null);
   public static Loader<Object> union_of_BooleanInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { BooleanInstance, ExpressionLoader });
@@ -252,7 +252,7 @@ public class LoaderInstances {
   public static Loader<InplaceUpdateRequirement_class> uri_InplaceUpdateRequirement_class_False_True_None = new UriLoader(InplaceUpdateRequirement_class, false, true, null);
   public static Loader<ToolTimeLimit_class> ToolTimeLimit_class = new EnumLoader(ToolTimeLimit_class.class);
   public static Loader<ToolTimeLimit_class> uri_ToolTimeLimit_class_False_True_None = new UriLoader(ToolTimeLimit_class, false, true, null);
-  public static Loader<Object> union_of_LongInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { LongInstance, ExpressionLoader });
+  public static Loader<Object> union_of_IntegerInstance_or_LongInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { IntegerInstance, LongInstance, ExpressionLoader });
   public static Loader<java.util.Optional<InputBinding>> optional_InputBinding = new OptionalLoader(InputBinding);
   public static Loader<java.util.List<WorkflowInputParameter>> array_of_WorkflowInputParameter = new ArrayLoader(WorkflowInputParameter);
   public static Loader<java.util.List<Object>> idmap_inputs_array_of_WorkflowInputParameter = new IdMapLoader(array_of_WorkflowInputParameter, "id", "type");