Fix generator bug with data type serializer package visibility.

Karl Rieb · Karl Rieb · commit 26da95cb7f8e · 2016-07-05T08:15:35.000-07:00
diff --git a/generator/java.stoneg.py b/generator/java.stoneg.py
@@ -275,7 +275,9 @@ def add_subtype(data_type):
 
 
 def get_underlying_type(data_type, allow_lists=True):
-    if isinstance(data_type, DataTypeWrapper):
+    is_wrapper = isinstance(data_type, DataTypeWrapper)
+
+    if is_wrapper:
         ctx = data_type._ctx
         stone_data_type = data_type.as_stone
     else:
@@ -290,7 +292,7 @@ def get_underlying_type(data_type, allow_lists=True):
         else:
             break
 
-    if isinstance(data_type, DataTypeWrapper):
+    if is_wrapper:
         return DataTypeWrapper(ctx, stone_data_type)
     else:
         return stone_data_type
@@ -399,9 +401,9 @@ def has_other_namespace(wrappers):
         # namespace must be another namespace
         for stone_route in stone_namespace.routes:
             # no filtering
-            if (stone_route.arg_data_type == stone_data_type or
-                stone_route.result_data_type == stone_data_type or
-                stone_route.error_data_type == stone_data_type):
+            if (get_underlying_type(stone_route.arg_data_type) == stone_data_type or
+                get_underlying_type(stone_route.result_data_type) == stone_data_type or
+                get_underlying_type(stone_route.error_data_type) == stone_data_type):
                 return True
 
     return False
@@ -2722,6 +2724,7 @@ def generate(self, api):
         for client_spec in client_specs:
             JavaCodeGenerationInstance(ctx).generate(client_spec)
 
+
 class JavaCodeGenerationInstance(object):
     """
     Java code generation instance for a particular Stone tree (:class:`stone.api.Api`).
