diff --git a/schema_salad/java/main_utils/UnionLoader.java b/schema_salad/java/main_utils/UnionLoader.java index f8a24b58..361d75de 100644 --- a/schema_salad/java/main_utils/UnionLoader.java +++ b/schema_salad/java/main_utils/UnionLoader.java @@ -5,10 +5,10 @@ import java.util.List; public class UnionLoader implements Loader { - private final List alternates; + private final ArrayList alternates; public UnionLoader(List alternates) { - this.alternates = alternates; + this.alternates = new ArrayList(alternates); } public UnionLoader(Loader[] alternates) { @@ -19,7 +19,7 @@ public void addLoaders(List loaders) { this.alternates.addAll(loaders); } - public void addLoaders(Loader[] loaders) { + public void addLoaders(Loader[] loaders) { this.addLoaders(Arrays.asList(loaders)); } diff --git a/schema_salad/java_codegen.py b/schema_salad/java_codegen.py index 09790842..aa91419e 100644 --- a/schema_salad/java_codegen.py +++ b/schema_salad/java_codegen.py @@ -464,7 +464,7 @@ def type_loader( init="new MapLoader({}, {}, {})".format( i.name, ( - f"'{container}'" if container is not None else self.to_java(None) + f'"{container}"' if container is not None else self.to_java(None) ), # noqa: B907 self.to_java(no_link_check), ), @@ -488,7 +488,7 @@ def type_loader( clazz=fqclass, ext="Impl" if not is_abstract else "", container=( - f"'{container}'" + f'"{container}"' if container is not None else self.to_java(None) # noqa: B907 ),