valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-08 11:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1697 from wing328/objc_minor_style

Browse Source 
[ObjC] minor style change for objc client
This commit is contained in:
wing328 2015-12-11 14:43:38 +08:00
commit 2a8afbec8d
11 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,17 +132,20 @@ static void (^reachabilityChangeBlock)(int);
if (accepts == nil || [accepts count] == 0) {
return @"";
}
NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
for (NSString *string in accepts) {
NSString * lowerAccept = [string lowercaseString];
if([lowerAccept containsString:@"application/json"]) {
if ([lowerAccept containsString:@"application/json"]) {
return @"application/json";
}
[lowerAccepts addObject:lowerAccept];
}
if(lowerAccepts.count == 1){
if (lowerAccepts.count == 1) {
return [lowerAccepts firstObject];
}
return [lowerAccepts componentsJoinedByString:@", "];
}
@ -169,7 +172,7 @@ static void (^reachabilityChangeBlock)(int);
}
+ (NSString*)escape:(id)unescaped {
if([unescaped isKindOfClass:[NSString class]]){
if ([unescaped isKindOfClass:[NSString class]]){
return (NSString *)CFBridgingRelease
(CFURLCreateStringByAddingPercentEscapes(
NULL,
@ -210,7 +213,7 @@ static void (^reachabilityChangeBlock)(int);
-(Boolean) executeRequestWithId:(NSNumber*) requestId {
NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
if([obj intValue] == [requestId intValue]) {
if ([obj intValue] == [requestId intValue]) {
return YES;
}
else {
@ -218,7 +221,7 @@ static void (^reachabilityChangeBlock)(int);
}
}];
if(matchingItems.count == 1) {
if (matchingItems.count == 1) {
{{classPrefix}}DebugLog(@"removed request id %@", requestId);
[queuedRequests removeObject:requestId];
return YES;
@ -266,7 +269,7 @@ static void (^reachabilityChangeBlock)(int);
}
// call the reachability block, if configured
if(reachabilityChangeBlock != nil) {
if (reachabilityChangeBlock != nil) {
reachabilityChangeBlock(status);
}
}];
@ -408,16 +411,16 @@ static void (^reachabilityChangeBlock)(int);
completionBlock: (void (^)(id, NSError *))completionBlock {
AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
success:^(AFHTTPRequestOperation *operation, id response) {
if([self executeRequestWithId:requestId]) {
if ([self executeRequestWithId:requestId]) {
[self logResponse:operation forRequest:request error:nil];
NSDictionary *responseHeaders = [[operation response] allHeaderFields];
self.HTTPResponseHeaders = responseHeaders;
completionBlock(response, nil);
}
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
if([self executeRequestWithId:requestId]) {
if ([self executeRequestWithId:requestId]) {
NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
if(operation.responseObject) {
if (operation.responseObject) {
// Add in the (parsed) response body.
userInfo[{{classPrefix}}ResponseObjectErrorKey] = operation.responseObject;
}
@ -588,10 +591,10 @@ static void (^reachabilityChangeBlock)(int);
// request cache
BOOL hasHeaderParams = false;
if(headerParams != nil && [headerParams count] > 0) {
if (headerParams != nil && [headerParams count] > 0) {
hasHeaderParams = true;
}
if(offlineState) {
if (offlineState) {
{{classPrefix}}DebugLog(@"%@ cache forced", resourcePath);
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
}
@ -604,7 +607,7 @@ static void (^reachabilityChangeBlock)(int);
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
}
if(hasHeaderParams){
if (hasHeaderParams){
for(NSString * key in [headerParams keyEnumerator]){
[request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
}
@ -637,36 +640,36 @@ static void (^reachabilityChangeBlock)(int);
int counter = 0;
NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
if(queryParams != nil){
if (queryParams != nil){
for(NSString * key in [queryParams keyEnumerator]){
if(counter == 0) separator = @"?";
if (counter == 0) separator = @"?";
else separator = @"&";
id queryParam = [queryParams valueForKey:key];
if([queryParam isKindOfClass:[NSString class]]){
if ([queryParam isKindOfClass:[NSString class]]){
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[{{classPrefix}}ApiClient escape:key], [{{classPrefix}}ApiClient escape:[queryParams valueForKey:key]]]];
}
else if([queryParam isKindOfClass:[{{classPrefix}}QueryParamCollection class]]){
else if ([queryParam isKindOfClass:[{{classPrefix}}QueryParamCollection class]]){
{{classPrefix}}QueryParamCollection * coll = ({{classPrefix}}QueryParamCollection*) queryParam;
NSArray* values = [coll values];
NSString* format = [coll format];
if([format isEqualToString:@"csv"]) {
if ([format isEqualToString:@"csv"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
}
else if([format isEqualToString:@"tsv"]) {
else if ([format isEqualToString:@"tsv"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
}
else if([format isEqualToString:@"pipes"]) {
else if ([format isEqualToString:@"pipes"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
}
else if([format isEqualToString:@"multi"]) {
else if ([format isEqualToString:@"multi"]) {
for(id obj in values) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];

6
modules/swagger-codegen/src/main/resources/objc/api-body.mustache
View File

@ -105,7 +105,7 @@ static {{classname}}* singletonAPI = nil;
{{/pathParams}}
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
{{#queryParams}}if({{paramName}} != nil) {
{{#queryParams}}if ({{paramName}} != nil) {
{{#collectionFormat}}
queryParams[@"{{baseName}}"] = [[{{classPrefix}}QueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"];
{{/collectionFormat}}
@ -114,7 +114,7 @@ static {{classname}}* singletonAPI = nil;
{{/queryParams}}
NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
{{#headerParams}}if({{paramName}} != nil) {
{{#headerParams}}if ({{paramName}} != nil) {
headerParams[@"{{baseName}}"] = {{paramName}};
}
{{/headerParams}}
@ -159,7 +159,7 @@ static {{classname}}* singletonAPI = nil;
{{#requiredParamCount}}
{{#requiredParams}}
if({{paramName}} == nil) {
if ({{paramName}} == nil) {
// error
}
{{/requiredParams}}

5
modules/swagger-codegen/src/main/resources/objc/model-body.mustache
View File

@ -6,12 +6,13 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
{{#vars}}{{#defaultValue}}self.{{name}} = {{{defaultValue}}};
{{/defaultValue}}{{/vars}}
}
return self;
}

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

@ -128,24 +128,25 @@ static void (^reachabilityChangeBlock)(int);
/*
* Detect `Accept` from accepts
*/
+ (NSString *) selectHeaderAccept:(NSArray *)accepts
{
+ (NSString *) selectHeaderAccept:(NSArray *)accepts {
if (accepts == nil || [accepts count] == 0) {
return @"";
}
NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
[accepts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
[lowerAccepts addObject:[obj lowercaseString]];
}];
if ([lowerAccepts containsObject:@"application/json"]) {
return @"application/json";
for (NSString *string in accepts) {
NSString * lowerAccept = [string lowercaseString];
if ([lowerAccept containsString:@"application/json"]) {
return @"application/json";
}
[lowerAccepts addObject:lowerAccept];
}
else {
return [lowerAccepts componentsJoinedByString:@", "];
if (lowerAccepts.count == 1) {
return [lowerAccepts firstObject];
}
return [lowerAccepts componentsJoinedByString:@", "];
}
/*
@ -171,7 +172,7 @@ static void (^reachabilityChangeBlock)(int);
}
+ (NSString*)escape:(id)unescaped {
if([unescaped isKindOfClass:[NSString class]]){
if ([unescaped isKindOfClass:[NSString class]]){
return (NSString *)CFBridgingRelease
(CFURLCreateStringByAddingPercentEscapes(
NULL,
@ -212,7 +213,7 @@ static void (^reachabilityChangeBlock)(int);
-(Boolean) executeRequestWithId:(NSNumber*) requestId {
NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
if([obj intValue] == [requestId intValue]) {
if ([obj intValue] == [requestId intValue]) {
return YES;
}
else {
@ -220,7 +221,7 @@ static void (^reachabilityChangeBlock)(int);
}
}];
if(matchingItems.count == 1) {
if (matchingItems.count == 1) {
SWGDebugLog(@"removed request id %@", requestId);
[queuedRequests removeObject:requestId];
return YES;
@ -268,7 +269,7 @@ static void (^reachabilityChangeBlock)(int);
}
// call the reachability block, if configured
if(reachabilityChangeBlock != nil) {
if (reachabilityChangeBlock != nil) {
reachabilityChangeBlock(status);
}
}];
@ -410,16 +411,16 @@ static void (^reachabilityChangeBlock)(int);
completionBlock: (void (^)(id, NSError *))completionBlock {
AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
success:^(AFHTTPRequestOperation *operation, id response) {
if([self executeRequestWithId:requestId]) {
if ([self executeRequestWithId:requestId]) {
[self logResponse:operation forRequest:request error:nil];
NSDictionary *responseHeaders = [[operation response] allHeaderFields];
self.HTTPResponseHeaders = responseHeaders;
completionBlock(response, nil);
}
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
if([self executeRequestWithId:requestId]) {
if ([self executeRequestWithId:requestId]) {
NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
if(operation.responseObject) {
if (operation.responseObject) {
// Add in the (parsed) response body.
userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
}
@ -590,10 +591,10 @@ static void (^reachabilityChangeBlock)(int);
// request cache
BOOL hasHeaderParams = false;
if(headerParams != nil && [headerParams count] > 0) {
if (headerParams != nil && [headerParams count] > 0) {
hasHeaderParams = true;
}
if(offlineState) {
if (offlineState) {
SWGDebugLog(@"%@ cache forced", resourcePath);
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
}
@ -606,7 +607,7 @@ static void (^reachabilityChangeBlock)(int);
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
}
if(hasHeaderParams){
if (hasHeaderParams){
for(NSString * key in [headerParams keyEnumerator]){
[request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
}
@ -639,36 +640,36 @@ static void (^reachabilityChangeBlock)(int);
int counter = 0;
NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
if(queryParams != nil){
if (queryParams != nil){
for(NSString * key in [queryParams keyEnumerator]){
if(counter == 0) separator = @"?";
if (counter == 0) separator = @"?";
else separator = @"&";
id queryParam = [queryParams valueForKey:key];
if([queryParam isKindOfClass:[NSString class]]){
if ([queryParam isKindOfClass:[NSString class]]){
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
}
else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
else if ([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
NSArray* values = [coll values];
NSString* format = [coll format];
if([format isEqualToString:@"csv"]) {
if ([format isEqualToString:@"csv"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
}
else if([format isEqualToString:@"tsv"]) {
else if ([format isEqualToString:@"tsv"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
}
else if([format isEqualToString:@"pipes"]) {
else if ([format isEqualToString:@"pipes"]) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
}
else if([format isEqualToString:@"multi"]) {
else if ([format isEqualToString:@"multi"]) {
for(id obj in values) {
[requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
[SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];

5
samples/client/petstore/objc/SwaggerClient/SWGCategory.m
View File

@ -4,11 +4,12 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
}
return self;
}

5
samples/client/petstore/objc/SwaggerClient/SWGOrder.m
View File

@ -4,11 +4,12 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
}
return self;
}

5
samples/client/petstore/objc/SwaggerClient/SWGPet.m
View File

@ -4,11 +4,12 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
}
return self;
}

6
samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
View File

@ -250,7 +250,7 @@ static SWGPetApi* singletonAPI = nil;
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
if(status != nil) {
if (status != nil) {
queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
@ -334,7 +334,7 @@ static SWGPetApi* singletonAPI = nil;
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
if(tags != nil) {
if (tags != nil) {
queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
@ -622,7 +622,7 @@ static SWGPetApi* singletonAPI = nil;
NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
if(apiKey != nil) {
if (apiKey != nil) {
headerParams[@"api_key"] = apiKey;
}

5
samples/client/petstore/objc/SwaggerClient/SWGTag.m
View File

@ -4,11 +4,12 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
}
return self;
}

5
samples/client/petstore/objc/SwaggerClient/SWGUser.m
View File

@ -4,11 +4,12 @@
- (instancetype)init {
self = [super init];
if (self)
{
if (self) {
// initalise property's default value, if any
}
return self;
}

4
samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
View File

@ -331,11 +331,11 @@ static SWGUserApi* singletonAPI = nil;
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
if(username != nil) {
if (username != nil) {
queryParams[@"username"] = username;
}
if(password != nil) {
if (password != nil) {
queryParams[@"password"] = password;
}