[Objc] Support for variations of application/json type

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

@@ -16,30 +16,44 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
     NSMutableString *escaped = @"".mutableCopy;
 
     while (index < string.length) {
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wgnu"
-    NSUInteger length = MIN(string.length - index, batchSize);
-    #pragma GCC diagnostic pop
-    NSRange range = NSMakeRange(index, length);
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wgnu"
+        NSUInteger length = MIN(string.length - index, batchSize);
+        #pragma GCC diagnostic pop
+        NSRange range = NSMakeRange(index, length);
 
-    // To avoid breaking up character sequences such as 👴🏻👮🏽
-    range = [string rangeOfComposedCharacterSequencesForRange:range];
+        // To avoid breaking up character sequences such as 👴🏻👮🏽
+        range = [string rangeOfComposedCharacterSequencesForRange:range];
 
-    NSString *substring = [string substringWithRange:range];
-    NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
-    [escaped appendString:encoded];
+        NSString *substring = [string substringWithRange:range];
+        NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
+        [escaped appendString:encoded];
 
-    index += range.length;
+        index += range.length;
     }
 
     return escaped;
 }
 
-@interface {{classPrefix}}Sanitizer ()
+@interface SWGSanitizer ()
+
+@property (nonatomic, strong) NSRegularExpression* jsonHeaderTypeExpression;
 
 @end
 
-@implementation {{classPrefix}}Sanitizer
+@implementation SWGSanitizer
+
+static NSString * kApplicationJSONType = @"application/json";
+
+-(instancetype)init {
+    self = [super init];
+    if ( !self ) {
+        return nil;
+    }
+    _jsonHeaderTypeExpression = [NSRegularExpression regularExpressionWithPattern:@"(.*)application(.*)json(.*)" options:NSRegularExpressionCaseInsensitive error:nil];
+    return self;
+}
+
 
 - (id) sanitizeForSerialization:(id) object {
     if (object == nil) {
@@ -49,7 +63,7 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
         return object;
     }
     else if ([object isKindOfClass:[NSDate class]]) {
-        return [object ISO8601String];
+        return [self dateParameterToString:object];
     }
     else if ([object isKindOfClass:[NSArray class]]) {
         NSArray *objectArray = object;
@@ -93,7 +107,7 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
         return [param stringValue];
     }
     else if ([param isKindOfClass:[NSDate class]]) {
-        return [param ISO8601String];
+        return [self dateParameterToString:param];
     }
     else if ([param isKindOfClass:[NSArray class]]) {
         NSMutableArray *mutableParam = [NSMutableArray array];
@@ -111,30 +125,26 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
     }
 }
 
