common-workflow-language · mr-c · Sep 1, 2022 · Jun 26, 2022 · Sep 1, 2022
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/salad#ArraySchema</I><BR>This interface is implemented by {@link ArraySchemaImpl}<BR>
  */
-public interface ArraySchema extends Savable {
+public interface ArraySchema extends Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#items</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/salad#ArraySchema</I><BR>
  */
-public class ArraySchemaImpl extends SavableImpl implements ArraySchema {
+public class ArraySchemaImpl extends SaveableImpl implements ArraySchema {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLType.java b/src/main/java/org/w3id/cwl/cwl1_2/CWLType.java
@@ -17,10 +17,17 @@
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 public enum CWLType {
+  NULL("null"),
+  BOOLEAN("boolean"),
+  INT("int"),
+  LONG("long"),
+  FLOAT("float"),
+  DOUBLE("double"),
+  STRING("string"),
   FILE("File"),
   DIRECTORY("Directory");
 
-  private static String[] symbols = new String[] {"File", "Directory"};
+  private static String[] symbols = new String[] {"null", "boolean", "int", "long", "float", "double", "string", "File", "Directory"};
   private String docVal;
 
   private CWLType(final String docVal) {

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputArraySchema</I><BR>This interface is implemented by {@link CommandInputArraySchemaImpl}<BR>
  */
-public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Savable {
+public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#IOSchema/name</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputArraySchema</I><BR>
  */
-public class CommandInputArraySchemaImpl extends SavableImpl implements CommandInputArraySchema {
+public class CommandInputArraySchemaImpl extends SaveableImpl implements CommandInputArraySchema {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputEnumSchema</I><BR>This interface is implemented by {@link CommandInputEnumSchemaImpl}<BR>
  */
-public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Savable {
+public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#IOSchema/name</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputEnumSchema</I><BR>
  */
-public class CommandInputEnumSchemaImpl extends SavableImpl implements CommandInputEnumSchema {
+public class CommandInputEnumSchemaImpl extends SaveableImpl implements CommandInputEnumSchema {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java
@@ -14,13 +14,13 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputParameter</I><BR>This interface is implemented by {@link CommandInputParameterImpl}<BR> <BLOCKQUOTE>
  An input parameter for a CommandLineTool. </BLOCKQUOTE>
  */
-public interface CommandInputParameter extends InputParameter, Savable {
+public interface CommandInputParameter extends InputParameter, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Identified/id</I><BR>
    * <BLOCKQUOTE>
@@ -158,7 +158,7 @@ public interface CommandInputParameter extends InputParameter, Savable {
    *    * </BLOCKQUOTE>
    */
 
-  java.util.Optional<Object> getDefault();
+  Object getDefault();
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java
@@ -17,14 +17,14 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputParameter</I><BR> <BLOCKQUOTE>
  An input parameter for a CommandLineTool. </BLOCKQUOTE>
  */
-public class CommandInputParameterImpl extends SavableImpl implements CommandInputParameter {
+public class CommandInputParameterImpl extends SaveableImpl implements CommandInputParameter {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();
@@ -196,7 +196,7 @@ public java.util.Optional<LoadListingEnum> getLoadListing() {
     return this.loadListing;
   }
 
-  private java.util.Optional<Object> default_;
+  private Object default_;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#default</I><BR>
@@ -208,7 +208,7 @@ public java.util.Optional<LoadListingEnum> getLoadListing() {
    *    * </BLOCKQUOTE>
    */
 
-  public java.util.Optional<Object> getDefault() {
+  public Object getDefault() {
     return this.default_;
   }
 
@@ -419,13 +419,13 @@ public CommandInputParameterImpl(
     } else {
       loadListing = null;
     }
-    java.util.Optional<Object> default_;
+    Object default_;
 
     if (__doc.containsKey("default")) {
       try {
         default_ =
             LoaderInstances
-                .optional_AnyInstance
+                .union_of_NullInstance_or_File_or_Directory_or_AnyInstance
                 .loadField(__doc.get("default"), __baseUri, __loadingOptions);
       } catch (ValidationException e) {
         default_ = null; // won't be used but prevents compiler from complaining.
@@ -475,7 +475,7 @@ public CommandInputParameterImpl(
     this.format = (Object) format;
     this.loadContents = (java.util.Optional<Boolean>) loadContents;
     this.loadListing = (java.util.Optional<LoadListingEnum>) loadListing;
-    this.default_ = (java.util.Optional<Object>) default_;
+    this.default_ = (Object) default_;
     this.type = (Object) type;
     this.inputBinding = (java.util.Optional<CommandLineBinding>) inputBinding;
   }

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputRecordField</I><BR>This interface is implemented by {@link CommandInputRecordFieldImpl}<BR>
  */
-public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Savable {
+public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#RecordField/name</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputRecordField</I><BR>
  */
-public class CommandInputRecordFieldImpl extends SavableImpl implements CommandInputRecordField {
+public class CommandInputRecordFieldImpl extends SaveableImpl implements CommandInputRecordField {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputRecordSchema</I><BR>This interface is implemented by {@link CommandInputRecordSchemaImpl}<BR>
  */
-public interface CommandInputRecordSchema extends InputRecordSchema, CommandInputSchema, CommandLineBindable, Savable {
+public interface CommandInputRecordSchema extends InputRecordSchema, CommandInputSchema, CommandLineBindable, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#IOSchema/name</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandInputRecordSchema</I><BR>
  */
-public class CommandInputRecordSchemaImpl extends SavableImpl implements CommandInputRecordSchema {
+public class CommandInputRecordSchemaImpl extends SaveableImpl implements CommandInputRecordSchema {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputSchema.java
@@ -14,10 +14,10 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandInputSchema</I><BR>
  */
-public interface CommandInputSchema extends Savable {
+public interface CommandInputSchema extends Saveable {
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindable.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindable.java
@@ -14,12 +14,12 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandLineBindable</I><BR>This interface is implemented by {@link CommandLineBindableImpl}<BR>
  */
-public interface CommandLineBindable extends Savable {
+public interface CommandLineBindable extends Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#CommandLineBindable/inputBinding</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindableImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindableImpl.java
@@ -17,13 +17,13 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
 * Auto-generated class implementation for <I>https://w3id.org/cwl/cwl#CommandLineBindable</I><BR>
  */
-public class CommandLineBindableImpl extends SavableImpl implements CommandLineBindable {
+public class CommandLineBindableImpl extends SaveableImpl implements CommandLineBindable {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java
@@ -14,7 +14,7 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandLineBinding</I><BR>This interface is implemented by {@link CommandLineBindingImpl}<BR> <BLOCKQUOTE>
@@ -55,7 +55,7 @@
    - **null**: Add nothing.
   </BLOCKQUOTE>
  */
-public interface CommandLineBinding extends InputBinding, Savable {
+public interface CommandLineBinding extends InputBinding, Saveable {
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#InputBinding/loadContents</I><BR>
    * <BLOCKQUOTE>

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java
@@ -17,7 +17,7 @@
 import org.w3id.cwl.cwl1_2.utils.LoaderInstances;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptions;
 import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder;
-import org.w3id.cwl.cwl1_2.utils.SavableImpl;
+import org.w3id.cwl.cwl1_2.utils.SaveableImpl;
 import org.w3id.cwl.cwl1_2.utils.ValidationException;
 
 /**
@@ -59,7 +59,7 @@
    - **null**: Add nothing.
   </BLOCKQUOTE>
  */
-public class CommandLineBindingImpl extends SavableImpl implements CommandLineBinding {
+public class CommandLineBindingImpl extends SaveableImpl implements CommandLineBinding {
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java
@@ -14,18 +14,22 @@
 
 package org.w3id.cwl.cwl1_2;
 
-import org.w3id.cwl.cwl1_2.utils.Savable;
+import org.w3id.cwl.cwl1_2.utils.Saveable;
 
 /**
 * Auto-generated interface for <I>https://w3id.org/cwl/cwl#CommandLineTool</I><BR>This interface is implemented by {@link CommandLineToolImpl}<BR> <BLOCKQUOTE>
  This defines the schema of the CWL Command Line Tool Description document.
   </BLOCKQUOTE>
  */
-public interface CommandLineTool extends Process, Savable {
+public interface CommandLineTool extends Process, Saveable {
   /**
-   * Getter for property <I>https://w3id.org/cwl/cwl#Identified/id</I><BR>
+   * Getter for property <I>https://w3id.org/cwl/cwl#Process/id</I><BR>
    * <BLOCKQUOTE>
-   * The unique identifier for this object.   * </BLOCKQUOTE>
+   * The unique identifier for this object.
+   * 
+   * Only useful for `$graph` at `Process` level. Should not be exposed
+   * to users in graphical or terminal user interfaces.
+   *    * </BLOCKQUOTE>
    */
 
   java.util.Optional<String> getId();
@@ -193,6 +197,10 @@ public interface CommandLineTool extends Process, Savable {
    * Capture the command's standard output stream to a file written to
    * the designated output directory.
    * 
+   * If the `CommandLineTool` contains logically chained commands
+   * (e.g. `echo a && echo b`) `stdout` must include the output of
+   * every command.
+   * 
    * If `stdout` is a string, it specifies the file name to use.
    * 
    * If `stdout` is an expression, the expression is evaluated and must