Fix java & dotnet code generator emitting unknown None symbol (#858)

Fix java & dotnet code generator emitting unknown None symbol Quite similar to 6d85020 and fixing building the java code for gxformat2.
common-workflow-language · Aug 18, 2024 · 659a884 · 659a884
1 parent 71398c9
commit 659a884
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/schema_salad/dotnet_codegen.py b/schema_salad/dotnet_codegen.py
@@ -442,7 +442,9 @@ def type_loader(
                         init="new MapLoader<{}>({}, {}, {})".format(
                             i.instance_type,
                             i.name,
-                            f"'{container}'" if container is not None else None,  # noqa: B907
+                            (
+                                f"'{container}'" if container is not None else self.to_dotnet(None)
+                            ),  # noqa: B907
                             self.to_dotnet(no_link_check),
                         ),
                     )
@@ -459,7 +461,9 @@ def type_loader(
                         name=self.safe_name(type_declaration["name"]) + "Loader",
                         init="new RecordLoader<{}>({}, {})".format(
                             self.safe_name(type_declaration["name"]),
-                            f"'{container}'" if container is not None else None,  # noqa: B907
+                            (
+                                f"'{container}'" if container is not None else self.to_dotnet(None)
+                            ),  # noqa: B907
                             self.to_dotnet(no_link_check),
                         ),
                         loader_type="ILoader<{}>".format(self.safe_name(type_declaration["name"])),

diff --git a/schema_salad/java_codegen.py b/schema_salad/java_codegen.py
@@ -471,7 +471,9 @@ def type_loader(
                         name=f"map_of_{i.name}",
                         init="new MapLoader({}, {}, {})".format(
                             i.name,
-                            f"'{container}'" if container is not None else None,  # noqa: B907
+                            (
+                                f"'{container}'" if container is not None else self.to_java(None)
+                            ),  # noqa: B907
                             self.to_java(no_link_check),
                         ),
                         loader_type=f"Loader<java.util.Map<String, {i.instance_type}>>",
@@ -494,7 +496,9 @@ def type_loader(
                             clazz=fqclass,
                             ext="Impl" if not is_abstract else "",
                             container=(
-                                f"'{container}'" if container is not None else None  # noqa: B907
+                                f"'{container}'"
+                                if container is not None
+                                else self.to_java(None)  # noqa: B907
                             ),
                             no_link_check=self.to_java(no_link_check),
                         ),