Merge remote-tracking branch 'upstream/master' into cli-enhancements-2

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java

@@ -137,11 +137,12 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
+
+        return outputFolder + File.separator + (sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
     }
 
     public String modelFileFolder() {
-        return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage()).replace('.', File.separatorChar);
+        return outputFolder + File.separator + (sourceFolder + File.separator + modelPackage()).replace('.', File.separatorChar);
     }
 
     @Override

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java

@@ -23,6 +23,10 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String podName = "SwaggerClient";
     protected String podVersion = "1.0.0";
     protected String classPrefix = "SWG";
+    protected String authorName = "Swagger";
+    protected String authorEmail = "apiteam@swagger.io";
+    protected String license = "MIT";
+    protected String gitRepoURL = "https://github.com/swagger-api/swagger-codegen";
 
     public ObjcClientCodegen() {
         super();
@@ -112,6 +116,10 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(new CliOption("classPrefix", "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`), default: `SWG`"));
         cliOptions.add(new CliOption("podName", "cocoapods package name (convention: CameCase), default: `SwaggerClient`"));
         cliOptions.add(new CliOption("podVersion", "cocoapods package version, default: `1.0.0`"));
+        cliOptions.add(new CliOption("authorName", "Name to use in the podspec file, default: `Swagger`"));
+        cliOptions.add(new CliOption("authorEmail", "Email to use in the podspec file, default: `apiteam@swagger.io`"));
+        cliOptions.add(new CliOption("gitRepoURL", "URL for the git repo where this podspec should point to, default: `https://github.com/swagger-api/swagger-codegen`"));
+        cliOptions.add(new CliOption("license", "License to use in the podspec file, default: `MIT`"));
     }
 
     public CodegenType getTag() {
@@ -142,9 +150,29 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             setClassPrefix((String) additionalProperties.get("classPrefix"));
         }
         
+        if (additionalProperties.containsKey("authorName")) {
+            setAuthorName((String) additionalProperties.get("authorName"));
+        }
+        
+        if (additionalProperties.containsKey("authorEmail")) {
+            setAuthorEmail((String) additionalProperties.get("authorEmail"));
+        }
+        
+        if (additionalProperties.containsKey("gitRepoURL")) {
+            setGitRepoURL((String) additionalProperties.get("gitRepoURL"));
+        }
+        
+        if (additionalProperties.containsKey("license")) {
+            setLicense((String) additionalProperties.get("license"));
+        }
+
         additionalProperties.put("podName", podName);
         additionalProperties.put("podVersion", podVersion);
         additionalProperties.put("classPrefix", classPrefix);
+        additionalProperties.put("authorName", authorName);
+        additionalProperties.put("authorEmail", authorEmail);
+        additionalProperties.put("gitRepoURL", gitRepoURL);
+        additionalProperties.put("license", license);
 
         String swaggerFolder = podName;
 
@@ -384,4 +412,20 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setPodVersion(String podVersion) {
         this.podVersion = podVersion;
     }
+    
+    public void setAuthorEmail(String authorEmail) {
+        this.authorEmail = authorEmail;
+    }
+    
+    public void setAuthorName(String authorName) {
+        this.authorName = authorName;
+    }
+    
+    public void setGitRepoURL(String gitRepoURL) {
+        this.gitRepoURL = gitRepoURL;
+    }
+    
+    public void setLicense(String license) {
+        this.license = license;
+    }
 }

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

@@ -9,6 +9,13 @@ static bool cacheEnabled = false;
 static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilityStatusNotReachable;
 static void (^reachabilityChangeBlock)(int);
 
+
+@interface {{classPrefix}}ApiClient ()
+
+@property (readwrite, nonatomic) NSDictionary *HTTPResponseHeaders;
+
+@end
+
 @implementation {{classPrefix}}ApiClient
 
 - (instancetype)init {
@@ -385,6 +392,8 @@ static void (^reachabilityChangeBlock)(int);
                                                                        if([[{{classPrefix}}Configuration sharedConfig] debug]) {
                                                                            [self logResponse:operation forRequest:request error:nil];
                                                                        }
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
                                                                        completionBlock(response, nil);
                                                                    }
                                                                } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
@@ -398,6 +407,10 @@ static void (^reachabilityChangeBlock)(int);
 
                                                                        if([[{{classPrefix}}Configuration sharedConfig] debug])
                                                                            [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
+
                                                                        completionBlock(nil, augmentedError);
                                                                    }
                                                                }];
