Skip to content

Commit 1598e41

Browse files
mr-cmr-c
committed
[Ss]avable→[Ss]aveable
1 parent c7772d2 commit 1598e41

13 files changed

+47
-44
lines changed

‎schema_salad/dotnet/util/Loaders/RecordLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace ${project_name};
44

5-
internal class RecordLoader<T> : ILoader<T> where T : ISavable
5+
internal class RecordLoader<T> : ILoader<T> where T : ISaveable
66
{
77
public T Load(in object doc, in string baseUri, in LoadingOptions loadingOptions, in string? docRoot = null)
88
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using OneOf;
44
using OneOf.Types;
55

6-
public interface ISavable
6+
public interface ISaveable
77
{
8-
public static abstract ISavable FromDoc(object doc, string baseUri, LoadingOptions loadingOptions, string? docRoot = null);
8+
public static abstract ISaveable FromDoc(object doc, string baseUri, LoadingOptions loadingOptions, string? docRoot = null);
99
public abstract Dictionary<object, object> Save(bool top, string baseUrl, bool relativeUris);
1010

1111
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
3131
val = val.ToString()!;
3232
}
3333

34-
if (val is ISavable valSaveable)
34+
if (val is ISaveable valSaveable)
3535
{
3636
return valSaveable.Save(top, baseurl, relativeUris);
3737
}

‎schema_salad/dotnet_codegen.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def begin_class(
230230
231231
namespace {package};
232232
{docstring}
233-
public class {cls} : {current_interface}, ISavable
233+
public class {cls} : {current_interface}, ISaveable
234234
{{
235235
readonly LoadingOptions loadingOptions;
236236
@@ -257,7 +257,7 @@ def begin_class(
257257
)
258258
self.current_loader.write(
259259
"""
260-
public static ISavable FromDoc(object doc__, string baseUri, LoadingOptions loadingOptions,
260+
public static ISaveable FromDoc(object doc__, string baseUri, LoadingOptions loadingOptions,
261261
string? docRoot = null)
262262
{
263263
List<ValidationException> errors = new();
@@ -717,7 +717,7 @@ def declare_field(
717717
if fieldtype.is_uri:
718718
self.current_serializer.write(
719719
"""
720-
object? {safename}Val = ISavable.SaveRelativeUri({safename}, {scoped_id},
720+
object? {safename}Val = ISaveable.SaveRelativeUri({safename}, {scoped_id},
721721
relativeUris, {ref_scope}, (string){base_url}!);
722722
if ({safename}Val is not null)
723723
{{
@@ -734,7 +734,7 @@ def declare_field(
734734
else:
735735
self.current_serializer.write(
736736
"""
737-
object? {safename}Val = ISavable.Save({safename},
737+
object? {safename}Val = ISaveable.Save({safename},
738738
false, (string){base_url}!, relativeUris);
739739
if ({safename}Val is not null)
740740
{{

‎schema_salad/java/main_utils/RecordLoader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.lang.reflect.Constructor;
44
import java.lang.reflect.InvocationTargetException;
55

6-
public class RecordLoader<T extends Savable> implements Loader<T> {
7-
private final Class<? extends T> savableClass;
6+
public class RecordLoader<T extends Saveable> implements Loader<T> {
7+
private final Class<? extends T> saveableClass;
88

9-
public RecordLoader(final Class<? extends T> savableClass) {
10-
this.savableClass = savableClass;
9+
public RecordLoader(final Class<? extends T> saveableClass) {
10+
this.saveableClass = saveableClass;
1111
}
1212

1313
public T load(
@@ -18,7 +18,7 @@ public T load(
1818
Loader.validateOfJavaType(java.util.Map.class, doc);
1919
try {
2020
final Constructor<? extends T> constructor =
21-
this.savableClass.getConstructor(
21+
this.saveableClass.getConstructor(
2222
new Class[] {Object.class, String.class, LoadingOptions.class, String.class});
2323
final T ret = constructor.newInstance(doc, baseUri, loadingOptions, docRoot);
2424
return ret;

‎schema_salad/java/main_utils/SavableImpl.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ${package}.utils;
22

3-
public interface Savable {
3+
public interface Saveable {
44
// TODO: implement writable interface
55
// public abstract void save(boolean top, String baseUrl, boolean relativeUris);
66
}

‎schema_salad/java/main_utils/SaveableImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package ${package}.utils;
2+
3+
public class SaveableImpl implements Saveable {
4+
public SaveableImpl(Object doc, String baseUri, LoadingOptions loadingOptions, String docRoot) {}
5+
}

‎schema_salad/java_codegen.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ def begin_class(
203203
ext = (
204204
"extends "
205205
+ ", ".join(self.interface_name(e) for e in extends)
206-
+ ", Savable"
206+
+ ", Saveable"
207207
)
208208
else:
209-
ext = "extends Savable"
209+
ext = "extends Saveable"
210210
f.write(
211211
"""// Copyright Common Workflow Language project contributors
212212
"""
@@ -234,7 +234,7 @@ def begin_class(
234234
235235
package {package};
236236
237-
import {package}.utils.Savable;
237+
import {package}.utils.Saveable;
238238
239239
/**
240240
{interface_doc_str}
@@ -283,13 +283,13 @@ def begin_class(
283283
import {package}.utils.LoaderInstances;
284284
import {package}.utils.LoadingOptions;
285285
import {package}.utils.LoadingOptionsBuilder;
286-
import {package}.utils.SavableImpl;
286+
import {package}.utils.SaveableImpl;
287287
import {package}.utils.ValidationException;
288288
289289
/**
290290
{class_doc_str}
291291
*/
292-
public class {cls}Impl extends SavableImpl implements {cls} {{
292+
public class {cls}Impl extends SaveableImpl implements {cls} {{
293293
private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build();
294294
private java.util.Map<String, Object> extensionFields_ =
295295
new java.util.HashMap<String, Object>();

‎schema_salad/metaschema.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def graph(self) -> Graph:
135135
return graph
136136

137137

138-
class Savable(ABC):
138+
class Saveable(ABC):
139139
"""Mark classes than have a save() and fromDoc() function."""
140140

141141
@classmethod
@@ -146,7 +146,7 @@ def fromDoc(
146146
baseuri: str,
147147
loadingOptions: LoadingOptions,
148148
docRoot: Optional[str] = None,
149-
) -> "Savable":
149+
) -> "Saveable":
150150
"""Construct this object from the result of yaml.load()."""
151151

152152
@abstractmethod
@@ -180,12 +180,12 @@ def load_field(val, fieldtype, baseuri, loadingOptions):
180180

181181

182182
def save(
183-
val: Optional[Union[Savable, MutableSequence[Savable]]],
183+
val: Optional[Union[Saveable, MutableSequence[Saveable]]],
184184
top: bool = True,
185185
base_url: str = "",
186186
relative_uris: bool = True,
187187
) -> save_type:
188-
if isinstance(val, Savable):
188+
if isinstance(val, Saveable):
189189
return val.save(top=top, base_url=base_url, relative_uris=relative_uris)
190190
if isinstance(val, MutableSequence):
191191
return [
@@ -419,7 +419,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
419419

420420
class _RecordLoader(_Loader):
421421
def __init__(self, classtype):
422-
# type: (Type[Savable]) -> None
422+
# type: (Type[Saveable]) -> None
423423
self.classtype = classtype
424424

425425
def load(self, doc, baseuri, loadingOptions, docRoot=None):
@@ -734,7 +734,7 @@ def parser_info() -> str:
734734
return "org.w3id.cwl.salad"
735735

736736

737-
class Documented(Savable):
737+
class Documented(Saveable):
738738
pass
739739

740740

@@ -896,7 +896,7 @@ def save(
896896
attrs = frozenset(["doc", "name", "type"])
897897

898898

899-
class RecordSchema(Savable):
899+
class RecordSchema(Saveable):
900900
def __init__(
901901
self,
902902
type: Any,
@@ -1016,7 +1016,7 @@ def save(
10161016
attrs = frozenset(["fields", "type"])
10171017

10181018

1019-
class EnumSchema(Savable):
1019+
class EnumSchema(Saveable):
10201020
"""
10211021
Define an enumerated type.
10221022
@@ -1138,7 +1138,7 @@ def save(
11381138
attrs = frozenset(["symbols", "type"])
11391139

11401140

1141-
class ArraySchema(Savable):
1141+
class ArraySchema(Saveable):
11421142
def __init__(
11431143
self,
11441144
items: Any,
@@ -1255,7 +1255,7 @@ def save(
12551255
attrs = frozenset(["items", "type"])
12561256

12571257

1258-
class JsonldPredicate(Savable):
1258+
class JsonldPredicate(Saveable):
12591259
"""
12601260
Attached to a record field to define how the parent record field is handled for
12611261
URI resolution and JSON-LD context generation.
@@ -1638,7 +1638,7 @@ def save(
16381638
)
16391639

16401640

1641-
class SpecializeDef(Savable):
1641+
class SpecializeDef(Saveable):
16421642
def __init__(
16431643
self,
16441644
specializeFrom: Any,
@@ -1757,7 +1757,7 @@ def save(
17571757
attrs = frozenset(["specializeFrom", "specializeTo"])
17581758

17591759

1760-
class NamedType(Savable):
1760+
class NamedType(Saveable):
17611761
pass
17621762

17631763

‎schema_salad/python_codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def begin_class(
153153
if extends:
154154
ext = ", ".join(self.safe_name(e) for e in extends)
155155
else:
156-
ext = "Savable"
156+
ext = "Saveable"
157157

158158
self.out.write(fmt(f"class {classname}({ext}):\n pass", 0)[:-9])
159159
# make a valid class for Black, but then trim off the "pass"

0 commit comments

Comments
 (0)