loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix deserialize nested map error in objc client

Browse Source
This commit is contained in:
geekerzp 2015-07-28 10:51:20 +08:00
parent b843b55339
commit cc45ff17cb
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
View File

@ -413,7 +413,7 @@ static void (^reachabilityChangeBlock)(int);
}
// map
NSString *dictPat = @"NSDictionary\\* /\\* (.+), (.+) \\*/";
NSString *dictPat = @"NSDictionary\\* /\\* (.+?), (.+) \\*/";
regexp = [NSRegularExpression regularExpressionWithPattern:dictPat
options:NSRegularExpressionCaseInsensitive
error:nil];

2
samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
View File

@ -413,7 +413,7 @@ static void (^reachabilityChangeBlock)(int);
}
// map
NSString *dictPat = @"NSDictionary\\* /\\* (.+), (.+) \\*/";
NSString *dictPat = @"NSDictionary\\* /\\* (.+?), (.+) \\*/";
regexp = [NSRegularExpression regularExpressionWithPattern:dictPat
options:NSRegularExpressionCaseInsensitive
error:nil];

15
samples/client/petstore/objc/SwaggerClientTests/Tests/DeserializationTest.m
View File

@ -116,4 +116,19 @@
XCTAssertEqualObjects([result[@"pet"] _id], @119);
}
- (void)testDeserializeNestedMap {
NSDictionary *data =
@{
@"foo": @{
@"bar": @1
}
};
NSDictionary *result = [apiClient deserialize:data class:@"NSDictionary* /* NSString, NSDictionary* /* NSString, NSNumber */ */"];
XCTAssertTrue([result isKindOfClass:[NSDictionary class]]);
XCTAssertTrue([result[@"foo"] isKindOfClass:[NSDictionary class]]);
XCTAssertTrue([result[@"foo"][@"bar"] isKindOfClass:[NSNumber class]]);
}
@end