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

Add class prefix to macro DebugLog in objc client

Browse Source
This commit is contained in:
geekerzp 2015-09-23 17:18:07 +08:00
parent 844cae75b7
commit 30fbdd4d05
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ static void (^reachabilityChangeBlock)(int);
[[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
operation.responseString];
DebugLog(message);
{{classPrefix}}DebugLog(message);
}
#pragma mark - Cache Methods
@ -194,14 +194,14 @@ static void (^reachabilityChangeBlock)(int);
+(NSNumber*) nextRequestId {
@synchronized(self) {
long nextId = ++requestId;
DebugLog(@"got id %ld", nextId);
{{classPrefix}}DebugLog(@"got id %ld", nextId);
return [NSNumber numberWithLong:nextId];
}
}
+(NSNumber*) queueRequest {
NSNumber* requestId = [{{classPrefix}}ApiClient nextRequestId];
DebugLog(@"added %@ to request queue", requestId);
{{classPrefix}}DebugLog(@"added %@ to request queue", requestId);
[queuedRequests addObject:requestId];
return requestId;
}
@ -221,7 +221,7 @@ static void (^reachabilityChangeBlock)(int);
}];
if(matchingItems.count == 1) {
DebugLog(@"removed request id %@", requestId);
{{classPrefix}}DebugLog(@"removed request id %@", requestId);
[queuedRequests removeObject:requestId];
return YES;
}
@ -245,22 +245,22 @@ static void (^reachabilityChangeBlock)(int);
reachabilityStatus = status;
switch (status) {
case AFNetworkReachabilityStatusUnknown:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
[{{classPrefix}}ApiClient setOfflineState:true];
break;
case AFNetworkReachabilityStatusNotReachable:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
[{{classPrefix}}ApiClient setOfflineState:true];
break;
case AFNetworkReachabilityStatusReachableViaWWAN:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
[{{classPrefix}}ApiClient setOfflineState:false];
break;
case AFNetworkReachabilityStatusReachableViaWiFi:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
[{{classPrefix}}ApiClient setOfflineState:false];
break;
default:
@ -591,15 +591,15 @@ static void (^reachabilityChangeBlock)(int);
hasHeaderParams = true;
}
if(offlineState) {
DebugLog(@"%@ cache forced", resourcePath);
{{classPrefix}}DebugLog(@"%@ cache forced", resourcePath);
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
}
else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
DebugLog(@"%@ cache enabled", resourcePath);
{{classPrefix}}DebugLog(@"%@ cache enabled", resourcePath);
[request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
}
else {
DebugLog(@"%@ cache disabled", resourcePath);
{{classPrefix}}DebugLog(@"%@ cache disabled", resourcePath);
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
}

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

@ -27,7 +27,7 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
/**
* Log debug message macro
*/
#define DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
#define {{classPrefix}}DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
@interface {{classPrefix}}ApiClient : AFHTTPRequestOperationManager

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

@ -31,7 +31,7 @@ extern NSString *const SWGResponseObjectErrorKey;
/**
* Log debug message macro
*/
#define DebugLog(format, ...) [SWGApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
#define SWGDebugLog(format, ...) [SWGApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
@interface SWGApiClient : AFHTTPRequestOperationManager

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

@ -100,7 +100,7 @@ static void (^reachabilityChangeBlock)(int);
[[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
operation.responseString];
DebugLog(message);
SWGDebugLog(message);
}
#pragma mark - Cache Methods
@ -194,14 +194,14 @@ static void (^reachabilityChangeBlock)(int);
+(NSNumber*) nextRequestId {
@synchronized(self) {
long nextId = ++requestId;
DebugLog(@"got id %ld", nextId);
SWGDebugLog(@"got id %ld", nextId);
return [NSNumber numberWithLong:nextId];
}
}
+(NSNumber*) queueRequest {
NSNumber* requestId = [SWGApiClient nextRequestId];
DebugLog(@"added %@ to request queue", requestId);
SWGDebugLog(@"added %@ to request queue", requestId);
[queuedRequests addObject:requestId];
return requestId;
}
@ -221,7 +221,7 @@ static void (^reachabilityChangeBlock)(int);
}];
if(matchingItems.count == 1) {
DebugLog(@"removed request id %@", requestId);
SWGDebugLog(@"removed request id %@", requestId);
[queuedRequests removeObject:requestId];
return YES;
}
@ -245,22 +245,22 @@ static void (^reachabilityChangeBlock)(int);
reachabilityStatus = status;
switch (status) {
case AFNetworkReachabilityStatusUnknown:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
[SWGApiClient setOfflineState:true];
break;
case AFNetworkReachabilityStatusNotReachable:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
[SWGApiClient setOfflineState:true];
break;
case AFNetworkReachabilityStatusReachableViaWWAN:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
[SWGApiClient setOfflineState:false];
break;
case AFNetworkReachabilityStatusReachableViaWiFi:
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
[SWGApiClient setOfflineState:false];
break;
default:
@ -591,15 +591,15 @@ static void (^reachabilityChangeBlock)(int);
hasHeaderParams = true;
}
if(offlineState) {
DebugLog(@"%@ cache forced", resourcePath);
SWGDebugLog(@"%@ cache forced", resourcePath);
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
}
else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
DebugLog(@"%@ cache enabled", resourcePath);
SWGDebugLog(@"%@ cache enabled", resourcePath);
[request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
}
else {
DebugLog(@"%@ cache disabled", resourcePath);
SWGDebugLog(@"%@ cache disabled", resourcePath);
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
}