@@ -441,6 +454,7 @@ static void (^reachabilityChangeBlock)(int);
                                                                    NSURL *file = [NSURL fileURLWithPath:filepath];
 
                                                                    [operation.responseData writeToURL:file atomically:YES];
+                                                                   self.HTTPResponseHeaders = headers;
                                                                    completionBlock(file, nil);
                                                                } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
 
@@ -455,7 +469,8 @@ static void (^reachabilityChangeBlock)(int);
                                                                        if ([[{{classPrefix}}Configuration sharedConfig] debug]) {
                                                                            [self logResponse:nil forRequest:request error:augmentedError];
                                                                        }
-
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
                                                                        completionBlock(nil, augmentedError);
                                                                    }
                                                                }];

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

@@ -31,6 +31,9 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
 @property(nonatomic, assign) NSTimeInterval timeoutInterval;
 @property(nonatomic, readonly) NSOperationQueue* queue;
 
+/// In order to ensure the HTTPResponseHeaders are correct, it is recommended to initialize one {{classPrefix}}ApiClient instance per thread.
+@property(nonatomic, readonly) NSDictionary* HTTPResponseHeaders;
+
 /**
  * Clears Cache
  */

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

@@ -11,6 +11,8 @@
 
 @implementation {{classname}}
 
+static {{classname}}* singletonAPI = nil;
+
 #pragma mark - Initialize methods
 
 - (id) init {
@@ -38,7 +40,6 @@
 #pragma mark -
 
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static {{classname}}* singletonAPI = nil;
 
     if (singletonAPI == nil) {
         singletonAPI = [[{{classname}} alloc] init];
@@ -47,6 +48,14 @@
     return singletonAPI;
 }
 
++({{classname}}*) sharedAPI {
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[{{classname}} alloc] init];
+    }
+    return singletonAPI;
+}
+
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }

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

