Minor improvement to Objc API Client 'accept' and 'content-type' header

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

@@ -48,6 +48,9 @@ extern NSString *const SWGResponseObjectErrorKey;
 
 +(void) configureCacheReachibilityForHost:(NSString*)host;
 
++(NSString *) selectHeaderAccept:(NSArray *)accepts;
++(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
+
 -(void)setHeaderValue:(NSString*) value
                 forKey:(NSString*) forKey;
 

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

@@ -79,6 +79,51 @@ +(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl {
     }
 }
 
+/*
+ * Detect `Accept` from 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";
+    }
+    else {
+        return [lowerAccepts componentsJoinedByString:@", "];
+    }
+}
+
+/*
+ * Detect `Content-Type` from contentTypes
+ */
++ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
+{
+    if (contentTypes == nil || [contentTypes count] == 0) {
+        return @"application/json";
+    }
+
+    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
+    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerContentTypes addObject:[obj lowercaseString]];
+    }];
+
+    if ([lowerContentTypes containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return lowerContentTypes[0];
+    }
+}
+
 -(void)setHeaderValue:(NSString*) value
                forKey:(NSString*) forKey {
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];

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

@@ -83,12 +83,6 @@ static NSString * basePath = @"{{basePath}}";
     {{#pathParams}}[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"{{baseName}}", @"}"]] withString: [SWGApiClient escape:{{paramName}}]];
     {{/pathParams}}
 
-    NSArray* requestContentTypes = @[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}];
-    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
-
-    NSArray* responseContentTypes = @[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}];
-    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
-
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     {{#queryParams}}if({{paramName}} != nil) {
         {{#collectionFormat}}
@@ -102,6 +96,24 @@ static NSString * basePath = @"{{basePath}}";
     {{#headerParams}}if({{paramName}} != nil)
         headerParams[@"{{baseName}}"] = {{paramName}};
     {{/headerParams}}
+
+    // HTTP header `Accept` 
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]];
 
     id bodyDictionary = nil;
     {{#bodyParam}}

samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		BA525648922D4C0E9F44D4F1 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73DA4F1067C343C3962F1542 /* libPods.a */; };
+		CF31D0991B105E4B00509935 /* SWGApiClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF31D0981B105E4B00509935 /* SWGApiClientTest.m */; };
 		CFD1B6701B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */ = {isa = PBXBuildFile; fileRef = CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */; };
 		CFD1B6711B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */ = {isa = PBXBuildFile; fileRef = CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */; };
 		EA66999A1811D2FA00A70D03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699991811D2FA00A70D03 /* Foundation.framework */; };
@@ -55,6 +56,7 @@
 /* Begin PBXFileReference section */
 		73DA4F1067C343C3962F1542 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A425648B5C0A4849C7668069 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "../Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		CF31D0981B105E4B00509935 /* SWGApiClientTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClientTest.m; sourceTree = "<group>"; };
 		CFD1B66E1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSONValueTransformer+ISO8601.h"; sourceTree = "<group>"; };
 		CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSONValueTransformer+ISO8601.m"; sourceTree = "<group>"; };
 		E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "../Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
@@ -207,6 +209,7 @@
 			isa = PBXGroup;
 			children = (
 				EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */,
+				CF31D0981B105E4B00509935 /* SWGApiClientTest.m */,
 				EA6699C71811D2FB00A70D03 /* PetApiTest.m */,
 				EA6699C21811D2FB00A70D03 /* Supporting Files */,
 			);
@@ -417,6 +420,7 @@
 				EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */,
 				CFD1B6711B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */,
 				EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */,
+				CF31D0991B105E4B00509935 /* SWGApiClientTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -0,0 +1,59 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import "SWGApiClient.h"
+
+@interface SWGApiClientTest : XCTestCase
+
+@end
+
+@implementation SWGApiClientTest
+
+- (void)setUp {
+    [super setUp];
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+- (void)testSelectHeaderAccept {
+    NSArray *accepts = nil;
+
+    accepts = @[@"APPLICATION/JSON", @"APPLICATION/XML"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"application/json", @"application/xml"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"APPLICATION/xml", @"APPLICATION/json"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"text/plain", @"application/xml"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderAccept:accepts], @"text/plain, application/xml");
+
+    accepts = @[];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderAccept:accepts], @"");
+}
+
+- (void)testSelectHeaderContentType {
+    NSArray *contentTypes = nil;
+
+    contentTypes = @[@"APPLICATION/JSON", @"APPLICATION/XML"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderContentType:contentTypes], @"application/json");
+
+    contentTypes = @[@"application/json", @"application/xml"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderContentType:contentTypes], @"application/json");
+
+    contentTypes = @[@"APPLICATION/xml", @"APPLICATION/json"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderContentType:contentTypes], @"application/json");
+
+    contentTypes = @[@"text/plain", @"application/xml"];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderContentType:contentTypes], @"text/plain");
+
+    contentTypes = @[];
+    XCTAssertEqualObjects([SWGApiClient selectHeaderContentType:contentTypes], @"application/json");
+}
+
+@end

samples/client/petstore/objc/Podfile.lock

@@ -1,23 +1,23 @@
 PODS:
-  - AFNetworking (2.5.3):
-    - AFNetworking/NSURLConnection (= 2.5.3)
-    - AFNetworking/NSURLSession (= 2.5.3)
-    - AFNetworking/Reachability (= 2.5.3)
-    - AFNetworking/Security (= 2.5.3)
-    - AFNetworking/Serialization (= 2.5.3)
-    - AFNetworking/UIKit (= 2.5.3)
-  - AFNetworking/NSURLConnection (2.5.3):
+  - AFNetworking (2.5.4):
+    - AFNetworking/NSURLConnection (= 2.5.4)
+    - AFNetworking/NSURLSession (= 2.5.4)
+    - AFNetworking/Reachability (= 2.5.4)
+    - AFNetworking/Security (= 2.5.4)
+    - AFNetworking/Serialization (= 2.5.4)
+    - AFNetworking/UIKit (= 2.5.4)
+  - AFNetworking/NSURLConnection (2.5.4):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.3):
+  - AFNetworking/NSURLSession (2.5.4):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.3)
-  - AFNetworking/Security (2.5.3)
-  - AFNetworking/Serialization (2.5.3)
-  - AFNetworking/UIKit (2.5.3):
+  - AFNetworking/Reachability (2.5.4)
+  - AFNetworking/Security (2.5.4)
+  - AFNetworking/Serialization (2.5.4)
+  - AFNetworking/UIKit (2.5.4):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
   - ISO8601 (0.2.0)
@@ -29,8 +29,8 @@ DEPENDENCIES:
   - JSONModel (~> 1.0)
 
 SPEC CHECKSUMS:
-  AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
+  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
   ISO8601: 962282de75074c38bbfaa7b133b0e743ed6deb8d
   JSONModel: ec77e9865236a7a09d9cf7668df6b4b328d9ec1d
 
-COCOAPODS: 0.36.0
+COCOAPODS: 0.37.1

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

@@ -48,6 +48,9 @@ extern NSString *const SWGResponseObjectErrorKey;
 
 +(void) configureCacheReachibilityForHost:(NSString*)host;
 
++(NSString *) selectHeaderAccept:(NSArray *)accepts;
++(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
+
 -(void)setHeaderValue:(NSString*) value
                 forKey:(NSString*) forKey;
 

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

@@ -79,6 +79,51 @@ +(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl {
     }
 }
 
+/*
+ * Detect `Accept` from 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";
+    }
+    else {
+        return [lowerAccepts componentsJoinedByString:@", "];
+    }
+}
+
+/*
+ * Detect `Content-Type` from contentTypes
+ */
++ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
+{
+    if (contentTypes == nil || [contentTypes count] == 0) {
+        return @"application/json";
+    }
+
+    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
+    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerContentTypes addObject:[obj lowercaseString]];
+    }];
+
+    if ([lowerContentTypes containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return lowerContentTypes[0];
+    }
+}
+
 -(void)setHeaderValue:(NSString*) value
                forKey:(NSString*) forKey {
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];