Update api-body.mustache, api-header.mustache,

geekerzp · geekerzp · commit e6d7517e636a · 2015-03-29T18:06:52.000+08:00
apiBodyResponseWithContainer.mustache and apiNonPrimitiveResponse.mustache
templates in objective-c client.

* Update `asDictionary` method to `toDictionary` method which provided by
  JSONModel.
* Update `initWithValues` method to `initWithDictionary` method which
  provided by JSONModel.
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
@@ -55,7 +55,7 @@ static NSString * basePath = @"{{basePath}}";
 {{#operation}}
 -(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 (^)({{{returnType}}} output, NSError* error))completionBlock{{/returnBaseType}}
         {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock{{/returnBaseType}} {
 
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath];
@@ -86,17 +86,17 @@ static NSString * basePath = @"{{basePath}}";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
             }
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -24,12 +24,12 @@
  @param {{paramName}} {{description}}
  {{/allParams}}
 
- return type: {{returnType}}
+ return type: {{{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}}
+    completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}}
     {{^returnBaseType}}{{#hasParams}}
     completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}}
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
@@ -25,11 +25,11 @@
                         {{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict];
                         {{/returnTypeIsPrimitive}}
                         {{^returnTypeIsPrimitive}}
-                        {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc]initWithValues: dict];
+                        {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil];
                         {{/returnTypeIsPrimitive}}
                         [objs addObject:d];
                     }
-                    completionBlock(objs, nil);
+                    completionBlock(({{{returnType}}})objs, nil);
                 }
                 {{/returnBaseType}}
                 {{/isListContainer}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
@@ -1,9 +1,9 @@
     {{^returnTypeIsPrimitive}}
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"{{httpMethod}}" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"{{httpMethod}}"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -15,9 +15,9 @@
                 }
                 {{#returnType}}{{returnType}} result = nil;
                 if (data) {
-                    result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}}initWithValues{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}initWithValues  {{/returnContainer}}: data];
+                    result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}} initWithDictionary{{/isListContainer}}{{/returnContainer}}{{^returnContainer}} initWithDictionary{{/returnContainer}}:data error:nil];
                 }
                 {{#returnType}}completionBlock(result , nil);{{/returnType}}
                 {{/returnType}}
               }];
-    {{/returnTypeIsPrimitive}}
+    {{/returnTypeIsPrimitive}}
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
@@ -39,7 +39,7 @@ - (void) testAddPet {
         [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
         [tags addObject:tag];
     }
-    [petToAdd setTags:tags];
+    [petToAdd setTags:(NSArray<SWGTag>*)tags];
     [petToAdd setStatus:@"lost"];
     
     SWGCategory * category = [[SWGCategory alloc] init];
@@ -75,7 +75,7 @@ - (void) testUpdatePet {
         [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
         [tags addObject:tag];
     }
-    [petToAdd setTags:tags];
+    [petToAdd setTags:(NSArray<SWGTag>*)tags];
     [petToAdd setStatus:@"lost"];
     
     SWGCategory * category = [[SWGCategory alloc] init];
@@ -103,7 +103,7 @@ - (void) testUpdatePet {
                     NSLog(@"failed to fetch pet");
                 }
                 else {
-                    SWGPet* pet = [[SWGPet alloc] initWithValues:[output asDictionary]];
+                    SWGPet* pet = [[SWGPet alloc] initWithDictionary:[output toDictionary] error:nil];
                     NSLog(@"got the pet");
                     
                     [pet setName:@"programmer"];
@@ -122,7 +122,7 @@ - (void) testUpdatePet {
                                                 NSLog(@"failed to fetch pet");
                                             }
                                             else {
-                                                SWGPet* pet = [[SWGPet alloc] initWithValues:[output asDictionary]];
+                                                SWGPet* pet = [[SWGPet alloc] initWithDictionary:[output toDictionary] error:nil];
                                                 XCTAssertNotNil([pet _id], @"pet was nil");
                                                 XCTAssertEqualObjects([pet name], @"programmer", @"pet name was not updated");
                                                 XCTAssertEqualObjects([pet status], @"confused", @"pet status was not updated");

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static NSString * basePath = @"{{basePath}}";`
`55`	`55`	`{{#operation}}`
`56`	`56`	`-(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}`
`57`	`57`	`{{/allParams}}`
`58`		`- {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{returnType}} output, NSError* error))completionBlock{{/returnBaseType}}`
	`58`	`+ {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock{{/returnBaseType}}`
`59`	`59`	`{{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock{{/returnBaseType}} {`
`60`	`60`
`61`	`61`	`NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath];`
`@@ -86,17 +86,17 @@ static NSString * basePath = @"{{basePath}}";`
`86`	`86`	`if(__body != nil && [__body isKindOfClass:[NSArray class]]){`
`87`	`87`	`NSMutableArray * objs = [[NSMutableArray alloc] init];`
`88`	`88`	`for (id dict in (NSArray*)__body) {`
`89`		`- if([dict respondsToSelector:@selector(asDictionary)]) {`
`90`		`- [objs addObject:[(SWGObject*)dict asDictionary]];`
	`89`	`+ if([dict respondsToSelector:@selector(toDictionary)]) {`
	`90`	`+ [objs addObject:[(SWGObject*)dict toDictionary]];`
`91`	`91`	`}`
`92`	`92`	`else{`
`93`	`93`	`[objs addObject:dict];`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`bodyDictionary = objs;`
`97`	`97`	`}`
`98`		`- else if([__body respondsToSelector:@selector(asDictionary)]) {`
`99`		`- bodyDictionary = [(SWGObject*)__body asDictionary];`
	`98`	`+ else if([__body respondsToSelector:@selector(toDictionary)]) {`
	`99`	`+ bodyDictionary = [(SWGObject*)__body toDictionary];`
`100`	`100`	`}`
`101`	`101`	`else if([__body isKindOfClass:[NSString class]]) {`
`102`	`102`	`// convert it to a dictionary`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@`
`25`	`25`	`{{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict];`
`26`	`26`	`{{/returnTypeIsPrimitive}}`
`27`	`27`	`{{^returnTypeIsPrimitive}}`
`28`		`- {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc]initWithValues: dict];`
	`28`	`+ {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil];`
`29`	`29`	`{{/returnTypeIsPrimitive}}`
`30`	`30`	`[objs addObject:d];`
`31`	`31`	`}`
`32`		`- completionBlock(objs, nil);`
	`32`	`+ completionBlock(({{{returnType}}})objs, nil);`
`33`	`33`	`}`
`34`	`34`	`{{/returnBaseType}}`
`35`	`35`	`{{/isListContainer}}`