@@ -20,6 +20,7 @@
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
++({{classname}}*) sharedAPI;
 {{#operation}}
 ///
 ///

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

@@ -21,6 +21,11 @@ Pod::Spec.new do |s|
 
     s.framework    = 'SystemConfiguration'
     
+    s.homepage     = "{{gitRepoURL}}"
+    s.license      = "{{license}}"
+    s.source       = { :git => "{{gitRepoURL}}.git", :tag => "#{s.version}" }
+    s.author       = { "{{authorName}}" => "{{authorEmail}}" }
+
     s.source_files = '{{podName}}/**/*'
     s.public_header_files = '{{podName}}/**/*.h'
 

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -270,7 +270,7 @@ class ApiClient(object):
         if klass in [int, float, str, bool]:
             return self.__deserialize_primitive(data, klass)
         elif klass == object:
-            return self.__deserialize_object()
+            return self.__deserialize_object(data)
         elif klass == date:
             return self.__deserialize_date(data)
         elif klass == datetime:
@@ -495,13 +495,13 @@ class ApiClient(object):
             value = data
         return value
 
-    def __deserialize_object(self):
+    def __deserialize_object(self, value):
         """
-        Deserializes empty object.
+        Return a original value.
 
         :return: object.
         """
-        return object()
+        return value
 
     def __deserialize_date(self, string):
         """

samples/client/petstore/objc/README.md

@@ -12,6 +12,10 @@ To install it, put the API client library in your project and then simply add th
 pod "SwaggerClient", :path => "/path/to/lib"
 ```
 
+## Recommendation
+
+It's recommended to create an instance of ApiClient per thread in a multithreaded environment to avoid any potential issue.
+
 ## Author
 
 apiteam@swagger.io

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

@@ -35,6 +35,9 @@ extern NSString *const SWGResponseObjectErrorKey;
 @property(nonatomic, assign) NSTimeInterval timeoutInterval;
 @property(nonatomic, readonly) NSOperationQueue* queue;
 
+/// In order to ensure the HTTPResponseHeaders are correct, it is recommended to initialize one SWGApiClient instance per thread.
+@property(nonatomic, readonly) NSDictionary* HTTPResponseHeaders;
+
 /**
  * Clears Cache
  */

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

@@ -9,6 +9,13 @@ static bool cacheEnabled = false;
 static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilityStatusNotReachable;
 static void (^reachabilityChangeBlock)(int);
 
+
+@interface SWGApiClient ()
+
+@property (readwrite, nonatomic) NSDictionary *HTTPResponseHeaders;
+
+@end
+
 @implementation SWGApiClient
 
 - (instancetype)init {
@@ -385,6 +392,8 @@ static void (^reachabilityChangeBlock)(int);
                                                                        if([[SWGConfiguration sharedConfig] debug]) {
                                                                            [self logResponse:operation forRequest:request error:nil];
                                                                        }
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
                                                                        completionBlock(response, nil);
                                                                    }
                                                                } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
@@ -398,6 +407,10 @@ static void (^reachabilityChangeBlock)(int);
 
                                                                        if([[SWGConfiguration sharedConfig] debug])
                                                                            [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
+
                                                                        completionBlock(nil, augmentedError);
                                                                    }
                                                                }];
@@ -441,6 +454,7 @@ static void (^reachabilityChangeBlock)(int);
                                                                    NSURL *file = [NSURL fileURLWithPath:filepath];
 
                                                                    [operation.responseData writeToURL:file atomically:YES];
+                                                                   self.HTTPResponseHeaders = headers;
                                                                    completionBlock(file, nil);
                                                                } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
 
@@ -455,7 +469,8 @@ static void (^reachabilityChangeBlock)(int);
                                                                        if ([[SWGConfiguration sharedConfig] debug]) {
                                                                            [self logResponse:nil forRequest:request error:augmentedError];
                                                                        }
-
+                                                                       NSDictionary *responseHeaders = [[operation response] allHeaderFields];
+                                                                       self.HTTPResponseHeaders = responseHeaders;
                                                                        completionBlock(nil, augmentedError);
                                                                    }
                                                                }];

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

@@ -18,6 +18,7 @@
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
++(SWGPetApi*) sharedAPI;
 ///
 ///
 /// Update an existing pet

samples/client/petstore/objc/SwaggerClient/SWGPetApi.m

@@ -9,6 +9,8 @@
 
 @implementation SWGPetApi
 
+static SWGPetApi* singletonAPI = nil;
+
 #pragma mark - Initialize methods
 
 - (id) init {
@@ -36,7 +38,6 @@
 #pragma mark -
 
 +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGPetApi* singletonAPI = nil;
 
     if (singletonAPI == nil) {
         singletonAPI = [[SWGPetApi alloc] init];
@@ -45,6 +46,14 @@
     return singletonAPI;
 }
 
++(SWGPetApi*) sharedAPI {
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGPetApi alloc] init];
+    }
+    return singletonAPI;
+}
+
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }

samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h

@@ -18,6 +18,7 @@
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
++(SWGStoreApi*) sharedAPI;
 ///
 ///
 /// Returns pet inventories by status

samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m

@@ -9,6 +9,8 @@
 
 @implementation SWGStoreApi
 
+static SWGStoreApi* singletonAPI = nil;
+
 #pragma mark - Initialize methods
 
 - (id) init {
@@ -36,7 +38,6 @@
 #pragma mark -
 
 +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGStoreApi* singletonAPI = nil;
 
     if (singletonAPI == nil) {
         singletonAPI = [[SWGStoreApi alloc] init];
@@ -45,6 +46,14 @@
     return singletonAPI;
 }
 
++(SWGStoreApi*) sharedAPI {
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGStoreApi alloc] init];
+    }
+    return singletonAPI;
+}
+
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }

samples/client/petstore/objc/SwaggerClient/SWGUserApi.h

@@ -18,6 +18,7 @@
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
++(SWGUserApi*) sharedAPI;
 ///
 ///
 /// Create user

samples/client/petstore/objc/SwaggerClient/SWGUserApi.m

@@ -9,6 +9,8 @@
 
 @implementation SWGUserApi
 
+static SWGUserApi* singletonAPI = nil;
+
 #pragma mark - Initialize methods
 
 - (id) init {
@@ -36,7 +38,6 @@
 #pragma mark -
 
 +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGUserApi* singletonAPI = nil;
 
     if (singletonAPI == nil) {
         singletonAPI = [[SWGUserApi alloc] init];
@@ -45,6 +46,14 @@
     return singletonAPI;
 }
 
++(SWGUserApi*) sharedAPI {
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGUserApi alloc] init];
+    }
+    return singletonAPI;
+}
+
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }