Updated ApiClient of objc sdk.

When create api instance, if we don't pass the `apiClient` parameter,
then get api client instance from the pool.

Author: geekerzp

modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m

@@ -134,10 +134,12 @@ +(unsigned long)requestQueueSize {
 }
 
 +(NSNumber*) nextRequestId {
-    long nextId = ++requestId;
-    if(loggingEnabled)
-        NSLog(@"got id %ld", nextId);
-    return [NSNumber numberWithLong:nextId];
+    @synchronized(self) {
+        long nextId = ++requestId;
+        if(loggingEnabled)
+            NSLog(@"got id %ld", nextId);
+        return [NSNumber numberWithLong:nextId];
+    }
 }
 
 +(NSNumber*) queueRequest {

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

@@ -2,7 +2,6 @@
 #import "{{classname}}.h"
 #import "SWGFile.h"
 #import "SWGQueryParamCollection.h"
-#import "SWGApiClient.h"
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 {{newline}}
@@ -12,8 +11,34 @@
 @end
 
 @implementation {{classname}}
+
 static NSString * basePath = @"{{basePath}}";
 
+#pragma mark - Initialize methods
+
+- (id) init {
+    self = [super init];
+    if (self) {
+        self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+- (id) initWithApiClient:(SWGApiClient *)apiClient {
+    self = [super init];
+    if (self) {
+        if (apiClient) {
+            self.apiClient = apiClient;
+        }
+        else {
+            self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
+        }
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
     static {{classname}}* singletonAPI = nil;
 
@@ -32,21 +57,10 @@ static NSString * basePath = @"{{basePath}}";
     return basePath;
 }
 
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }
 
--(id) init {
-    self = [super init];
-    self.defaultHeaders = [NSMutableDictionary dictionary];
-    [self apiClient];
-    return self;
-}
-
 -(void) setHeaderValue:(NSString*) value
            forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
@@ -177,8 +191,6 @@ static NSString * basePath = @"{{basePath}}";
     {{/requiredParams}}
     {{/requiredParamCount}}
 
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
     {{#returnContainer}}
     // response is in a container
     {{>apiBodyResponseWithContainer}}{{/returnContainer}}
@@ -206,3 +218,6 @@ static NSString * basePath = @"{{basePath}}";
 {{newline}}
 {{/operations}}
 @end
+
+
+

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

@@ -2,11 +2,14 @@
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 #import "SWGObject.h"
+#import "SWGApiClient.h"
 {{newline}}
 
 {{#operations}}
 @interface {{classname}}: NSObject
 
+@property(nonatomic, assign)SWGApiClient *apiClient;
+
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
@@ -34,4 +37,4 @@
 {{/operation}}
 
 {{/operations}}
-@end
+@end

modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache

@@ -1,5 +1,5 @@
     // {{returnContainer}} container response type
-    return [client dictionary: requestUrl 
+    return [self.apiClient dictionary: requestUrl 
                        method: @"{{httpMethod}}" 
                   queryParams: queryParams 
                          body: bodyDictionary 
@@ -34,4 +34,4 @@
                 {{/returnBaseType}}
                 {{/isListContainer}}
             }];
-    
+    

modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache

@@ -1,6 +1,6 @@
     {{^returnTypeIsPrimitive}}
     // comples response type
-    return [client dictionary: requestUrl
+    return [self.apiClient dictionary: requestUrl
                        method: @"{{httpMethod}}"
                   queryParams: queryParams
                          body: bodyDictionary

modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache

@@ -1,5 +1,5 @@
         // primitive response type
-    {{#returnBaseType}}return [client stringWithCompletionBlock: requestUrl 
+    {{#returnBaseType}}return [self.apiClient stringWithCompletionBlock: requestUrl 
                                               method: @"{{httpMethod}}" 
                                          queryParams: queryParams 
                                                 body: bodyDictionary 
@@ -17,7 +17,7 @@
     {{/returnBaseType}}
     {{^returnBaseType}}
     // no return base type
-    return [client stringWithCompletionBlock: requestUrl 
+    return [self.apiClient stringWithCompletionBlock: requestUrl 
                                       method: @"{{httpMethod}}" 
                                  queryParams: queryParams 
                                         body: bodyDictionary 
@@ -32,4 +32,4 @@
                 completionBlock(nil);
                     }];
     {{/returnBaseType}}
-    
+    

modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache

@@ -1,4 +1,4 @@
-    return [client stringWithCompletionBlock: requestUrl 
+    return [self.apiClient stringWithCompletionBlock: requestUrl 
                                       method: @"{{httpMethod}}" 
                                  queryParams: queryParams 
                                         body: bodyDictionary 

samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m

@@ -12,6 +12,16 @@ - (void)tearDown {
     [super tearDown];
 }
 
+- (void)testCreatePetApi {
+    SWGPetApi *api1 = [[SWGPetApi alloc] init];
+    SWGPetApi *api2 = [[SWGPetApi alloc] init];
+    XCTAssertEqual(api1.apiClient, api2.apiClient);
+    
+    SWGApiClient *client = [[SWGApiClient alloc] init];
+    SWGPetApi *api3 = [[SWGPetApi alloc] initWithApiClient:client];
+    XCTAssertNotEqual(api1.apiClient, api3.apiClient);
+}
+
 - (void)testCreateAndGetPet {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetById"];
     SWGPet* pet = [self createPet];

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

@@ -134,10 +134,12 @@ +(unsigned long)requestQueueSize {
 }
 
 +(NSNumber*) nextRequestId {
-    long nextId = ++requestId;
-    if(loggingEnabled)
-        NSLog(@"got id %ld", nextId);
-    return [NSNumber numberWithLong:nextId];
+    @synchronized(self) {
+        long nextId = ++requestId;
+        if(loggingEnabled)
+            NSLog(@"got id %ld", nextId);
+        return [NSNumber numberWithLong:nextId];
+    }
 }
 
 +(NSNumber*) queueRequest {

samples/client/petstore/objc/client/SWGPetApi.h

@@ -2,10 +2,14 @@
 #import "SWGPet.h"
 #import "SWGFile.h"
 #import "SWGObject.h"
+#import "SWGApiClient.h"
 
 
 @interface SWGPetApi: NSObject
 
+@property(nonatomic, assign)SWGApiClient *apiClient;
+
+-(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
@@ -150,4 +154,4 @@
 
 
 
-@end
+@end