Add prefix to distinguish multiple auth variants of builders (#265)

* Use prefix in builder and fix tests

* CR

Author: andrewhaigh

generator/java.stoneg.py

@@ -768,7 +768,6 @@ def add_imports_for_route_builder(self, route):
         self._add_imports_for_data_type_exception(route.error_data_type)
 
         namespace = j.route_namespace(route)
-        route_auth = j.auth_style(route) if j.auth_style(route) != 'noauth' else 'user'
         self.add_imports(
             j.java_class(namespace),
             'com.dropbox.core.DbxException',
@@ -2011,8 +2010,15 @@ def builder_class(self, stone_elem):
 
         if isinstance(stone_elem, ApiRoute):
             route = stone_elem
+
+            if ',' in self.auth_style(route):
+                # Use prefix here because multiple builders may be generated
+                # if the endpoint has multiple auth types
+                prefix = (self._args.requests_classname_prefix or self._args.client_class) + "_"
+            else:
+                prefix = ""
             package = self.java_class(route).package
-            return JavaClass(package + '.' + classname(format_func_name(route) + '_builder'))
+            return JavaClass(package + '.' + classname('%s%s_builder' % (prefix, format_func_name(route))))
         else:
             data_type = stone_elem
             assert is_user_defined_type(data_type), repr(data_type)

src/test/java/com/dropbox/core/stone/test/RouteVersionTest.java

@@ -29,17 +29,19 @@ public void testUploadRoutes() throws Exception {
         Method v1 = c.getDeclaredMethod("testUpload", UninitializedReason.class, String.class);
         Method v2NoBuilder = c.getDeclaredMethod("testUploadV2", String.class, String.class);
         Method v2Builder = c.getDeclaredMethod("testUploadV2Builder", String.class, String.class);
+        Method v3Builder = c.getDeclaredMethod("testUploadV3Builder", String.class, String.class);
 
         // Test return value
         assertEquals(v1.getReturnType(), TestUploadUploader.class);
         assertEquals(v2NoBuilder.getReturnType(), TestUploadV2Uploader.class);
         assertEquals(v2Builder.getReturnType(), TestUploadV2Builder.class);
+        assertEquals(v3Builder.getReturnType(), DbxTestTestUploadV3Builder.class);
 
         // Test builder
         TestUploadV2Builder.class.getDeclaredMethod("withBorn", Date.class);
         TestUploadV2Builder.class.getDeclaredMethod("withSize", DogSize.class);
-        Method start = TestUploadV2Builder.class.getDeclaredMethod("start");
-        assertTrue(Arrays.asList(start.getExceptionTypes()).contains(ParentUnionException.class));
+        Method start2 = TestUploadV2Builder.class.getDeclaredMethod("start");
+        assertTrue(Arrays.asList(start2.getExceptionTypes()).contains(ParentUnionException.class));
 
         // Test return value of uploader from generic type
         ParameterizedType genericV1 = (ParameterizedType)TestUploadUploader.class.getGenericSuperclass();
@@ -50,6 +52,12 @@ public void testUploadRoutes() throws Exception {
         // Test exception from generic type
         assertEquals(genericV1.getActualTypeArguments()[1], Void.class);
         assertEquals(genericV2.getActualTypeArguments()[1], ParentUnion.class);
+
+        // Test builder with multiple auth types has prefix
+        DbxTestTestUploadV3Builder.class.getDeclaredMethod("withBorn", Date.class);
+        DbxTestTestUploadV3Builder.class.getDeclaredMethod("withSize", DogSize.class);
+        Method start3 = DbxTestTestUploadV3Builder.class.getDeclaredMethod("start");
+        assertTrue(Arrays.asList(start3.getExceptionTypes()).contains(ParentUnionException.class));
     }
 
     @Test

src/test/stone/stone_cfg.stone

@@ -7,3 +7,5 @@ struct Route
     style String = "rpc"
         "The RPC format to use for the request. Valid values: rpc, download,
         and upload."
+    auth String = "auth"
+        "Auth mode for the route."

src/test/stone/test.stone

@@ -86,6 +86,11 @@ route test_upload:2 (Dog, Void, ParentUnion)
     attrs
         style = "upload"
 
+route test_upload:3 (Dog, Void, ParentUnion)
+    attrs
+        style = "upload"
+        auth = "app, user"
+
 route test_download(Dog, Fish, Void)
     attrs
         host = "content"