+- (NSString *)dateParameterToString:(id)param {
+    return [param ISO8601String];
+}
+
 #pragma mark - Utility Methods
 
 /*
  * Detect `Accept` from accepts
  */
 - (NSString *) selectHeaderAccept:(NSArray *)accepts {
-    if (accepts == nil || [accepts count] == 0) {
+    if (accepts.count == 0) {
         return @"";
     }
-
     NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
     for (NSString *string in accepts) {
-        NSString * lowerAccept = [string lowercaseString];
-        // use rangeOfString instead of containsString for iOS 7 support
-        if ([lowerAccept rangeOfString:@"application/json"].location != NSNotFound) {
-            return @"application/json";
+        if ([self.jsonHeaderTypeExpression matchesInString:string options:0 range:NSMakeRange(0, [string length])].count > 0) {
+            return kApplicationJSONType;
         }
-        [lowerAccepts addObject:lowerAccept];
+        [lowerAccepts addObject:[string lowercaseString]];
     }
-
-    if (lowerAccepts.count == 1) {
-        return [lowerAccepts firstObject];
-    }
-
     return [lowerAccepts componentsJoinedByString:@", "];
 }
 
@@ -142,21 +152,17 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
  * Detect `Content-Type` from contentTypes
  */
 - (NSString *) selectHeaderContentType:(NSArray *)contentTypes {
-    if (contentTypes == nil || [contentTypes count] == 0) {
-        return @"application/json";
+    if (contentTypes.count == 0) {
+        return kApplicationJSONType;
     }
-
     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];
+    for (NSString *string in contentTypes) {
+        if([self.jsonHeaderTypeExpression matchesInString:string options:0 range:NSMakeRange(0, [string length])].count > 0){
+            return kApplicationJSONType;
+        }
+        [lowerContentTypes addObject:[string lowercaseString]];
     }
+    return [lowerContentTypes firstObject];
 }
 
 @end

samples/client/petstore/objc/README.md

@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-05-10T17:16:13.387+02:00
+- Build date: 2016-05-11T17:37:37.440+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements

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

@@ -16,20 +16,20 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
     NSMutableString *escaped = @"".mutableCopy;
 
     while (index < string.length) {
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wgnu"
-    NSUInteger length = MIN(string.length - index, batchSize);
-    #pragma GCC diagnostic pop
-    NSRange range = NSMakeRange(index, length);
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wgnu"
+        NSUInteger length = MIN(string.length - index, batchSize);
+        #pragma GCC diagnostic pop
+        NSRange range = NSMakeRange(index, length);
 
-    // To avoid breaking up character sequences such as 👴🏻👮🏽
-    range = [string rangeOfComposedCharacterSequencesForRange:range];
+        // To avoid breaking up character sequences such as 👴🏻👮🏽
+        range = [string rangeOfComposedCharacterSequencesForRange:range];
 
-    NSString *substring = [string substringWithRange:range];
-    NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
-    [escaped appendString:encoded];
+        NSString *substring = [string substringWithRange:range];
+        NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
+        [escaped appendString:encoded];
 
-    index += range.length;
+        index += range.length;
     }
 
     return escaped;
@@ -37,10 +37,24 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
 
 @interface SWGSanitizer ()
 
+@property (nonatomic, strong) NSRegularExpression* jsonHeaderTypeExpression;
+
 @end
 
 @implementation SWGSanitizer
 
+static NSString * kApplicationJSONType = @"application/json";
+
+-(instancetype)init {
+    self = [super init];
+    if ( !self ) {
+        return nil;
+    }
+    _jsonHeaderTypeExpression = [NSRegularExpression regularExpressionWithPattern:@"(.*)application(.*)json(.*)" options:NSRegularExpressionCaseInsensitive error:nil];
+    return self;
+}
+
+
 - (id) sanitizeForSerialization:(id) object {
     if (object == nil) {
         return nil;
@@ -49,7 +63,7 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
         return object;
     }
     else if ([object isKindOfClass:[NSDate class]]) {
-        return [object ISO8601String];
+        return [self dateParameterToString:object];
     }
     else if ([object isKindOfClass:[NSArray class]]) {
         NSArray *objectArray = object;
@@ -93,7 +107,7 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
         return [param stringValue];
     }
     else if ([param isKindOfClass:[NSDate class]]) {
-        return [param ISO8601String];
+        return [self dateParameterToString:param];
     }
     else if ([param isKindOfClass:[NSArray class]]) {
         NSMutableArray *mutableParam = [NSMutableArray array];
@@ -111,30 +125,26 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
     }
 }
 
+- (NSString *)dateParameterToString:(id)param {
+    return [param ISO8601String];
+}
+
 #pragma mark - Utility Methods
 
 /*
  * Detect `Accept` from accepts
  */
 - (NSString *) selectHeaderAccept:(NSArray *)accepts {
-    if (accepts == nil || [accepts count] == 0) {
+    if (accepts.count == 0) {
         return @"";
     }
-
     NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
     for (NSString *string in accepts) {
-        NSString * lowerAccept = [string lowercaseString];
-        // use rangeOfString instead of containsString for iOS 7 support
-        if ([lowerAccept rangeOfString:@"application/json"].location != NSNotFound) {
-            return @"application/json";
+        if ([self.jsonHeaderTypeExpression matchesInString:string options:0 range:NSMakeRange(0, [string length])].count > 0) {
+            return kApplicationJSONType;
         }
-        [lowerAccepts addObject:lowerAccept];
+        [lowerAccepts addObject:[string lowercaseString]];
     }
-
-    if (lowerAccepts.count == 1) {
-        return [lowerAccepts firstObject];
-    }
-
     return [lowerAccepts componentsJoinedByString:@", "];
 }
 
@@ -142,21 +152,17 @@ NSString * SWGPercentEscapedStringFromString(NSString *string) {
  * Detect `Content-Type` from contentTypes
  */
 - (NSString *) selectHeaderContentType:(NSArray *)contentTypes {
-    if (contentTypes == nil || [contentTypes count] == 0) {
-        return @"application/json";
+    if (contentTypes.count == 0) {
+        return kApplicationJSONType;
     }
-
     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];
+    for (NSString *string in contentTypes) {
+        if([self.jsonHeaderTypeExpression matchesInString:string options:0 range:NSMakeRange(0, [string length])].count > 0){
+            return kApplicationJSONType;
+        }
+        [lowerContentTypes addObject:[string lowercaseString]];
     }
+    return [lowerContentTypes firstObject];
 }
 
 @end

samples/client/petstore/objc/SwaggerClientTests/Tests/SWGApiClientTest.m

@@ -33,6 +33,18 @@
     
     accepts = @[@"APPLICATION/xml", @"APPLICATION/json"];
     XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"application/vnd.github+json", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"application/json;charset=utf-8", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"application/vnd.github.v3.html+json", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"application/json");
+
+    accepts = @[@"application/vnd.github.v3.html+json"];
+    XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"application/json");
     
     accepts = @[@"text/plain", @"application/xml"];
     XCTAssertEqualObjects([sanitizer selectHeaderAccept:accepts], @"text/plain, application/xml");
@@ -53,7 +65,16 @@
     
     contentTypes = @[@"APPLICATION/xml", @"APPLICATION/json"];
     XCTAssertEqualObjects([sanitizer selectHeaderContentType:contentTypes], @"application/json");
-    
+
+    contentTypes = @[@"application/vnd.github+json", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderContentType:contentTypes], @"application/json");
+
+    contentTypes = @[@"application/json;charset=utf-8", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderContentType:contentTypes], @"application/json");
+
+    contentTypes = @[@"application/vnd.github.v3.html+json", @"application/vnd.github+xml"];
+    XCTAssertEqualObjects([sanitizer selectHeaderContentType:contentTypes], @"application/json");
+
     contentTypes = @[@"text/plain", @"application/xml"];
     XCTAssertEqualObjects([sanitizer selectHeaderContentType:contentTypes], @"text/plain");