Merge pull request #24 from yahoo/client_function_name

make client function name recognize resource name
yahoo · Mar 16, 2017 · c47ad5b · c47ad5b
2 parents 2340f46 + 5916ae7
commit c47ad5b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/cmd/rdl-gen-parsec-java-client/main.go b/cmd/rdl-gen-parsec-java-client/main.go
@@ -394,7 +394,8 @@ func javaMethodName(reg rdl.TypeRegistry, r *rdl.Resource, needParamWithType boo
 	var params []string
 	bodyType := string(safeTypeVarName(r.Type))
 	for _, v := range r.Inputs {
-		if v.Context != "" { //ignore these legacy things
+		if v.Context != "" {
+			//ignore these legacy things
 			log.Println("Warning: v1 style context param ignored:", v.Name, v.Context)
 			continue
 		}
@@ -409,7 +410,11 @@ func javaMethodName(reg rdl.TypeRegistry, r *rdl.Resource, needParamWithType boo
 			params = append(params, javaName(k))
 		}
 	}
-	return strings.ToLower(string(r.Method)) + string(bodyType), params
+	if r.Name != "" {
+		return utils.Uncapitalize(string(r.Name)), params
+	} else {
+		return strings.ToLower(string(r.Method)) + string(bodyType), params
+	}
 }
 
 // todo: duplicate with java-server.go

diff --git a/testdata/Sample2ClientImpl.txt b/testdata/Sample2ClientImpl.txt
@@ -128,12 +128,12 @@ public class SampleClientImpl implements SampleClient {
     }
 
     @Override
-    public CompletableFuture<User> getUser(int id) throws ResourceException {
-        return getUser(null, id);
+    public CompletableFuture<User> getUserId(int id) throws ResourceException {
+        return getUserId(null, id);
     }
 
     @Override
-    public CompletableFuture<User> getUser(Map<String, List<String>> headers, int id) throws ResourceException {
+    public CompletableFuture<User> getUserId(Map<String, List<String>> headers, int id) throws ResourceException {
         String path = "/user/{id}";
         String body = null;
 
@@ -152,12 +152,12 @@ public class SampleClientImpl implements SampleClient {
     }
 
     @Override
-    public CompletableFuture<User> postUser() throws ResourceException {
-        return postUser(null);
+    public CompletableFuture<User> fetchWssid() throws ResourceException {
+        return fetchWssid(null);
     }
 
     @Override
-    public CompletableFuture<User> postUser(Map<String, List<String>> headers) throws ResourceException {
+    public CompletableFuture<User> fetchWssid(Map<String, List<String>> headers) throws ResourceException {
         String path = "/wssid";
         String body = null;
 

diff --git a/testdata/sample2.json b/testdata/sample2.json
@@ -49,7 +49,8 @@
                 "UNAUTHORIZED": {
                     "type": "ResourceError"
                 }
-            }
+            },
+            "name" : "getUserId"
         },
         {
             "type": "User",
@@ -71,7 +72,8 @@
                 "UNAUTHORIZED": {
                     "type": "ResourceError"
                 }
-            }
+            },
+            "name" : "fetchWssid"
         }
     ]
 }