generated ObjC method names to follow Apple's coding convention

hideya · hideya · commit 217267770a13 · 2016-02-12T22:07:18.000+09:00
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -15,7 +15,7 @@ public class CodegenOperation {
             isListContainer, isMultipart, hasMore = Boolean.TRUE,
             isResponseBinary = Boolean.FALSE, hasReference = Boolean.FALSE;
     public String path, operationId, returnType, httpMethod, returnBaseType,
-            returnContainer, summary, notes, baseName, defaultResponse;
+            returnContainer, summary, notes, baseName, defaultResponse, firstParamAltName;
     public List<Map<String, String>> consumes, produces;
     public CodegenParameter bodyParam;
     public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1461,6 +1461,7 @@ public int compare(CodegenParameter one, CodegenParameter another) {
 
         if (op.allParams.size() > 0) {
             op.hasParams = true;
+            op.firstParamAltName = allParams.get(0).paramName;
         }
         op.externalDocs = operation.getExternalDocs();
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -3,16 +3,22 @@
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
 import io.swagger.models.properties.*;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
@@ -425,6 +431,16 @@ public String toOperationId(String operationId) {
         return camelize(sanitizeName(operationId), true);
     }
 
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+
+        CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
+        if (op.firstParamAltName != null) {
+            op.firstParamAltName = camelize(op.firstParamAltName);
+        }
+        return op;
+    }
+
     public void setClassPrefix(String classPrefix) {
         this.classPrefix = classPrefix;
     }
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -499,19 +499,19 @@ static void (^reachabilityChangeBlock)(int);
 
 #pragma mark - Perform Request Methods
 
--(NSNumber*)  requestWithCompletionBlock: (NSString*) path
-                                  method: (NSString*) method
-                              pathParams: (NSDictionary *) pathParams
-                             queryParams: (NSDictionary*) queryParams
-                              formParams: (NSDictionary *) formParams
-                                   files: (NSDictionary *) files
-                                    body: (id) body
-                            headerParams: (NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType: (NSString*) requestContentType
-                     responseContentType: (NSString*) responseContentType
-                            responseType: (NSString *) responseType
-                         completionBlock: (void (^)(id, NSError *))completionBlock {
+-(NSNumber*) requestWithPath: (NSString*) path
+                      method: (NSString*) method
+                  pathParams: (NSDictionary *) pathParams
+                 queryParams: (NSDictionary*) queryParams
+                  formParams: (NSDictionary *) formParams
+                       files: (NSDictionary *) files
+                        body: (id) body
+                headerParams: (NSDictionary*) headerParams
+                authSettings: (NSArray *) authSettings
+          requestContentType: (NSString*) requestContentType
+         responseContentType: (NSString*) responseContentType
+                responseType: (NSString *) responseType
+             completionBlock: (void (^)(id, NSError *))completionBlock {
     // setting request serializer
     if ([requestContentType isEqualToString:@"application/json"]) {
         self.requestSerializer = [{{classPrefix}}JSONRequestSerializer serializer];
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -186,19 +186,19 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
  *
  * @return The request id.
  */
--(NSNumber*)  requestWithCompletionBlock:(NSString*) path
-                                  method:(NSString*) method
-                              pathParams:(NSDictionary *) pathParams
-                             queryParams:(NSDictionary*) queryParams
-                              formParams:(NSDictionary *) formParams
-                                   files:(NSDictionary *) files
-                                    body:(id) body
-                            headerParams:(NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType:(NSString*) requestContentType
-                     responseContentType:(NSString*) responseContentType
-                            responseType:(NSString *) responseType
-                         completionBlock:(void (^)(id, NSError *))completionBlock;
+-(NSNumber*) requestWithPath:(NSString*) path
+                      method:(NSString*) method
+                  pathParams:(NSDictionary *) pathParams
+                 queryParams:(NSDictionary*) queryParams
+                  formParams:(NSDictionary *) formParams
+                       files:(NSDictionary *) files
+                        body:(id) body
+                headerParams:(NSDictionary*) headerParams
+                authSettings:(NSArray *) authSettings
+          requestContentType:(NSString*) requestContentType
+         responseContentType:(NSString*) responseContentType
+                responseType:(NSString *) responseType
+             completionBlock:(void (^)(id, NSError *))completionBlock;
 
 /**
  * Sanitize object for request
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
@@ -79,10 +79,10 @@ static {{classname}}* singletonAPI = nil;
 ///
 /// {{/allParams}} @returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
 ///
--(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}
-        {{/allParams}}
-        {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock { {{/returnBaseType}}
-        {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock { {{/returnBaseType}}
+-(NSNumber*) {{nickname}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{#hasParams}}With{{firstParamAltName}}{{/hasParams}}{{#allParams}}{{#secondaryParam}}
+    {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}{{/allParams}}
+    {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error)) handler { {{/returnBaseType}}
+    {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error)) handler { {{/returnBaseType}}
 
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
@@ -164,21 +164,21 @@ static {{classname}}* singletonAPI = nil;
     }
     {{/requiredParams}}
     {{/requiredParamCount}}
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"{{httpMethod}}"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: {{^returnType}}nil{{/returnType}}{{#returnType}}@"{{{ returnType }}}"{{/returnType}}
-                                      completionBlock: ^(id data, NSError *error) {
-                  {{^returnType}}completionBlock(error);{{/returnType}}
-                  {{#returnType}}completionBlock(({{{ returnType }}})data, error);{{/returnType}}
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"{{httpMethod}}"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: files
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: {{^returnType}}nil{{/returnType}}{{#returnType}}@"{{{ returnType }}}"{{/returnType}}
+                           completionBlock: ^(id data, NSError *error) {
+                  {{^returnType}}handler(error);{{/returnType}}
+                  {{#returnType}}handler(({{{ returnType }}})data, error);{{/returnType}}
               }
           ];
 }
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -31,12 +31,10 @@
 /// {{/allParams}}
 ///
 /// @return {{{returnType}}}
--(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}}     {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}}
-{{/hasMore}}{{/allParams}}
-    {{#returnBaseType}}{{#hasParams}}
-    completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}}
-    {{^returnBaseType}}{{#hasParams}}
-    completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}}
+-(NSNumber*) {{nickname}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{#hasParams}}With{{firstParamAltName}}{{/hasParams}}{{#allParams}}{{#secondaryParam}}
+    {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}{{/allParams}}
+    {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error)) handler;{{/returnBaseType}}
+    {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error)) handler;{{/returnBaseType}}
 
 {{newline}}
 {{/operation}}

Original file line number	Diff line number	Diff line change
`@@ -1461,6 +1461,7 @@ public int compare(CodegenParameter one, CodegenParameter another) {`
`1461`	`1461`
`1462`	`1462`	`if (op.allParams.size() > 0) {`
`1463`	`1463`	`op.hasParams = true;`
	`1464`	`+ op.firstParamAltName = allParams.get(0).paramName;`
`1464`	`1465`	`}`
`1465`	`1466`	`op.externalDocs = operation.getExternalDocs();`
`1466`	`1467`