Java codegen: cope with anonymous types

Author: mr-c

schema_salad/codegen_base.py

@@ -2,8 +2,6 @@
 import collections
 from typing import Any, Dict, List, MutableSequence, Optional, Set, Union
 
-from . import schema
-
 
 class TypeDef:  # pylint: disable=too-few-public-methods
     """Schema Salad type description."""
@@ -66,7 +64,7 @@ def prologue(self) -> None:
     @staticmethod
     def safe_name(name: str) -> str:
         """Generate a safe version of the given name."""
-        return schema.avro_field_name(name)
+        raise NotImplementedError()
 
     def begin_class(
         self,  # pylint: disable=too-many-arguments

schema_salad/java_codegen.py

@@ -160,6 +160,8 @@ def safe_name(name: str) -> str:
         if avn in ("class", "extends", "abstract", "default", "package"):
             # reserved words
             avn = avn + "_"
+        if avn and avn.startswith("anon."):
+            avn = avn[5:]
         return avn
 
     def interface_name(self, n: str) -> str:
@@ -685,14 +687,19 @@ def declare_id_field(
         self.declare_field(name, fieldtype, doc, True)
         if optional:
             set_uri = """
+    Boolean __original_is_null = {safename} == null;
     if ({safename} == null) {{
       if (__docRoot != null) {{
         {safename} = java.util.Optional.of(__docRoot);
       }} else {{
         {safename} = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
       }}
     }}
-    __baseUri = (String) {safename}.orElse(null);
+    if (__original_is_null) {{
+        __baseUri = __baseUri_;
+    }} else {{
+        __baseUri = (String) {safename}.orElse(null);
+    }}
 """
         else:
             set_uri = """