snakeyaml is always doubles instead of floats

Author: mr-c

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

@@ -253,7 +253,7 @@ public ResourceRequirementImpl(
       try {
         coresMin =
             LoaderInstances
-                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader
+                .union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_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/utils/LoaderInstances.java

@@ -8,7 +8,6 @@ public class LoaderInstances {
   public static Loader<String> StringInstance = new PrimitiveLoader<String>(String.class);
   public static Loader<Integer> IntegerInstance = new PrimitiveLoader<Integer>(Integer.class);
   public static Loader<Long> LongInstance = new PrimitiveLoader<Long>(Long.class);
-  public static Loader<Float> FloatInstance = new PrimitiveLoader<Float>(Float.class);
   public static Loader<Double> DoubleInstance = new PrimitiveLoader<Double>(Double.class);
   public static Loader<Boolean> BooleanInstance = new PrimitiveLoader<Boolean>(Boolean.class);
   public static Loader<Object> NullInstance = new NullLoader();
@@ -242,7 +241,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_IntegerInstance_or_LongInstance_or_FloatInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance, FloatInstance, ExpressionLoader });
+  public static Loader<Object> union_of_NullInstance_or_IntegerInstance_or_LongInstance_or_DoubleInstance_or_ExpressionLoader = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance, DoubleInstance, 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 });

src/test/java/org/w3id/cwl/cwl1_2/utils/ExamplesTest.java

@@ -942,7 +942,7 @@ public void testvalid_updatedir_inplaceByMap() throws Exception {
     doc = (java.util.Map<String, Object>) YamlUtils.mapFromString(yaml);
     RootLoader.loadDocument(doc, url.toString());
   }
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_storage_floatByString() throws Exception {
     String path = java.nio.file.Paths.get(".").toAbsolutePath().normalize().toString();
     String baseUri = Uris.fileUri(path) + "/";
@@ -952,14 +952,14 @@ public void testvalid_storage_floatByString() throws Exception {
     RootLoader.loadDocument(yaml, baseUri);
   }
 
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_storage_floatByPath() throws Exception {
     java.net.URL url = getClass().getResource("valid_storage_float.cwl");
     java.nio.file.Path resPath = java.nio.file.Paths.get(url.toURI());
     RootLoader.loadDocument(resPath);
   }
 
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_storage_floatByMap() throws Exception {
     java.net.URL url = getClass().getResource("valid_storage_float.cwl");
     java.nio.file.Path resPath = java.nio.file.Paths.get(url.toURI());
@@ -4400,7 +4400,7 @@ public void testvalid_iwd_container_entryname2ByMap() throws Exception {
     doc = (java.util.Map<String, Object>) YamlUtils.mapFromString(yaml);
     RootLoader.loadDocument(doc, url.toString());
   }
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_cores_floatByString() throws Exception {
     String path = java.nio.file.Paths.get(".").toAbsolutePath().normalize().toString();
     String baseUri = Uris.fileUri(path) + "/";
@@ -4410,14 +4410,14 @@ public void testvalid_cores_floatByString() throws Exception {
     RootLoader.loadDocument(yaml, baseUri);
   }
 
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_cores_floatByPath() throws Exception {
     java.net.URL url = getClass().getResource("valid_cores_float.cwl");
     java.nio.file.Path resPath = java.nio.file.Paths.get(url.toURI());
     RootLoader.loadDocument(resPath);
   }
 
-  @org.junit.Test(expected = ValidationException.class)
+  @org.junit.Test
   public void testvalid_cores_floatByMap() throws Exception {
     java.net.URL url = getClass().getResource("valid_cores_float.cwl");
     java.nio.file.Path resPath = java.nio.file.Paths.get(url.toURI());