Skip to content

Fixes for Java codegen #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Fixes for Java codegen #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
611ecd9
java codegen: use double quotes for string literals in generated code.
mr-c Jan 29, 2025
c6d16be
java codegen: UnionLoader.alternates needs a concrete collection type.
mr-c Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions schema_salad/java/main_utils/UnionLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import java.util.List;

public class UnionLoader implements Loader<Object> {
private final List<Loader> alternates;
private final ArrayList<Loader> alternates;

public UnionLoader(List<Loader> alternates) {
this.alternates = alternates;
this.alternates = new ArrayList<Loader>(alternates);
}

public UnionLoader(Loader[] alternates) {
Expand All @@ -19,7 +19,7 @@ public void addLoaders(List<Loader> loaders) {
this.alternates.addAll(loaders);
}

public void addLoaders(Loader[] loaders) {
public void addLoaders(Loader[] loaders) {
this.addLoaders(Arrays.asList(loaders));
}

Expand Down
4 changes: 2 additions & 2 deletions schema_salad/java_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
Expand All @@ -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
),
Expand Down