[Ss]avable→[Ss]aveable

Author: mr-c

schema_salad/dotnet/util/Loaders/RecordLoader.cs

@@ -2,7 +2,7 @@
 
 namespace ${project_name};
 
-internal class RecordLoader<T> : ILoader<T> where T : ISavable
+internal class RecordLoader<T> : ILoader<T> where T : ISaveable
 {
     public T Load(in object doc, in string baseUri, in LoadingOptions loadingOptions, in string? docRoot = null)
     {

schema_salad/dotnet/util/Savable.cs renamed to schema_salad/dotnet/util/Saveable.cs

@@ -3,9 +3,9 @@
 using OneOf;
 using OneOf.Types;
 
-public interface ISavable
+public interface ISaveable
 {
-    public static abstract ISavable FromDoc(object doc, string baseUri, LoadingOptions loadingOptions, string? docRoot = null);
+    public static abstract ISaveable FromDoc(object doc, string baseUri, LoadingOptions loadingOptions, string? docRoot = null);
     public abstract Dictionary<object, object> Save(bool top, string baseUrl, bool relativeUris);
 
     public static object Save(object? val_, bool top = true, string baseurl = "", bool relativeUris = true)
@@ -31,7 +31,7 @@ public static object Save(object? val_, bool top = true, string baseurl = "", bo
             val = val.ToString()!;
         }
 
-        if (val is ISavable valSaveable)
+        if (val is ISaveable valSaveable)
         {
             return valSaveable.Save(top, baseurl, relativeUris);
         }

schema_salad/dotnet_codegen.py

@@ -230,7 +230,7 @@ def begin_class(
 
 namespace {package};
 {docstring}
-public class {cls} : {current_interface}, ISavable
+public class {cls} : {current_interface}, ISaveable
 {{
     readonly LoadingOptions loadingOptions;
 
@@ -257,7 +257,7 @@ def begin_class(
         )
         self.current_loader.write(
             """
-    public static ISavable FromDoc(object doc__, string baseUri, LoadingOptions loadingOptions,
+    public static ISaveable FromDoc(object doc__, string baseUri, LoadingOptions loadingOptions,
         string? docRoot = null)
     {
         List<ValidationException> errors = new();
@@ -717,7 +717,7 @@ def declare_field(
         if fieldtype.is_uri:
             self.current_serializer.write(
                 """
-        object? {safename}Val = ISavable.SaveRelativeUri({safename}, {scoped_id},
+        object? {safename}Val = ISaveable.SaveRelativeUri({safename}, {scoped_id},
             relativeUris, {ref_scope}, (string){base_url}!);
         if ({safename}Val is not null)
         {{
@@ -734,7 +734,7 @@ def declare_field(
         else:
             self.current_serializer.write(
                 """
-        object? {safename}Val = ISavable.Save({safename},
+        object? {safename}Val = ISaveable.Save({safename},
                                         false, (string){base_url}!, relativeUris);
         if ({safename}Val is not null)
         {{

schema_salad/java/main_utils/RecordLoader.java

@@ -3,11 +3,11 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-public class RecordLoader<T extends Savable> implements Loader<T> {
-  private final Class<? extends T> savableClass;
+public class RecordLoader<T extends Saveable> implements Loader<T> {
+  private final Class<? extends T> saveableClass;
 
-  public RecordLoader(final Class<? extends T> savableClass) {
-    this.savableClass = savableClass;
+  public RecordLoader(final Class<? extends T> saveableClass) {
+    this.saveableClass = saveableClass;
   }
 
   public T load(
@@ -18,7 +18,7 @@ public T load(
     Loader.validateOfJavaType(java.util.Map.class, doc);
     try {
       final Constructor<? extends T> constructor =
-          this.savableClass.getConstructor(
+          this.saveableClass.getConstructor(
               new Class[] {Object.class, String.class, LoadingOptions.class, String.class});
       final T ret = constructor.newInstance(doc, baseUri, loadingOptions, docRoot);
       return ret;

schema_salad/java/main_utils/SavableImpl.java

@@ -1,6 +1,6 @@
 package ${package}.utils;
 
-public interface Savable {
+public interface Saveable {
   // TODO: implement writable interface
   // public abstract void save(boolean top, String baseUrl, boolean relativeUris);
 }

schema_salad/java/main_utils/Savable.java renamed to schema_salad/java/main_utils/Saveable.java

@@ -0,0 +1,5 @@
+package ${package}.utils;
+
+public class SaveableImpl implements Saveable {
+  public SaveableImpl(Object doc, String baseUri, LoadingOptions loadingOptions, String docRoot) {}
+}

schema_salad/java/main_utils/SaveableImpl.java

@@ -203,10 +203,10 @@ def begin_class(
                 ext = (
                     "extends "
                     + ", ".join(self.interface_name(e) for e in extends)
-                    + ", Savable"
+                    + ", Saveable"
                 )
             else:
-                ext = "extends Savable"
+                ext = "extends Saveable"
             f.write(
                 """// Copyright Common Workflow Language project contributors
 """
@@ -234,7 +234,7 @@ def begin_class(
 
 package {package};
 
-import {package}.utils.Savable;
+import {package}.utils.Saveable;
 
 /**
 {interface_doc_str}
@@ -283,13 +283,13 @@ def begin_class(
 import {package}.utils.LoaderInstances;
 import {package}.utils.LoadingOptions;
 import {package}.utils.LoadingOptionsBuilder;
-import {package}.utils.SavableImpl;
+import {package}.utils.SaveableImpl;
 import {package}.utils.ValidationException;
 
 /**
 {class_doc_str}
  */
-public class {cls}Impl extends SavableImpl implements {cls} {{
+public class {cls}Impl extends SaveableImpl implements {cls} {{
   private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();

schema_salad/java_codegen.py

@@ -135,7 +135,7 @@ def graph(self) -> Graph:
         return graph
 
 
-class Savable(ABC):
+class Saveable(ABC):
     """Mark classes than have a save() and fromDoc() function."""
 
     @classmethod
@@ -146,7 +146,7 @@ def fromDoc(
         baseuri: str,
         loadingOptions: LoadingOptions,
         docRoot: Optional[str] = None,
-    ) -> "Savable":
+    ) -> "Saveable":
         """Construct this object from the result of yaml.load()."""
 
     @abstractmethod
@@ -180,12 +180,12 @@ def load_field(val, fieldtype, baseuri, loadingOptions):
 
 
 def save(
-    val: Optional[Union[Savable, MutableSequence[Savable]]],
+    val: Optional[Union[Saveable, MutableSequence[Saveable]]],
     top: bool = True,
     base_url: str = "",
     relative_uris: bool = True,
 ) -> save_type:
-    if isinstance(val, Savable):
+    if isinstance(val, Saveable):
         return val.save(top=top, base_url=base_url, relative_uris=relative_uris)
     if isinstance(val, MutableSequence):
         return [
@@ -419,7 +419,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
 
 class _RecordLoader(_Loader):
     def __init__(self, classtype):
-        # type: (Type[Savable]) -> None
+        # type: (Type[Saveable]) -> None
         self.classtype = classtype
 
     def load(self, doc, baseuri, loadingOptions, docRoot=None):
@@ -734,7 +734,7 @@ def parser_info() -> str:
     return "org.w3id.cwl.salad"
 
 
-class Documented(Savable):
+class Documented(Saveable):
     pass
 
 
@@ -896,7 +896,7 @@ def save(
     attrs = frozenset(["doc", "name", "type"])
 
 
-class RecordSchema(Savable):
+class RecordSchema(Saveable):
     def __init__(
         self,
         type: Any,
@@ -1016,7 +1016,7 @@ def save(
     attrs = frozenset(["fields", "type"])
 
 
-class EnumSchema(Savable):
+class EnumSchema(Saveable):
     """
     Define an enumerated type.
 
@@ -1138,7 +1138,7 @@ def save(
     attrs = frozenset(["symbols", "type"])
 
 
-class ArraySchema(Savable):
+class ArraySchema(Saveable):
     def __init__(
         self,
         items: Any,
@@ -1255,7 +1255,7 @@ def save(
     attrs = frozenset(["items", "type"])
 
 
-class JsonldPredicate(Savable):
+class JsonldPredicate(Saveable):
     """
     Attached to a record field to define how the parent record field is handled for
     URI resolution and JSON-LD context generation.
@@ -1638,7 +1638,7 @@ def save(
     )
 
 
-class SpecializeDef(Savable):
+class SpecializeDef(Saveable):
     def __init__(
         self,
         specializeFrom: Any,
@@ -1757,7 +1757,7 @@ def save(
     attrs = frozenset(["specializeFrom", "specializeTo"])
 
 
-class NamedType(Savable):
+class NamedType(Saveable):
     pass
 
 

schema_salad/metaschema.py

@@ -153,7 +153,7 @@ def begin_class(
         if extends:
             ext = ", ".join(self.safe_name(e) for e in extends)
         else:
-            ext = "Savable"
+            ext = "Saveable"
 
         self.out.write(fmt(f"class {classname}({ext}):\n    pass", 0)[:-9])
         # make a valid class for Black, but then trim off the "pass"