Skip to content

Commit 30fbdd4

Browse files
geekerzpgeekerzp
committed
Add class prefix to macro DebugLog in objc client
1 parent 844cae7 commit 30fbdd4

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void (^reachabilityChangeBlock)(int);
100100
[[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
101101
operation.responseString];
102102
103-
DebugLog(message);
103+
{{classPrefix}}DebugLog(message);
104104
}
105105

106106
#pragma mark - Cache Methods
@@ -194,14 +194,14 @@ static void (^reachabilityChangeBlock)(int);
194194
+(NSNumber*) nextRequestId {
195195
@synchronized(self) {
196196
long nextId = ++requestId;
197-
DebugLog(@"got id %ld", nextId);
197+
{{classPrefix}}DebugLog(@"got id %ld", nextId);
198198
return [NSNumber numberWithLong:nextId];
199199
}
200200
}
201201

202202
+(NSNumber*) queueRequest {
203203
NSNumber* requestId = [{{classPrefix}}ApiClient nextRequestId];
204-
DebugLog(@"added %@ to request queue", requestId);
204+
{{classPrefix}}DebugLog(@"added %@ to request queue", requestId);
205205
[queuedRequests addObject:requestId];
206206
return requestId;
207207
}
@@ -221,7 +221,7 @@ static void (^reachabilityChangeBlock)(int);
221221
}];
222222

223223
if(matchingItems.count == 1) {
224-
DebugLog(@"removed request id %@", requestId);
224+
{{classPrefix}}DebugLog(@"removed request id %@", requestId);
225225
[queuedRequests removeObject:requestId];
226226
return YES;
227227
}
@@ -245,22 +245,22 @@ static void (^reachabilityChangeBlock)(int);
245245
reachabilityStatus = status;
246246
switch (status) {
247247
case AFNetworkReachabilityStatusUnknown:
248-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
248+
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
249249
[{{classPrefix}}ApiClient setOfflineState:true];
250250
break;
251251

252252
case AFNetworkReachabilityStatusNotReachable:
253-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
253+
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
254254
[{{classPrefix}}ApiClient setOfflineState:true];
255255
break;
256256

257257
case AFNetworkReachabilityStatusReachableViaWWAN:
258-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
258+
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
259259
[{{classPrefix}}ApiClient setOfflineState:false];
260260
break;
261261

262262
case AFNetworkReachabilityStatusReachableViaWiFi:
263-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
263+
{{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
264264
[{{classPrefix}}ApiClient setOfflineState:false];
265265
break;
266266
default:
@@ -591,15 +591,15 @@ static void (^reachabilityChangeBlock)(int);
591591
hasHeaderParams = true;
592592
}
593593
if(offlineState) {
594-
DebugLog(@"%@ cache forced", resourcePath);
594+
{{classPrefix}}DebugLog(@"%@ cache forced", resourcePath);
595595
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
596596
}
597597
else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
598-
DebugLog(@"%@ cache enabled", resourcePath);
598+
{{classPrefix}}DebugLog(@"%@ cache enabled", resourcePath);
599599
[request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
600600
}
601601
else {
602-
DebugLog(@"%@ cache disabled", resourcePath);
602+
{{classPrefix}}DebugLog(@"%@ cache disabled", resourcePath);
603603
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
604604
}
605605

‎modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
2727
/**
2828
* Log debug message macro
2929
*/
30-
#define DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
30+
#define {{classPrefix}}DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
3131

3232
@interface {{classPrefix}}ApiClient : AFHTTPRequestOperationManager
3333

‎samples/client/petstore/objc/SwaggerClient/SWGApiClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern NSString *const SWGResponseObjectErrorKey;
3131
/**
3232
* Log debug message macro
3333
*/
34-
#define DebugLog(format, ...) [SWGApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
34+
#define SWGDebugLog(format, ...) [SWGApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
3535

3636
@interface SWGApiClient : AFHTTPRequestOperationManager
3737

‎samples/client/petstore/objc/SwaggerClient/SWGApiClient.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (void)logResponse:(AFHTTPRequestOperation *)operation
100100
[[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
101101
operation.responseString];
102102

103-
DebugLog(message);
103+
SWGDebugLog(message);
104104
}
105105

106106
#pragma mark - Cache Methods
@@ -194,14 +194,14 @@ +(unsigned long)requestQueueSize {
194194
+(NSNumber*) nextRequestId {
195195
@synchronized(self) {
196196
long nextId = ++requestId;
197-
DebugLog(@"got id %ld", nextId);
197+
SWGDebugLog(@"got id %ld", nextId);
198198
return [NSNumber numberWithLong:nextId];
199199
}
200200
}
201201

202202
+(NSNumber*) queueRequest {
203203
NSNumber* requestId = [SWGApiClient nextRequestId];
204-
DebugLog(@"added %@ to request queue", requestId);
204+
SWGDebugLog(@"added %@ to request queue", requestId);
205205
[queuedRequests addObject:requestId];
206206
return requestId;
207207
}
@@ -221,7 +221,7 @@ -(Boolean) executeRequestWithId:(NSNumber*) requestId {
221221
}];
222222

223223
if(matchingItems.count == 1) {
224-
DebugLog(@"removed request id %@", requestId);
224+
SWGDebugLog(@"removed request id %@", requestId);
225225
[queuedRequests removeObject:requestId];
226226
return YES;
227227
}
@@ -245,22 +245,22 @@ - (void) configureCacheReachibility {
245245
reachabilityStatus = status;
246246
switch (status) {
247247
case AFNetworkReachabilityStatusUnknown:
248-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
248+
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
249249
[SWGApiClient setOfflineState:true];
250250
break;
251251

252252
case AFNetworkReachabilityStatusNotReachable:
253-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
253+
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
254254
[SWGApiClient setOfflineState:true];
255255
break;
256256

257257
case AFNetworkReachabilityStatusReachableViaWWAN:
258-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
258+
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
259259
[SWGApiClient setOfflineState:false];
260260
break;
261261

262262
case AFNetworkReachabilityStatusReachableViaWiFi:
263-
DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
263+
SWGDebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
264264
[SWGApiClient setOfflineState:false];
265265
break;
266266
default:
@@ -591,15 +591,15 @@ -(NSNumber*) requestWithCompletionBlock: (NSString*) path
591591
hasHeaderParams = true;
592592
}
593593
if(offlineState) {
594-
DebugLog(@"%@ cache forced", resourcePath);
594+
SWGDebugLog(@"%@ cache forced", resourcePath);
595595
[request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
596596
}
597597
else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
598-
DebugLog(@"%@ cache enabled", resourcePath);
598+
SWGDebugLog(@"%@ cache enabled", resourcePath);
599599
[request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
600600
}
601601
else {
602-
DebugLog(@"%@ cache disabled", resourcePath);
602+
SWGDebugLog(@"%@ cache disabled", resourcePath);
603603
[request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
604604
}
605605

0 commit comments

Comments
 (0)