- {{#vars}}
{{name}} {{^required}}(optional){{/required}}
{{datatype}} {{description}}
+ {{#vars}}
{{name}} {{^required}}(optional){{/required}}
{{^isPrimitiveType}}{{datatype}}{{/isPrimitiveType}} {{description}}
{{#isEnum}}
{{#_enum}}
{{this}}
{{/_enum}}
diff --git a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
index 86aa21af635..2d2b917c4b2 100644
--- a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
@@ -11,6 +11,6 @@
"dependencies": {
"connect": "^3.2.0",
"js-yaml": "^3.3.0",
- "swagger-tools": "0.9.*"
+ "swagger-tools": "0.10.1"
}
}
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
index 18b756f78b0..5afc917e228 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -2,10 +2,6 @@
NSString *const {{classPrefix}}ResponseObjectErrorKey = @"{{classPrefix}}ResponseObject";
-NSString *const {{classPrefix}}DeserializationErrorDomainKey = @"{{classPrefix}}DeserializationErrorDomainKey";
-
-NSInteger const {{classPrefix}}TypeMismatchErrorCode = 143553;
-
static long requestId = 0;
static bool offlineState = false;
static NSMutableSet * queuedRequests = nil;
@@ -14,6 +10,30 @@ static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilitySta
static void (^reachabilityChangeBlock)(int);
+static NSDictionary * {{classPrefix}}__headerFieldsForResponse(NSURLResponse *response) {
+ if(![response isKindOfClass:[NSHTTPURLResponse class]]) {
+ return nil;
+ }
+ return ((NSHTTPURLResponse*)response).allHeaderFields;
+}
+
+static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response) {
+ NSDictionary * headers = {{classPrefix}}__headerFieldsForResponse(response);
+ if(!headers[@"Content-Disposition"]) {
+ return [NSString stringWithFormat:@"%@", [[NSProcessInfo processInfo] globallyUniqueString]];
+ }
+ NSString *pattern = @"filename=['\"]?([^'\"\\s]+)['\"]?";
+ NSRegularExpression *regexp = [NSRegularExpression regularExpressionWithPattern:pattern
+ options:NSRegularExpressionCaseInsensitive
+ error:nil];
+ NSString *contentDispositionHeader = headers[@"Content-Disposition"];
+ NSTextCheckingResult *match = [regexp firstMatchInString:contentDispositionHeader
+ options:0
+ range:NSMakeRange(0, [contentDispositionHeader length])];
+ return [contentDispositionHeader substringWithRange:[match rangeAtIndex:1]];
+}
+
+
@interface {{classPrefix}}ApiClient ()
@property (readwrite, nonatomic) NSDictionary *HTTPResponseHeaders;
@@ -33,6 +53,8 @@ static void (^reachabilityChangeBlock)(int);
self.requestSerializer = [AFJSONRequestSerializer serializer];
self.responseSerializer = [AFJSONResponseSerializer serializer];
self.securityPolicy = [self customSecurityPolicy];
+ self.responseDeserializer = [[{{classPrefix}}ResponseDeserializer alloc] init];
+ self.sanitizer = [[{{classPrefix}}Sanitizer alloc] init];
// configure reachability
[self configureCacheReachibility];
}
@@ -99,14 +121,12 @@ static void (^reachabilityChangeBlock)(int);
va_end(args);
}
-- (void)logResponse:(AFHTTPRequestOperation *)operation
- forRequest:(NSURLRequest *)request
- error:(NSError*)error {
+- (void)logResponse:(NSURLResponse *)response responseObject:(id)responseObject request:(NSURLRequest *)request error:(NSError *)error {
NSString *message = [NSString stringWithFormat:@"\n[DEBUG] HTTP request body \n~BEGIN~\n %@\n~END~\n"\
"[DEBUG] HTTP response body \n~BEGIN~\n %@\n~END~\n",
[[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
- operation.responseString];
+ responseObject];
{{classPrefix}}DebugLog(message);
}
@@ -222,20 +242,14 @@ static void (^reachabilityChangeBlock)(int);
-(Boolean) executeRequestWithId:(NSNumber*) requestId {
NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
- if ([obj intValue] == [requestId intValue]) {
- return YES;
- }
- else {
- return NO;
- }
+ return [obj intValue] == [requestId intValue];
}];
if (matchingItems.count == 1) {
{{classPrefix}}DebugLog(@"removed request id %@", requestId);
[queuedRequests removeObject:requestId];
return YES;
- }
- else {
+ } else {
return NO;
}
}
@@ -246,7 +260,7 @@ static void (^reachabilityChangeBlock)(int);
return reachabilityStatus;
}
-+(bool) getOfflineState {
++(BOOL) getOfflineState {
return offlineState;
}
@@ -257,29 +271,8 @@ static void (^reachabilityChangeBlock)(int);
- (void) configureCacheReachibility {
[self.reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
reachabilityStatus = status;
- switch (status) {
- case AFNetworkReachabilityStatusUnknown:
- {{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
- [{{classPrefix}}ApiClient setOfflineState:true];
- break;
-
- case AFNetworkReachabilityStatusNotReachable:
- {{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
- [{{classPrefix}}ApiClient setOfflineState:true];
- break;
-
- case AFNetworkReachabilityStatusReachableViaWWAN:
- {{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
- [{{classPrefix}}ApiClient setOfflineState:false];
- break;
-
- case AFNetworkReachabilityStatusReachableViaWiFi:
- {{classPrefix}}DebugLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
- [{{classPrefix}}ApiClient setOfflineState:false];
- break;
- default:
- break;
- }
+ {{classPrefix}}DebugLog(@"reachability changed to %@",AFStringFromNetworkReachabilityStatus(status));
+ [{{classPrefix}}ApiClient setOfflineState:status == AFNetworkReachabilityStatusUnknown || status == AFNetworkReachabilityStatusNotReachable];
// call the reachability block, if configured
if (reachabilityChangeBlock != nil) {
@@ -290,245 +283,65 @@ static void (^reachabilityChangeBlock)(int);
[self.reachabilityManager startMonitoring];
}
-#pragma mark - Deserialize methods
-
-- (id) deserialize:(id) data class:(NSString *) class error:(NSError **) error {
- // return nil if data is nil or class is nil
- if (!data || !class) {
- return nil;
- }
-
- // remove "*" from class, if ends with "*"
- if ([class hasSuffix:@"*"]) {
- class = [class substringToIndex:[class length] - 1];
- }
-
- // pure object
- if ([class isEqualToString:@"NSObject"]) {
- return data;
- }
-
- NSRegularExpression *regexp = nil;
- NSTextCheckingResult *match = nil;
- NSMutableArray *resultArray = nil;
- NSMutableDictionary *resultDict = nil;
- NSString *innerType = nil;
-
- // list of models
- NSString *arrayOfModelsPat = @"NSArray<(.+)>";
- regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfModelsPat
- options:NSRegularExpressionCaseInsensitive
- error:nil];
-
- match = [regexp firstMatchInString:class
- options:0
- range:NSMakeRange(0, [class length])];
-
- if (match) {
- if(![data isKindOfClass: [NSArray class]]) {
- if(error) {
- NSDictionary * userInfo = @{NSLocalizedDescriptionKey : NSLocalizedString(@"Received response is not an array", nil)};
- *error = [NSError errorWithDomain:{{classPrefix}}DeserializationErrorDomainKey code:{{classPrefix}}TypeMismatchErrorCode userInfo:userInfo];
- }
- return nil;
- }
- NSArray *dataArray = data;
- innerType = [class substringWithRange:[match rangeAtIndex:1]];
-
- resultArray = [NSMutableArray arrayWithCapacity:[dataArray count]];
- [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
- id arrObj = [self deserialize:obj class:innerType error:error];
- if(arrObj) {
- [resultArray addObject:arrObj];
- } else {
- * stop = YES;
- }
- }];
-
- return resultArray;
- }
-
- // list of primitives
- NSString *arrayOfPrimitivesPat = @"NSArray\\* /\\* (.+) \\*/";
- regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfPrimitivesPat
- options:NSRegularExpressionCaseInsensitive
- error:nil];
- match = [regexp firstMatchInString:class
- options:0
- range:NSMakeRange(0, [class length])];
-
- if (match) {
- NSArray *dataArray = data;
- innerType = [class substringWithRange:[match rangeAtIndex:1]];
-
- resultArray = [NSMutableArray arrayWithCapacity:[dataArray count]];
- [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
- id arrObj = [self deserialize:obj class:innerType error:error];
- if(arrObj) {
- [resultArray addObject:arrObj];
- } else {
- * stop = YES;
- }
- }];
-
- return resultArray;
- }
-
- // map
- NSString *dictPat = @"NSDictionary\\* /\\* (.+?), (.+) \\*/";
- regexp = [NSRegularExpression regularExpressionWithPattern:dictPat
- options:NSRegularExpressionCaseInsensitive
- error:nil];
- match = [regexp firstMatchInString:class
- options:0
- range:NSMakeRange(0, [class length])];
-
- if (match) {
- NSDictionary *dataDict = data;
- NSString *valueType = [class substringWithRange:[match rangeAtIndex:2]];
-
- resultDict = [NSMutableDictionary dictionaryWithCapacity:[dataDict count]];
- [data enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
- id dicObj = [self deserialize:obj class:valueType error:error];
- if(dicObj) {
- [resultDict setValue:dicObj forKey:key];
- } else {
- * stop = YES;
- }
- }];
-
- return resultDict;
- }
-
- // primitives
- NSArray *primitiveTypes = @[@"NSString", @"NSDate", @"NSNumber"];
-
- if ([primitiveTypes containsObject:class]) {
- if ([class isEqualToString:@"NSString"]) {
- return [NSString stringWithString:data];
- }
- else if ([class isEqualToString:@"NSDate"]) {
- return [NSDate dateWithISO8601String:data];
- }
- else if ([class isEqualToString:@"NSNumber"]) {
- // NSNumber from NSNumber
- if ([data isKindOfClass:[NSNumber class]]) {
- return data;
- }
- else if ([data isKindOfClass:[NSString class]]) {
- // NSNumber (NSCFBoolean) from NSString
- if ([[data lowercaseString] isEqualToString:@"true"] || [[data lowercaseString] isEqualToString:@"false"]) {
- return [NSNumber numberWithBool:[data boolValue]];
- // NSNumber from NSString
- } else {
- NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
- formatter.numberStyle = NSNumberFormatterDecimalStyle;
- return [formatter numberFromString:data];
- }
- }
- }
- }
-
- // model
- Class ModelClass = NSClassFromString(class);
- if ([ModelClass instancesRespondToSelector:@selector(initWithDictionary:error:)]) {
- return [(JSONModel *) [ModelClass alloc] initWithDictionary:data error:error];
- }
-
- return nil;
-}
-
#pragma mark - Operation Methods
- (void) operationWithCompletionBlock: (NSURLRequest *)request
requestId: (NSNumber *) requestId
completionBlock: (void (^)(id, NSError *))completionBlock {
- AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
- success:^(AFHTTPRequestOperation *operation, id response) {
- if ([self executeRequestWithId:requestId]) {
- [self logResponse:operation forRequest:request error:nil];
- NSDictionary *responseHeaders = [[operation response] allHeaderFields];
- self.HTTPResponseHeaders = responseHeaders;
- completionBlock(response, nil);
- }
- } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
- if ([self executeRequestWithId:requestId]) {
- NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
- if (operation.responseObject) {
- // Add in the (parsed) response body.
- userInfo[{{classPrefix}}ResponseObjectErrorKey] = operation.responseObject;
- }
- NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
- [self logResponse:nil forRequest:request error:augmentedError];
-
- NSDictionary *responseHeaders = [[operation response] allHeaderFields];
- self.HTTPResponseHeaders = responseHeaders;
-
- completionBlock(nil, augmentedError);
- }
- }];
-
- [self.operationQueue addOperation:op];
+ __weak __typeof(self)weakSelf = self;
+ NSURLSessionDataTask* op = [self dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+ __strong __typeof(weakSelf)strongSelf = weakSelf;
+ if (![strongSelf executeRequestWithId:requestId]) {
+ return;
+ }
+ [strongSelf logResponse:response responseObject:responseObject request:request error:error];
+ strongSelf.HTTPResponseHeaders = {{classPrefix}}__headerFieldsForResponse(response);
+ if(!error) {
+ completionBlock(responseObject, nil);
+ return;
+ }
+ NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
+ if (responseObject) {
+ // Add in the (parsed) response body.
+ userInfo[{{classPrefix}}ResponseObjectErrorKey] = responseObject;
+ }
+ NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
+ completionBlock(nil, augmentedError);
+ }];
+ [op resume];
}
- (void) downloadOperationWithCompletionBlock: (NSURLRequest *)request
requestId: (NSNumber *) requestId
completionBlock: (void (^)(id, NSError *))completionBlock {
- AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
- success:^(AFHTTPRequestOperation *operation, id responseObject) {
- {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
- NSString *directory = nil;
- if (config.tempFolderPath) {
- directory = config.tempFolderPath;
- }
- else {
- directory = NSTemporaryDirectory();
- }
+ __weak __typeof(self)weakSelf = self;
+ NSURLSessionDataTask* op = [self dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+ __strong __typeof(weakSelf)strongSelf = weakSelf;
+ if (![strongSelf executeRequestWithId:requestId]) {
+ return;
+ }
+ strongSelf.HTTPResponseHeaders = {{classPrefix}}__headerFieldsForResponse(response);
+ [strongSelf logResponse:response responseObject:responseObject request:request error:error];
+ if(error) {
+ NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
+ if (responseObject) {
+ userInfo[{{classPrefix}}ResponseObjectErrorKey] = responseObject;
+ }
+ NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
+ completionBlock(nil, augmentedError);
+ }
+ {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
+ NSString *directory = config.tempFolderPath ?: NSTemporaryDirectory();
+ NSString * filename = {{classPrefix}}__fileNameForResponse(response);
- NSDictionary *headers = operation.response.allHeaderFields;
- NSString *filename = nil;
- if ([headers objectForKey:@"Content-Disposition"]) {
+ NSString *filepath = [directory stringByAppendingPathComponent:filename];
+ NSURL *file = [NSURL fileURLWithPath:filepath];
- NSString *pattern = @"filename=['\"]?([^'\"\\s]+)['\"]?";
- NSRegularExpression *regexp = [NSRegularExpression regularExpressionWithPattern:pattern
- options:NSRegularExpressionCaseInsensitive
- error:nil];
- NSString *contentDispositionHeader = [headers objectForKey:@"Content-Disposition"];
- NSTextCheckingResult *match = [regexp firstMatchInString:contentDispositionHeader
- options:0
- range:NSMakeRange(0, [contentDispositionHeader length])];
- filename = [contentDispositionHeader substringWithRange:[match rangeAtIndex:1]];
- }
- else {
- filename = [NSString stringWithFormat:@"%@", [[NSProcessInfo processInfo] globallyUniqueString]];
- }
+ [responseObject writeToURL:file atomically:YES];
- NSString *filepath = [directory stringByAppendingPathComponent:filename];
- NSURL *file = [NSURL fileURLWithPath:filepath];
-
- [operation.responseData writeToURL:file atomically:YES];
- self.HTTPResponseHeaders = headers;
- completionBlock(file, nil);
- } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-
- if ([self executeRequestWithId:requestId]) {
- NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
- if (operation.responseObject) {
- userInfo[{{classPrefix}}ResponseObjectErrorKey] = operation.responseObject;
- }
-
- NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-
-
- [self logResponse:nil forRequest:request error:augmentedError];
-
- NSDictionary *responseHeaders = [[operation response] allHeaderFields];
- self.HTTPResponseHeaders = responseHeaders;
- completionBlock(nil, augmentedError);
- }
- }];
-
- [self.operationQueue addOperation:op];
+ completionBlock(file, nil);
+ }];
+ [op resume];
}
#pragma mark - Perform Request Methods
@@ -569,11 +382,11 @@ static void (^reachabilityChangeBlock)(int);
}
// sanitize parameters
- pathParams = [self sanitizeForSerialization:pathParams];
- queryParams = [self sanitizeForSerialization:queryParams];
- headerParams = [self sanitizeForSerialization:headerParams];
- formParams = [self sanitizeForSerialization:formParams];
- body = [self sanitizeForSerialization:body];
+ pathParams = [self.sanitizer sanitizeForSerialization:pathParams];
+ queryParams = [self.sanitizer sanitizeForSerialization:queryParams];
+ headerParams = [self.sanitizer sanitizeForSerialization:headerParams];
+ formParams = [self.sanitizer sanitizeForSerialization:formParams];
+ body = [self.sanitizer sanitizeForSerialization:body];
// auth setting
[self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
@@ -593,12 +406,13 @@ static void (^reachabilityChangeBlock)(int);
NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
if (files.count > 0) {
+ __weak __typeof(self)weakSelf = self;
request = [self.requestSerializer multipartFormRequestWithMethod:@"POST"
URLString:urlString
parameters:nil
constructingBodyWithBlock:^(id
formData) {
[formParams enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
- NSString *objString = [self parameterToString:obj];
+ NSString *objString = [weakSelf.sanitizer parameterToString:obj];
NSData *data = [objString dataUsingEncoding:NSUTF8StringEncoding];
[formData appendPartWithFormData:data name:key];
}];
@@ -653,7 +467,7 @@ static void (^reachabilityChangeBlock)(int);
[request setHTTPShouldHandleCookies:NO];
NSNumber* requestId = [{{classPrefix}}ApiClient queueRequest];
- if ([responseType isEqualToString:@"NSURL*"]) {
+ if ([responseType isEqualToString:@"NSURL*"] || [responseType isEqualToString:@"NSURL"]) {
[self downloadOperationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
completionBlock(data, error);
}];
@@ -661,7 +475,7 @@ static void (^reachabilityChangeBlock)(int);
else {
[self operationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
NSError * serializationError;
- id response = [self deserialize:data class:responseType error:&serializationError];
+ id response = [self.responseDeserializer deserialize:data class:responseType error:&serializationError];
if(!response && !error){
error = serializationError;
}
@@ -760,48 +574,6 @@ static void (^reachabilityChangeBlock)(int);
*querys = [NSDictionary dictionaryWithDictionary:querysWithAuth];
}
-- (id) sanitizeForSerialization:(id) object {
- if (object == nil) {
- return nil;
- }
- else if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]] || [object isKindOfClass:[{{classPrefix}}QueryParamCollection class]]) {
- return object;
- }
- else if ([object isKindOfClass:[NSDate class]]) {
- return [object ISO8601String];
- }
- else if ([object isKindOfClass:[NSArray class]]) {
- NSArray *objectArray = object;
- NSMutableArray *sanitizedObjs = [NSMutableArray arrayWithCapacity:[objectArray count]];
- [object enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
- if (obj) {
- [sanitizedObjs addObject:[self sanitizeForSerialization:obj]];
- }
- }];
- return sanitizedObjs;
- }
- else if ([object isKindOfClass:[NSDictionary class]]) {
- NSDictionary *objectDict = object;
- NSMutableDictionary *sanitizedObjs = [NSMutableDictionary dictionaryWithCapacity:[objectDict count]];
- [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
- if (obj) {
- [sanitizedObjs setValue:[self sanitizeForSerialization:obj] forKey:key];
- }
- }];
- return sanitizedObjs;
- }
- else if ([object isKindOfClass:[{{classPrefix}}Object class]]) {
- return [object toDictionary];
- }
- else {
- NSException *e = [NSException
- exceptionWithName:@"InvalidObjectArgumentException"
- reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", object]
- userInfo:nil];
- @throw e;
- }
-}
-
- (AFSecurityPolicy *) customSecurityPolicy {
AFSecurityPolicy *securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
@@ -823,30 +595,4 @@ static void (^reachabilityChangeBlock)(int);
return securityPolicy;
}
-- (NSString *) parameterToString:(id)param {
- if ([param isKindOfClass:[NSString class]]) {
- return param;
- }
- else if ([param isKindOfClass:[NSNumber class]]) {
- return [param stringValue];
- }
- else if ([param isKindOfClass:[NSDate class]]) {
- return [param ISO8601String];
- }
- else if ([param isKindOfClass:[NSArray class]]) {
- NSMutableArray *mutableParam;
- [param enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
- [mutableParam addObject:[self parameterToString:obj]];
- }];
- return [mutableParam componentsJoinedByString:@","];
- }
- else {
- NSException *e = [NSException
- exceptionWithName:@"InvalidObjectArgumentException"
- reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", param]
- userInfo:nil];
- @throw e;
- }
-}
-
@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
index 1cf3db5e523..b08112ba445 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -1,11 +1,12 @@
#import
#import
-#import
+#import
#import "{{classPrefix}}JSONResponseSerializer.h"
#import "{{classPrefix}}JSONRequestSerializer.h"
#import "{{classPrefix}}QueryParamCollection.h"
#import "{{classPrefix}}Configuration.h"
-
+#import "{{classPrefix}}ResponseDeserializer.h"
+#import "{{classPrefix}}Sanitizer.h"
/**
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen
@@ -25,22 +26,14 @@
*/
extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
-/**
- * A key for deserialization ErrorDomain
- */
-extern NSString *const {{classPrefix}}DeserializationErrorDomainKey;
-
-/**
- * Code for deserialization type mismatch error
- */
-extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
-
/**
* Log debug message macro
*/
-#define {{classPrefix}}DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
+#ifndef {{classPrefix}}DebugLog
+ #define {{classPrefix}}DebugLog(format, ...) [{{classPrefix}}ApiClient debugLog:[NSString stringWithFormat:@"%s", __PRETTY_FUNCTION__] message: format, ##__VA_ARGS__];
+#endif
-@interface {{classPrefix}}ApiClient : AFHTTPRequestOperationManager
+@interface {{classPrefix}}ApiClient : AFHTTPSessionManager
@property(nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
@property(nonatomic, assign) NSTimeInterval timeoutInterval;
@@ -49,6 +42,9 @@ extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
/// In order to ensure the HTTPResponseHeaders are correct, it is recommended to initialize one {{classPrefix}}ApiClient instance per thread.
@property(nonatomic, readonly) NSDictionary* HTTPResponseHeaders;
+@property(nonatomic, strong) id<{{classPrefix}}ResponseDeserializer> responseDeserializer;
+
+@property(nonatomic, strong) id<{{classPrefix}}Sanitizer> sanitizer;
/**
* Clears Cache
*/
@@ -80,7 +76,7 @@ extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
*
* @return The client offline state
*/
-+(bool) getOfflineState;
++(BOOL) getOfflineState;
/**
* Sets the client reachability, this may be overridden by the reachability manager if reachability changes
@@ -176,24 +172,17 @@ extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
queryParams:(NSDictionary **)querys
WithAuthSettings:(NSArray *)authSettings;
-/**
- * Deserializes the given data to Objective-C object.
- *
- * @param data The data will be deserialized.
- * @param class The type of objective-c object.
- * @param error The error
- */
-- (id) deserialize:(id) data class:(NSString *) class error:(NSError**)error;
-
/**
* Logs request and response
*
- * @param operation AFHTTPRequestOperation for the HTTP request.
+ * @param response NSURLResponse for the HTTP request.
+ * @param responseObject response object of the HTTP request.
* @param request The HTTP request.
* @param error The error of the HTTP request.
*/
-- (void)logResponse:(AFHTTPRequestOperation *)operation
- forRequest:(NSURLRequest *)request
+- (void)logResponse:(NSURLResponse *)response
+ responseObject:(id)responseObject
+ request:(NSURLRequest *)request
error:(NSError *)error;
/**
@@ -226,13 +215,6 @@ extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
responseType:(NSString *) responseType
completionBlock:(void (^)(id, NSError *))completionBlock;
-/**
- * Sanitize object for request
- *
- * @param object The query/path/header/form/body param to be sanitized.
- */
-- (id) sanitizeForSerialization:(id) object;
-
/**
* Custom security policy
*
@@ -240,11 +222,6 @@ extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
*/
- (AFSecurityPolicy *) customSecurityPolicy;
-/**
- * Convert parameter to NSString
- */
-- (NSString *) parameterToString: (id) param;
-
/**
* Log debug message
*/
diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
index 4f5442ed213..527e16c2b91 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
@@ -72,7 +72,7 @@
return @"";
}
else {
- return [NSString stringWithFormat:@"BEARER %@", self.accessToken];
+ return [NSString stringWithFormat:@"Bearer %@", self.accessToken];
}
}
diff --git a/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
index 122484f1ad4..b4599c34f3f 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
@@ -1,4 +1,13 @@
#import "{{classPrefix}}Object.h"
@implementation {{classPrefix}}Object
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+ return [[self toDictionary] description];
+}
+
@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/README.mustache b/modules/swagger-codegen/src/main/resources/objc/README.mustache
index c0bc1178b0b..ed48e239596 100644
--- a/modules/swagger-codegen/src/main/resources/objc/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/README.mustache
@@ -70,8 +70,8 @@ Please follow the [installation procedure](#installation--usage) and then run th
{{/isBasic}}{{#isApiKey}}
// Configure API key authorization: (authentication scheme: {{{name}}})
[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"{{{keyParamName}}}"];
-// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-//[apiConfig setApiKeyPrefix:@"BEARER" forApiKeyIdentifier:@"{{{keyParamName}}}"];
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"{{{keyParamName}}}"];
{{/isApiKey}}{{#isOAuth}}
// Configure OAuth2 access token for authorization: (authentication scheme: {{{name}}})
[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
diff --git a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-body.mustache
new file mode 100644
index 00000000000..812ed061c04
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-body.mustache
@@ -0,0 +1,231 @@
+#import "{{classPrefix}}ResponseDeserializer.h"
+#import
+#import
+
+NSString *const {{classPrefix}}DeserializationErrorDomainKey = @"{{classPrefix}}DeserializationErrorDomainKey";
+
+NSInteger const {{classPrefix}}TypeMismatchErrorCode = 143553;
+
+NSInteger const {{classPrefix}}EmptyValueOccurredErrorCode = 143509;
+
+NSInteger const {{classPrefix}}UnknownResponseObjectErrorCode = 143528;
+
+
+@interface {{classPrefix}}ResponseDeserializer ()
+
+@property (nonatomic, strong) NSNumberFormatter* numberFormatter;
+@property (nonatomic, strong) NSArray *primitiveTypes;
+@property (nonatomic, strong) NSArray *basicReturnTypes;
+
+@property (nonatomic, strong) NSRegularExpression* arrayOfModelsPatExpression;
+@property (nonatomic, strong) NSRegularExpression* arrayOfPrimitivesPatExpression;
+@property (nonatomic, strong) NSRegularExpression* dictPatExpression;
+@property (nonatomic, strong) NSRegularExpression* dictModelsPatExpression;
+
+@end
+
+@implementation {{classPrefix}}ResponseDeserializer
+
+- (instancetype)init {
+ self = [super init];
+ if (self) {
+ NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+ formatter.numberStyle = NSNumberFormatterDecimalStyle;
+ _numberFormatter = formatter;
+ _primitiveTypes = @[@"NSString", @"NSDate", @"NSNumber"];
+ _basicReturnTypes = @[@"NSObject", @"id", @"NSData"];
+ _arrayOfModelsPatExpression = [NSRegularExpression regularExpressionWithPattern:@"NSArray<(.+)>"
+ options:NSRegularExpressionCaseInsensitive
+ error:nil];
+ _arrayOfPrimitivesPatExpression = [NSRegularExpression regularExpressionWithPattern:@"NSArray\\* /\\* (.+) \\*/"
+ options:NSRegularExpressionCaseInsensitive
+ error:nil];
+ _dictPatExpression = [NSRegularExpression regularExpressionWithPattern:@"NSDictionary\\* /\\* (.+?), (.+) \\*/"
+ options:NSRegularExpressionCaseInsensitive
+ error:nil];
+ _dictModelsPatExpression = [NSRegularExpression regularExpressionWithPattern:@"NSDictionary\\<(.+?), (.+)*\\>"
+ options:NSRegularExpressionCaseInsensitive
+ error:nil];
+ }
+ return self;
+}
+
+#pragma mark - Deserialize methods
+
+- (id) deserialize:(id) data class:(NSString *) className error:(NSError **) error {
+ // return nil if data is nil or className is nil
+ if (!data || !className || [data isKindOfClass:[NSNull class]]) {
+ return nil;
+ }
+
+ // remove "*" from className, if ends with "*"
+ if ([className hasSuffix:@"*"]) {
+ className = [className substringToIndex:[className length] - 1];
+ }
+ // pure object
+ if ([self.basicReturnTypes containsObject:className]) {
+ return data;
+ }
+
+ // primitives
+ if ([self.primitiveTypes containsObject:className]) {
+ return [self deserializePrimitiveValue:data class:className error:error];
+ }
+
+ NSTextCheckingResult *match = nil;
+ NSRange range = NSMakeRange(0, [className length]);
+ // list of models
+ match = [self.arrayOfModelsPatExpression firstMatchInString:className options:0 range:range];
+ if (match) {
+ NSString *innerType = [className substringWithRange:[match rangeAtIndex:1]];
+ return [self deserializeArrayValue:data innerType:innerType error:error];
+ }
+
+ // list of primitives
+ match = [self.arrayOfPrimitivesPatExpression firstMatchInString:className options:0 range:range];
+ if (match) {
+ NSString *innerType = [className substringWithRange:[match rangeAtIndex:1]];
+ return [self deserializeArrayValue:data innerType:innerType error:error];
+ }
+
+ // map
+ match = [self.dictPatExpression firstMatchInString:className options:0 range:range];
+ if (match) {
+ NSString *valueType = [className substringWithRange:[match rangeAtIndex:2]];
+ return [self deserializeDictionaryValue:data valueType:valueType error:error];
+ }
+
+ match = [self.dictModelsPatExpression firstMatchInString:className options:0 range:range];
+ if (match) {
+ NSString *valueType = [className substringWithRange:[match rangeAtIndex:2]];
+ return [self deserializeDictionaryValue:data valueType:valueType error:error];
+ }
+
+ // model
+ Class ModelClass = NSClassFromString(className);
+ if ([ModelClass instancesRespondToSelector:@selector(initWithDictionary:error:)]) {
+ return [(JSONModel *) [ModelClass alloc] initWithDictionary:data error:error];
+ }
+
+ if(error) {
+ *error = [self unknownResponseErrorWithExpectedType:className data:data];
+ }
+ return nil;
+}
+
+- (id) deserializeDictionaryValue:(id) data valueType:(NSString *) valueType error:(NSError**)error {
+ if(![data isKindOfClass: [NSDictionary class]]) {
+ if(error) {
+ *error = [self typeMismatchErrorWithExpectedType:NSStringFromClass([NSDictionary class]) data:data];
+ }
+ return nil;
+ }
+ __block NSMutableDictionary *resultDict = [NSMutableDictionary dictionaryWithCapacity:[data count]];
+ for (id key in [data allKeys]) {
+ id obj = [data valueForKey:key];
+ id dicObj = [self deserialize:obj class:valueType error:error];
+ if(dicObj) {
+ [resultDict setValue:dicObj forKey:key];
+ } else if([obj isKindOfClass:[NSNull class]]) {
+ if(self.treatNullAsError) {
+ if (error) {
+ *error = [self emptyValueOccurredError];
+ }
+ resultDict = nil;
+ break;
+ }
+ } else {
+ resultDict = nil;
+ break;
+ }
+ }
+ return resultDict;
+}
+
+- (id) deserializeArrayValue:(id) data innerType:(NSString *) innerType error:(NSError**)error {
+ if(![data isKindOfClass: [NSArray class]]) {
+ if(error) {
+ *error = [self typeMismatchErrorWithExpectedType:NSStringFromClass([NSArray class]) data:data];
+ }
+ return nil;
+ }
+ NSMutableArray* resultArray = [NSMutableArray arrayWithCapacity:[data count]];
+ for (id obj in data) {
+ id arrObj = [self deserialize:obj class:innerType error:error];
+ if(arrObj) {
+ [resultArray addObject:arrObj];
+ } else if([obj isKindOfClass:[NSNull class]]) {
+ if(self.treatNullAsError) {
+ if (error) {
+ *error = [self emptyValueOccurredError];
+ }
+ resultArray = nil;
+ break;
+ }
+ } else {
+ resultArray = nil;
+ break;
+ }
+ }
+ return resultArray;
+};
+
+- (id) deserializePrimitiveValue:(id) data class:(NSString *) className error:(NSError**)error {
+ if ([className isEqualToString:@"NSString"]) {
+ return [NSString stringWithString:data];
+ }
+ else if ([className isEqualToString:@"NSDate"]) {
+ return [self deserializeDateValue:data error:error];
+ }
+ else if ([className isEqualToString:@"NSNumber"]) {
+ // NSNumber from NSNumber
+ if ([data isKindOfClass:[NSNumber class]]) {
+ return data;
+ }
+ else if ([data isKindOfClass:[NSString class]]) {
+ // NSNumber (NSCFBoolean) from NSString
+ if ([[data lowercaseString] isEqualToString:@"true"] || [[data lowercaseString] isEqualToString:@"false"]) {
+ return @([data boolValue]);
+ // NSNumber from NSString
+ } else {
+ NSNumber* formattedValue = [self.numberFormatter numberFromString:data];
+ if(!formattedValue && [data length] > 0 && error) {
+ *error = [self typeMismatchErrorWithExpectedType:className data:data];
+ }
+ return formattedValue;
+ }
+ }
+ }
+ if(error) {
+ *error = [self typeMismatchErrorWithExpectedType:className data:data];
+ }
+ return nil;
+}
+
+- (id) deserializeDateValue:(id) data error:(NSError**)error {
+ NSDate *date =[NSDate dateWithISO8601String:data];
+ if(!date && [data length] > 0 && error) {
+ *error = [self typeMismatchErrorWithExpectedType:NSStringFromClass([NSDate class]) data:data];
+ }
+ return date;
+};
+
+-(NSError *)typeMismatchErrorWithExpectedType:(NSString *)expected data:(id)data {
+ NSString * message = [NSString stringWithFormat:NSLocalizedString(@"Received response [%@] is not an object of type %@",nil),data, expected];
+ NSDictionary * userInfo = @{NSLocalizedDescriptionKey : message};
+ return [NSError errorWithDomain:{{classPrefix}}DeserializationErrorDomainKey code:{{classPrefix}}TypeMismatchErrorCode userInfo:userInfo];
+}
+
+-(NSError *)emptyValueOccurredError {
+ NSString * message = NSLocalizedString(@"Received response contains null value in dictionary or array response",nil);
+ NSDictionary * userInfo = @{NSLocalizedDescriptionKey : message};
+ return [NSError errorWithDomain:{{classPrefix}}DeserializationErrorDomainKey code:{{classPrefix}}EmptyValueOccurredErrorCode userInfo:userInfo];
+}
+
+-(NSError *)unknownResponseErrorWithExpectedType:(NSString *)expected data:(id)data {
+ NSString * message = [NSString stringWithFormat:NSLocalizedString(@"Unknown response expected type %@ [reponse: %@]",nil),expected,data];
+ NSDictionary * userInfo = @{NSLocalizedDescriptionKey : message};
+ return [NSError errorWithDomain:{{classPrefix}}DeserializationErrorDomainKey code:{{classPrefix}}UnknownResponseObjectErrorCode userInfo:userInfo];
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
new file mode 100644
index 00000000000..2dd038c13f0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
@@ -0,0 +1,50 @@
+#import
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+/**
+ * A key for deserialization ErrorDomain
+ */
+extern NSString *const {{classPrefix}}DeserializationErrorDomainKey;
+
+/**
+ * Code for deserialization type mismatch error
+ */
+extern NSInteger const {{classPrefix}}TypeMismatchErrorCode;
+
+/**
+ * Code for deserialization empty value error
+ */
+extern NSInteger const {{classPrefix}}EmptyValueOccurredErrorCode;
+
+/**
+ * Error code for unknown response
+ */
+extern NSInteger const {{classPrefix}}UnknownResponseObjectErrorCode;
+
+@protocol {{classPrefix}}ResponseDeserializer
+
+/**
+ * Deserializes the given data to Objective-C object.
+ *
+ * @param data The data will be deserialized.
+ * @param class The type of objective-c object.
+ * @param error The error
+ */
+- (id) deserialize:(id) data class:(NSString *) className error:(NSError**)error;
+
+@end
+
+@interface {{classPrefix}}ResponseDeserializer : NSObject <{{classPrefix}}ResponseDeserializer>
+
+/**
+ * If an null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored
+ * @default NO
+ */
+@property (nonatomic, assign) BOOL treatNullAsError;
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache
new file mode 100644
index 00000000000..74b166d75e9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache
@@ -0,0 +1,82 @@
+#import "{{classPrefix}}Sanitizer.h"
+#import "{{classPrefix}}Object.h"
+#import "{{classPrefix}}QueryParamCollection.h"
+#import
+
+@interface {{classPrefix}}Sanitizer ()
+
+@end
+
+@implementation {{classPrefix}}Sanitizer
+
+- (id) sanitizeForSerialization:(id) object {
+ if (object == nil) {
+ return nil;
+ }
+ else if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]] || [object isKindOfClass:[{{classPrefix}}QueryParamCollection class]]) {
+ return object;
+ }
+ else if ([object isKindOfClass:[NSDate class]]) {
+ return [object ISO8601String];
+ }
+ else if ([object isKindOfClass:[NSArray class]]) {
+ NSArray *objectArray = object;
+ NSMutableArray *sanitizedObjs = [NSMutableArray arrayWithCapacity:[objectArray count]];
+ [object enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+ id sanitizedObj = [self sanitizeForSerialization:obj];
+ if (sanitizedObj) {
+ [sanitizedObjs addObject:sanitizedObj];
+ }
+ }];
+ return sanitizedObjs;
+ }
+ else if ([object isKindOfClass:[NSDictionary class]]) {
+ NSDictionary *objectDict = object;
+ NSMutableDictionary *sanitizedObjs = [NSMutableDictionary dictionaryWithCapacity:[objectDict count]];
+ [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+ id sanitizedObj = [self sanitizeForSerialization:obj];
+ if (sanitizedObj) {
+ sanitizedObjs[key] = sanitizedObj;
+ }
+ }];
+ return sanitizedObjs;
+ }
+ else if ([object isKindOfClass:[{{classPrefix}}Object class]]) {
+ return [object toDictionary];
+ }
+ else {
+ NSException *e = [NSException
+ exceptionWithName:@"InvalidObjectArgumentException"
+ reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", object]
+ userInfo:nil];
+ @throw e;
+ }
+}
+
+- (NSString *) parameterToString:(id)param {
+ if ([param isKindOfClass:[NSString class]]) {
+ return param;
+ }
+ else if ([param isKindOfClass:[NSNumber class]]) {
+ return [param stringValue];
+ }
+ else if ([param isKindOfClass:[NSDate class]]) {
+ return [param ISO8601String];
+ }
+ else if ([param isKindOfClass:[NSArray class]]) {
+ NSMutableArray *mutableParam = [NSMutableArray array];
+ [param enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+ [mutableParam addObject:[self parameterToString:obj]];
+ }];
+ return [mutableParam componentsJoinedByString:@","];
+ }
+ else {
+ NSException *e = [NSException
+ exceptionWithName:@"InvalidObjectArgumentException"
+ reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", param]
+ userInfo:nil];
+ @throw e;
+ }
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
new file mode 100644
index 00000000000..706a94c1d0e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
@@ -0,0 +1,29 @@
+#import
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@protocol {{classPrefix}}Sanitizer
+
+/**
+ * Sanitize object for request
+ *
+ * @param object The query/path/header/form/body param to be sanitized.
+ */
+- (id) sanitizeForSerialization:(id) object;
+
+/**
+ * Convert parameter to NSString
+ */
+- (NSString *) parameterToString: (id) param;
+
+@end
+
+@interface {{classPrefix}}Sanitizer : NSObject <{{classPrefix}}Sanitizer>
+
+
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache b/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
index 3400300c8dc..c27f6425388 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
@@ -31,8 +31,8 @@ Method | HTTP request | Description
{{/isBasic}}{{#isApiKey}}
// Configure API key authorization: (authentication scheme: {{{name}}})
[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"{{{keyParamName}}}"];
-// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-//[apiConfig setApiKeyPrefix:@"BEARER" forApiKeyIdentifier:@"{{{keyParamName}}}"];
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"{{{keyParamName}}}"];
{{/isApiKey}}{{#isOAuth}}
// Configure OAuth2 access token for authorization: (authentication scheme: {{{name}}})
[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index ec5ab3b9f80..776cd55ccef 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -6,13 +6,11 @@
- (instancetype)init {
self = [super init];
-
if (self) {
// initalise property's default value, if any
{{#vars}}{{#defaultValue}}self.{{name}} = {{{defaultValue}}};
{{/defaultValue}}{{/vars}}
}
-
return self;
}
@@ -22,7 +20,6 @@
*/
- (id)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
-
NSString * discriminatedClassName = [dict valueForKey:@"{{discriminator}}"];
if(discriminatedClassName == nil ){
@@ -45,8 +42,7 @@
* Maps json key to property name.
* This method is used by `JSONModel`.
*/
-+ (JSONKeyMapper *)keyMapper
-{
++ (JSONKeyMapper *)keyMapper {
return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }];
}
@@ -55,24 +51,11 @@
* If `propertyName` is optional, then return `YES`, otherwise return `NO`.
* This method is used by `JSONModel`.
*/
-+ (BOOL)propertyIsOptional:(NSString *)propertyName
-{
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
+
NSArray *optionalProperties = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}];
+ return [optionalProperties containsObject:propertyName];
- if ([optionalProperties containsObject:propertyName]) {
- return YES;
- }
- else {
- return NO;
- }
-}
-
-/**
- * Gets the string presentation of the object.
- * This method will be called when logging model object using `NSLog`.
- */
-- (NSString *)description {
- return [[self toDictionary] description];
}
{{/model}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/README.mustache b/modules/swagger-codegen/src/main/resources/perl/README.mustache
index b312193f1cc..d47d482742d 100644
--- a/modules/swagger-codegen/src/main/resources/perl/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/README.mustache
@@ -257,8 +257,8 @@ ${{{moduleName}}}::Configuration::username = 'YOUR_USERNAME';
${{{moduleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
${{{moduleName}}}::Configuration::api_key->{'{{{keyParamName}}}'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = 'BEARER';{{/isApiKey}}{{#isOAuth}}
+# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = 'Bearer';{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
${{{moduleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
index c68934ece2a..17dc3903152 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
@@ -31,8 +31,8 @@ ${{{moduleName}}}::Configuration::username = 'YOUR_USERNAME';
${{{moduleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
${{{moduleName}}}::Configuration::api_key->{'{{{keyParamName}}}'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = "BEARER";{{/isApiKey}}{{#isOAuth}}
+# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = "Bearer";{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
${{{moduleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
index 7945137c664..5b8b9b21632 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -69,7 +69,7 @@ class ApiClient
* Constructor of the class
* @param Configuration $config config for this ApiClient
*/
- public function __construct(Configuration $config = null)
+ public function __construct(\{{invokerPackage}}\Configuration $config = null)
{
if ($config == null) {
$config = Configuration::getDefaultConfiguration();
diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index e64b0bf22c6..3049d013ca5 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -68,8 +68,8 @@ require_once(__DIR__ . '/vendor/autoload.php');
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{#isApiKey}}
// Configure API key authorization: {{{name}}}
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKey('{{{keyParamName}}}', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'Bearer');{{/isApiKey}}{{#isOAuth}}
// Configure OAuth2 access token for authorization: {{{name}}}
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
@@ -94,12 +94,12 @@ All URIs are relative to *{{basePath}}*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------
-{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}/{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
## Documentation For Models
-{{#models}}{{#model}} - [{{{classname}}}]({{modelDocPath}}{{{classname}}}.md)
+{{#models}}{{#model}} - [{{{classname}}}]({{modelDocPath}}/{{{classname}}}.md)
{{/model}}{{/models}}
## Documentation For Authorization
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 2692ba66f94..cc74dfd3a2a 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -60,7 +60,7 @@ use \{{invokerPackage}}\ObjectSerializer;
* Constructor
* @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use
*/
- function __construct($apiClient = null)
+ function __construct(\{{invokerPackage}}\ApiClient $apiClient = null)
{
if ($apiClient == null) {
$apiClient = new ApiClient();
@@ -84,7 +84,7 @@ use \{{invokerPackage}}\ObjectSerializer;
* @param \{{invokerPackage}}\ApiClient $apiClient set the API client
* @return {{classname}}
*/
- public function setApiClient(ApiClient $apiClient)
+ public function setApiClient(\{{invokerPackage}}\ApiClient $apiClient)
{
$this->apiClient = $apiClient;
return $this;
@@ -122,7 +122,37 @@ use \{{invokerPackage}}\ObjectSerializer;
// verify the required parameter '{{paramName}}' is set
if (${{paramName}} === null) {
throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{operationId}}');
- }{{/required}}{{/allParams}}
+ }
+ {{/required}}
+ {{#hasValidation}}
+ {{#maxLength}}
+ if (strlen(${{paramName}}) > {{maxLength}}) {
+ throw new \InvalidArgumentException('invalid length for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maxLength}}.');
+ }
+ {{/maxLength}}
+ {{#minLength}}
+ if (strlen(${{paramName}}) < {{minLength}}) {
+ throw new \InvalidArgumentException('invalid length for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minLength}}.');
+ }
+ {{/minLength}}
+ {{#maximum}}
+ if (${{paramName}} > {{maximum}}) {
+ throw new \InvalidArgumentException('invalid value for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maximum}}.');
+ }
+ {{/maximum}}
+ {{#minimum}}
+ if (${{paramName}} < {{minimum}}) {
+ throw new \InvalidArgumentException('invalid value for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minimum}}.');
+ }
+ {{/minimum}}
+ {{#pattern}}
+ if (!preg_match("{{pattern}}", ${{paramName}})) {
+ throw new \InvalidArgumentException('invalid value for "{{paramName}}" when calling {{classname}}.{{operationId}}, must conform to the pattern {{pattern}}.');
+ }
+ {{/pattern}}
+
+ {{/hasValidation}}
+ {{/allParams}}
// parse inputs
$resourcePath = "{{path}}";
diff --git a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
index ba3529e969c..4cf01aa510b 100644
--- a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
@@ -27,8 +27,8 @@ require_once(__DIR__ . '/vendor/autoload.php');
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{#isApiKey}}
// Configure API key authorization: {{{name}}}
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKey('{{{keyParamName}}}', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'Bearer');{{/isApiKey}}{{#isOAuth}}
// Configure OAuth2 access token for authorization: {{{name}}}
{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
@@ -50,23 +50,23 @@ try {
{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**](../Model/{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
{{/allParams}}
### Return type
-{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**](../Model/{{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
### Authorization
-{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
### HTTP request headers
- **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
- **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
{{/operation}}
{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index 6ab42751a57..062a3ddc6cc 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -29,5 +29,8 @@
},
"autoload": {
"psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }
+ },
+ "autoload-dev": {
+ "psr-4": { "{{escapedInvokerPackage}}\\" : "{{testBasePath}}/" }
}
}
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 6f292e854af..6dbf2544a17 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -36,6 +36,7 @@
namespace {{modelPackage}};
use \ArrayAccess;
+
/**
* {{classname}} Class Doc Comment
*
@@ -46,7 +47,7 @@ use \ArrayAccess;
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
* @link https://github.com/swagger-api/swagger-codegen
*/
-class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayAccess
+class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}implements ArrayAccess
{
/**
* The original name of the model.
@@ -62,57 +63,71 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
{{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
);
-
+
static function swaggerTypes() {
- return self::$swaggerTypes{{#parent}} + parent::swaggerTypes(){{/parent}};
+ return self::$swaggerTypes{{#parentSchema}} + parent::swaggerTypes(){{/parentSchema}};
}
/**
- * Array of attributes where the key is the local name, and the value is the original name
- * @var string[]
- */
+ * Array of attributes where the key is the local name, and the value is the original name
+ * @var string[]
+ */
static $attributeMap = array(
{{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
);
-
+
static function attributeMap() {
- return {{#parent}}parent::attributeMap() + {{/parent}}self::$attributeMap;
+ return {{#parentSchema}}parent::attributeMap() + {{/parentSchema}}self::$attributeMap;
}
/**
- * Array of attributes to setter functions (for deserialization of responses)
- * @var string[]
- */
+ * Array of attributes to setter functions (for deserialization of responses)
+ * @var string[]
+ */
static $setters = array(
{{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
);
-
+
static function setters() {
- return {{#parent}}parent::setters() + {{/parent}}self::$setters;
+ return {{#parentSchema}}parent::setters() + {{/parentSchema}}self::$setters;
}
/**
- * Array of attributes to getter functions (for serialization of requests)
- * @var string[]
- */
+ * Array of attributes to getter functions (for serialization of requests)
+ * @var string[]
+ */
static $getters = array(
{{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
);
-
+
static function getters() {
- return {{#parent}}parent::getters() + {{/parent}}self::$getters;
+ return {{#parentSchema}}parent::getters() + {{/parentSchema}}self::$getters;
}
- {{#vars}}
+ {{#vars}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}const {{datatypeWithEnum}}_{{{name}}} = {{{value}}};
+ {{/enumVars}}{{/allowableValues}}{{/isEnum}}{{/vars}}
+
+ {{#vars}}{{#isEnum}}
/**
- * ${{name}} {{#description}}{{{description}}}{{/description}}
- * @var {{datatype}}
- */
- protected ${{name}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}};
- {{/vars}}
+ * Gets allowable values of the enum
+ * @return string[]
+ */
+ public function {{getter}}AllowableValues() {
+ return [
+ {{#allowableValues}}{{#enumVars}}self::{{datatypeWithEnum}}_{{{name}}},{{^-last}}
+ {{/-last}}{{/enumVars}}{{/allowableValues}}
+ ];
+ }
+ {{/isEnum}}{{/vars}}
+
+ /**
+ * Associative array for storing property values
+ * @var mixed[]
+ */
+ protected $container = array();
/**
* Constructor
@@ -120,27 +135,134 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function __construct(array $data = null)
{
- {{#parent}}parent::__construct($data);{{/parent}}
- {{#discriminator}}// Initialize discriminator property with the model name.
- $discrimintor = array_search('{{discriminator}}', self::$attributeMap);
- $this->{$discrimintor} = static::$swaggerModelName;
- {{/discriminator}}
+ {{#parentSchema}}
+ parent::__construct($data);
- if ($data != null) {
- {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
- {{/hasMore}}{{/vars}}
- }
+ {{/parentSchema}}
+ {{#vars}}
+ $this->container['{{name}}'] = isset($data['{{name}}']) ? $data['{{name}}'] : {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}};
+ {{/vars}}
+ {{#discriminator}}
+
+ // Initialize discriminator property with the model name.
+ $discrimintor = array_search('{{discriminator}}', self::$attributeMap);
+ $this->container[$discrimintor] = static::$swaggerModelName;
+ {{/discriminator}}
}
+
+ /**
+ * show all the invalid properties with reasons.
+ *
+ * @return array invalid properties with reasons
+ */
+ public function list_invalid_properties()
+ {
+ $invalid_properties = array();
+ {{#vars}}
+ {{#required}}
+ if ($this->container['{{name}}'] === null) {
+ $invalid_properties[] = "'${{name}}' can't be null";
+ }
+ {{/required}}
+ {{#isEnum}}
+ $allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+ if (!in_array($this->container['{{name}}'], $allowed_values)) {
+ $invalid_properties[] = "invalid value for '${{name}}', must be one of #{allowed_values}.";
+ }
+ {{/isEnum}}
+ {{#hasValidation}}
+ {{#maxLength}}
+ if (strlen($this->container['{{name}}']) > {{maxLength}}) {
+ $invalid_properties[] = "invalid value for '${{name}}', the character length must be smaller than or equal to {{{maxLength}}}.";
+ }
+ {{/maxLength}}
+ {{#minLength}}
+ if (strlen($this->container['{{name}}']) < {{minLength}}) {
+ $invalid_properties[] = "invalid value for '${{name}}', the character length must be bigger than or equal to {{{minLength}}}.";
+ }
+ {{/minLength}}
+ {{#maximum}}
+ if ($this->container['{{name}}'] > {{maximum}}) {
+ $invalid_properties[] = "invalid value for '${{name}}', must be smaller than or equal to {{maximum}}.";
+ }
+ {{/maximum}}
+ {{#minimum}}
+ if ($this->container['{{name}}'] < {{minimum}}) {
+ $invalid_properties[] = "invalid value for '${{name}}', must be bigger than or equal to {{minimum}}.";
+ }
+ {{/minimum}}
+ {{#pattern}}
+ if (!preg_match("{{pattern}}", $this->container['{{name}}'])) {
+ $invalid_properties[] = "invalid value for '${{name}}', must be conform to the pattern {{pattern}}.";
+ }
+ {{/pattern}}
+ {{/hasValidation}}
+ {{/vars}}
+ return $invalid_properties;
+ }
+
+ /**
+ * validate all the properties in the model
+ * return true if all passed
+ *
+ * @return bool True if all properteis are valid
+ */
+ public function valid()
+ {
+ {{#vars}}
+ {{#required}}
+ if ($this->container['{{name}}'] === null) {
+ return false;
+ }
+ {{/required}}
+ {{#isEnum}}
+ $allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+ if (!in_array($this->container['{{name}}'], $allowed_values)) {
+ return false;
+ }
+ {{/isEnum}}
+ {{#hasValidation}}
+ {{#maxLength}}
+ if (strlen($this->container['{{name}}']) > {{maxLength}}) {
+ return false;
+ }
+ {{/maxLength}}
+ {{#minLength}}
+ if (strlen($this->container['{{name}}']) < {{minLength}}) {
+ return false;
+ }
+ {{/minLength}}
+ {{#maximum}}
+ if ($this->container['{{name}}'] > {{maximum}}) {
+ return false;
+ }
+ {{/maximum}}
+ {{#minimum}}
+ if ($this->container['{{name}}'] < {{minimum}}) {
+ return false;
+ }
+ {{/minimum}}
+ {{#pattern}}
+ if (!preg_match("{{pattern}}", $this->container['{{name}}'])) {
+ return false;
+ }
+ {{/pattern}}
+ {{/hasValidation}}
+ {{/vars}}
+ return true;
+ }
+
{{#vars}}
+
/**
* Gets {{name}}
* @return {{datatype}}
*/
public function {{getter}}()
{
- return $this->{{name}};
+ return $this->container['{{name}}'];
}
-
+
/**
* Sets {{name}}
* @param {{datatype}} ${{name}} {{#description}}{{{description}}}{{/description}}
@@ -148,11 +270,40 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function {{setter}}(${{name}})
{
- {{#isEnum}}$allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+ {{#isEnum}}
+ $allowed_values = array({{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
if (!in_array(${{{name}}}, $allowed_values)) {
throw new \InvalidArgumentException("Invalid value for '{{name}}', must be one of {{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}");
- }{{/isEnum}}
- $this->{{name}} = ${{name}};
+ }
+ {{/isEnum}}
+ {{#hasValidation}}
+ {{#maxLength}}
+ if (strlen(${{name}}) > {{maxLength}}) {
+ throw new \InvalidArgumentException('invalid length for ${{name}} when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maxLength}}.');
+ }{{/maxLength}}
+ {{#minLength}}
+ if (strlen(${{name}}) < {{minLength}}) {
+ throw new \InvalidArgumentException('invalid length for ${{name}} when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minLength}}.');
+ }
+ {{/minLength}}
+ {{#maximum}}
+ if (${{name}} > {{maximum}}) {
+ throw new \InvalidArgumentException('invalid value for ${{name}} when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maximum}}.');
+ }
+ {{/maximum}}
+ {{#minimum}}
+ if (${{name}} < {{minimum}}) {
+ throw new \InvalidArgumentException('invalid value for ${{name}} when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minimum}}.');
+ }
+ {{/minimum}}
+ {{#pattern}}
+ if (!preg_match("{{pattern}}", ${{name}})) {
+ throw new \InvalidArgumentException('invalid value for ${{name}} when calling {{classname}}.{{operationId}}, must be conform to the pattern {{pattern}}.');
+ }
+ {{/pattern}}
+ {{/hasValidation}}
+ $this->container['{{name}}'] = ${{name}};
+
return $this;
}
{{/vars}}
@@ -163,9 +314,9 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function offsetExists($offset)
{
- return isset($this->$offset);
+ return isset($this->container[$offset]);
}
-
+
/**
* Gets offset.
* @param integer $offset Offset
@@ -173,9 +324,9 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function offsetGet($offset)
{
- return $this->$offset;
+ return isset($this->container[$offset]) ? $this->container[$offset] : null;
}
-
+
/**
* Sets value based on offset.
* @param integer $offset Offset
@@ -184,9 +335,13 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function offsetSet($offset, $value)
{
- $this->$offset = $value;
+ if (is_null($offset)) {
+ $this->container[] = $value;
+ } else {
+ $this->container[$offset] = $value;
+ }
}
-
+
/**
* Unsets offset.
* @param integer $offset Offset
@@ -194,9 +349,9 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
*/
public function offsetUnset($offset)
{
- unset($this->$offset);
+ unset($this->container[$offset]);
}
-
+
/**
* Gets the string presentation of the object
* @return string
diff --git a/modules/swagger-codegen/src/main/resources/php/model_enum.mustache b/modules/swagger-codegen/src/main/resources/php/model_enum.mustache
new file mode 100644
index 00000000000..4598f9fdff9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/model_enum.mustache
@@ -0,0 +1,17 @@
+class {{classname}} {
+ {{#allowableValues}}{{#enumVars}}const {{{name}}} = {{{value}}};
+ {{/enumVars}}{{/allowableValues}}
+
+ {{#vars}}{{#isEnum}}
+ /**
+ * Gets allowable values of the enum
+ * @return string[]
+ */
+ public function {{getter}}AllowableValues() {
+ return [
+ {{#allowableValues}}{{#enumVars}}self::{{datatypeWithEnum}}_{{{name}}},{{^-last}}
+ {{/-last}}{{/enumVars}}{{/allowableValues}}
+ ];
+ }
+ {{/isEnum}}{{/vars}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/model_generic.mustache b/modules/swagger-codegen/src/main/resources/php/model_generic.mustache
new file mode 100644
index 00000000000..006cd09c62a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/model_generic.mustache
@@ -0,0 +1,169 @@
+class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayAccess
+{
+ /**
+ * Array of property to type mappings. Used for (de)serialization
+ * @var string[]
+ */
+ static $swaggerTypes = array(
+ {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+ {{/hasMore}}{{/vars}}
+ );
+
+ static function swaggerTypes() {
+ return self::$swaggerTypes{{#parent}} + parent::swaggerTypes(){{/parent}};
+ }
+
+ /**
+ * Array of attributes where the key is the local name, and the value is the original name
+ * @var string[]
+ */
+ static $attributeMap = array(
+ {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
+ {{/hasMore}}{{/vars}}
+ );
+
+ static function attributeMap() {
+ return {{#parent}}parent::attributeMap() + {{/parent}}self::$attributeMap;
+ }
+
+ /**
+ * Array of attributes to setter functions (for deserialization of responses)
+ * @var string[]
+ */
+ static $setters = array(
+ {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
+ {{/hasMore}}{{/vars}}
+ );
+
+ static function setters() {
+ return {{#parent}}parent::setters() + {{/parent}}self::$setters;
+ }
+
+ /**
+ * Array of attributes to getter functions (for serialization of requests)
+ * @var string[]
+ */
+ static $getters = array(
+ {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
+ {{/hasMore}}{{/vars}}
+ );
+
+ static function getters() {
+ return {{#parent}}parent::getters() + {{/parent}}self::$getters;
+ }
+
+ {{#vars}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}const {{datatypeWithEnum}}_{{{name}}} = {{{value}}};
+ {{/enumVars}}{{/allowableValues}}{{/isEnum}}{{/vars}}
+
+ {{#vars}}{{#isEnum}}
+ /**
+ * Gets allowable values of the enum
+ * @return string[]
+ */
+ public function {{getter}}AllowableValues() {
+ return [
+ {{#allowableValues}}{{#enumVars}}self::{{datatypeWithEnum}}_{{{name}}},{{^-last}}
+ {{/-last}}{{/enumVars}}{{/allowableValues}}
+ ];
+ }
+ {{/isEnum}}{{/vars}}
+
+ {{#vars}}
+ /**
+ * ${{name}} {{#description}}{{{description}}}{{/description}}
+ * @var {{datatype}}
+ */
+ protected ${{name}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}};
+ {{/vars}}
+
+ /**
+ * Constructor
+ * @param mixed[] $data Associated array of property value initalizing the model
+ */
+ public function __construct(array $data = null)
+ {
+ {{#parent}}parent::__construct($data);{{/parent}}
+ if ($data != null) {
+ {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
+ {{/hasMore}}{{/vars}}
+ }
+ }
+ {{#vars}}
+ /**
+ * Gets {{name}}.
+ * @return {{datatype}}
+ */
+ public function {{getter}}()
+ {
+ return $this->{{name}};
+ }
+
+ /**
+ * Sets {{name}}.
+ * @param {{datatype}} ${{name}} {{#description}}{{{description}}}{{/description}}
+ * @return $this
+ */
+ public function {{setter}}(${{name}})
+ {
+ {{#isEnum}}$allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+ if (!in_array(${{{name}}}, $allowed_values)) {
+ throw new \InvalidArgumentException("Invalid value for '{{name}}', must be one of {{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}");
+ }{{/isEnum}}
+ $this->{{name}} = ${{name}};
+ return $this;
+ }
+ {{/vars}}
+ /**
+ * Returns true if offset exists. False otherwise.
+ * @param integer $offset Offset
+ * @return boolean
+ */
+ public function offsetExists($offset)
+ {
+ return isset($this->$offset);
+ }
+
+ /**
+ * Gets offset.
+ * @param integer $offset Offset
+ * @return mixed
+ */
+ public function offsetGet($offset)
+ {
+ return $this->$offset;
+ }
+
+ /**
+ * Sets value based on offset.
+ * @param integer $offset Offset
+ * @param mixed $value Value to be set
+ * @return void
+ */
+ public function offsetSet($offset, $value)
+ {
+ $this->$offset = $value;
+ }
+
+ /**
+ * Unsets offset.
+ * @param integer $offset Offset
+ * @return void
+ */
+ public function offsetUnset($offset)
+ {
+ unset($this->$offset);
+ }
+
+ /**
+ * Gets the string presentation of the object.
+ * @return string
+ */
+ public function __toString()
+ {
+ if (defined('JSON_PRETTY_PRINT')) {
+ return json_encode(\{{invokerPackage}}\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+ } else {
+ return json_encode(\{{invokerPackage}}\ObjectSerializer::sanitizeForSerialization($this));
+ }
+ }
+}
diff --git a/modules/swagger-codegen/src/main/resources/python/README.mustache b/modules/swagger-codegen/src/main/resources/python/README.mustache
index 8fe1045f661..08f2d835c4c 100644
--- a/modules/swagger-codegen/src/main/resources/python/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/README.mustache
@@ -61,8 +61,8 @@ from pprint import pprint
{{{packageName}}}.configuration.password = 'YOUR_PASSWORD'{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
{{{packageName}}}.configuration.api_key['{{{keyParamName}}}'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-# {{{packageName}}}.configuration.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# {{{packageName}}}.configuration.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
{{{packageName}}}.configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index 0967a2ec6b3..94458e3f724 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -21,6 +21,7 @@ from __future__ import absolute_import
import sys
import os
+import re
# python 2 and python 3 compatibility library
from six import iteritems
@@ -94,6 +95,31 @@ class {{classname}}(object):
if ('{{paramName}}' not in params) or (params['{{paramName}}'] is None):
raise ValueError("Missing the required parameter `{{paramName}}` when calling `{{operationId}}`")
{{/required}}
+{{/allParams}}
+
+{{#allParams}}
+{{#hasValidation}}
+ {{#maxLength}}
+ if '{{paramName}}' in params and len(params['{{paramName}}']) > {{maxLength}}:
+ raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, length must be less than or equal to `{{maxLength}}`")
+ {{/maxLength}}
+ {{#minLength}}
+ if '{{paramName}}' in params and len(params['{{paramName}}']) < {{minLength}}:
+ raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, length must be greater than or equal to `{{minLength}}`")
+ {{/minLength}}
+ {{#maximum}}
+ if '{{paramName}}' in params and params['{{paramName}}'] > {{maximum}}:
+ raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must be a value less than or equal to `{{maximum}}`")
+ {{/maximum}}
+ {{#minimum}}
+ if '{{paramName}}' in params and params['{{paramName}}'] < {{minimum}}:
+ raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must be a value greater than or equal to `{{minimum}}`")
+ {{/minimum}}
+ {{#pattern}}
+ if '{{paramName}}' in params and not re.search('{{vendorExtensions.x-regex}}', params['{{paramName}}']{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}):
+ raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must conform to the pattern `{{pattern}}`")
+ {{/pattern}}
+{{/hasValidation}}
{{/allParams}}
resource_path = '{{path}}'.replace('{format}', 'json')
diff --git a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
index 99a05f8c43d..8eb25a87b06 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
@@ -29,8 +29,8 @@ from pprint import pprint
{{{packageName}}}.configuration.password = 'YOUR_PASSWORD'{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
{{{packageName}}}.configuration.api_key['{{{keyParamName}}}'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
-# {{{packageName}}}.configuration.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# {{{packageName}}}.configuration.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
{{{packageName}}}.configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}{{/authMethods}}
{{/hasAuthMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index bd33a997c3e..e62fa2cbf66 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -22,6 +22,7 @@ Copyright 2016 SmartBear Software
{{#model}}
from pprint import pformat
from six import iteritems
+import re
class {{classname}}(object):
@@ -79,7 +80,36 @@ class {{classname}}(object):
"Invalid value for `{{name}}`, must be one of {0}"
.format(allowed_values)
)
- {{/isEnum}}self._{{name}} = {{name}}
+{{/isEnum}}
+{{^isEnum}}
+{{#hasValidation}}
+
+ if not {{name}}:
+ raise ValueError("Invalid value for `{{name}}`, must not be `None`")
+{{#maxLength}}
+ if len({{name}}) > {{maxLength}}:
+ raise ValueError("Invalid value for `{{name}}`, length must be less than `{{maxLength}}`")
+{{/maxLength}}
+{{#minLength}}
+ if len({{name}}) < {{minLength}}:
+ raise ValueError("Invalid value for `{{name}}`, length must be greater than or equal to `{{minLength}}`")
+{{/minLength}}
+{{#maximum}}
+ if {{name}} > {{maximum}}:
+ raise ValueError("Invalid value for `{{name}}`, must be a value less than or equal to `{{maximum}}`")
+{{/maximum}}
+{{#minimum}}
+ if {{name}} < {{minimum}}:
+ raise ValueError("Invalid value for `{{name}}`, must be a value greater than or equal to `{{minimum}}`")
+{{/minimum}}
+{{#pattern}}
+ if not re.search('{{vendorExtensions.x-regex}}', {{name}}{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}):
+ raise ValueError("Invalid value for `{{name}}`, must be a follow pattern or equal to `{{pattern}}`")
+{{/pattern}}
+{{/hasValidation}}
+{{/isEnum}}
+
+ self._{{name}} = {{name}}
{{/vars}}
def to_dict(self):
diff --git a/modules/swagger-codegen/src/main/resources/ruby/README.mustache b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
index f4bafd9b0ea..076192b75ce 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
@@ -67,8 +67,8 @@ require '{{{gemName}}}'
config.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
- # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
- #config.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+ # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
+ #config.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
config.access_token = 'YOUR ACCESS TOKEN'{{/isOAuth}}
{{/authMethods}}end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client_spec.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client_spec.mustache
new file mode 100644
index 00000000000..1ed497da21e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_client_spec.mustache
@@ -0,0 +1,273 @@
+require 'spec_helper'
+
+describe {{moduleName}}::ApiClient do
+ context 'initialization' do
+ context 'URL stuff' do
+ context 'host' do
+ it 'removes http from host' do
+ {{moduleName}}.configure { |c| c.host = 'http://example.com' }
+ expect({{moduleName}}::Configuration.default.host).to eq('example.com')
+ end
+
+ it 'removes https from host' do
+ {{moduleName}}.configure { |c| c.host = 'https://wookiee.com' }
+ expect({{moduleName}}::ApiClient.default.config.host).to eq('wookiee.com')
+ end
+
+ it 'removes trailing path from host' do
+ {{moduleName}}.configure { |c| c.host = 'hobo.com/v4' }
+ expect({{moduleName}}::Configuration.default.host).to eq('hobo.com')
+ end
+ end
+
+ context 'base_path' do
+ it "prepends a slash to base_path" do
+ {{moduleName}}.configure { |c| c.base_path = 'v4/dog' }
+ expect({{moduleName}}::Configuration.default.base_path).to eq('/v4/dog')
+ end
+
+ it "doesn't prepend a slash if one is already there" do
+ {{moduleName}}.configure { |c| c.base_path = '/v4/dog' }
+ expect({{moduleName}}::Configuration.default.base_path).to eq('/v4/dog')
+ end
+
+ it "ends up as a blank string if nil" do
+ {{moduleName}}.configure { |c| c.base_path = nil }
+ expect({{moduleName}}::Configuration.default.base_path).to eq('')
+ end
+ end
+ end
+ end
+
+ describe "#update_params_for_auth!" do
+ it "sets header api-key parameter with prefix" do
+ {{moduleName}}.configure do |c|
+ c.api_key_prefix['api_key'] = 'PREFIX'
+ c.api_key['api_key'] = 'special-key'
+ end
+
+ api_client = {{moduleName}}::ApiClient.new
+
+ config2 = {{moduleName}}::Configuration.new do |c|
+ c.api_key_prefix['api_key'] = 'PREFIX2'
+ c.api_key['api_key'] = 'special-key2'
+ end
+ api_client2 = {{moduleName}}::ApiClient.new(config2)
+
+ auth_names = ['api_key', 'unknown']
+
+ header_params = {}
+ query_params = {}
+ api_client.update_params_for_auth! header_params, query_params, auth_names
+ expect(header_params).to eq({'api_key' => 'PREFIX special-key'})
+ expect(query_params).to eq({})
+
+ header_params = {}
+ query_params = {}
+ api_client2.update_params_for_auth! header_params, query_params, auth_names
+ expect(header_params).to eq({'api_key' => 'PREFIX2 special-key2'})
+ expect(query_params).to eq({})
+ end
+
+ it "sets header api-key parameter without prefix" do
+ {{moduleName}}.configure do |c|
+ c.api_key_prefix['api_key'] = nil
+ c.api_key['api_key'] = 'special-key'
+ end
+
+ api_client = {{moduleName}}::ApiClient.new
+
+ header_params = {}
+ query_params = {}
+ auth_names = ['api_key', 'unknown']
+ api_client.update_params_for_auth! header_params, query_params, auth_names
+ expect(header_params).to eq({'api_key' => 'special-key'})
+ expect(query_params).to eq({})
+ end
+ end
+
+ describe "timeout in #build_request" do
+ let(:config) { {{moduleName}}::Configuration.new }
+ let(:api_client) { {{moduleName}}::ApiClient.new(config) }
+
+ it "defaults to 0" do
+ expect({{moduleName}}::Configuration.default.timeout).to eq(0)
+ expect(config.timeout).to eq(0)
+
+ request = api_client.build_request(:get, '/test')
+ expect(request.options[:timeout]).to eq(0)
+ end
+
+ it "can be customized" do
+ config.timeout = 100
+ request = api_client.build_request(:get, '/test')
+ expect(request.options[:timeout]).to eq(100)
+ end
+ end
+
+ describe "#deserialize" do
+ it "handles Array" do
+ api_client = {{moduleName}}::ApiClient.new
+ headers = {'Content-Type' => 'application/json'}
+ response = double('response', headers: headers, body: '[12, 34]')
+ data = api_client.deserialize(response, 'Array')
+ expect(data).to be_instance_of(Array)
+ expect(data).to eq([12, 34])
+ end
+
+ it "handles Array>" do
+ api_client = {{moduleName}}::ApiClient.new
+ headers = {'Content-Type' => 'application/json'}
+ response = double('response', headers: headers, body: '[[12, 34], [56]]')
+ data = api_client.deserialize(response, 'Array>')
+ expect(data).to be_instance_of(Array)
+ expect(data).to eq([[12, 34], [56]])
+ end
+
+ it "handles Hash" do
+ api_client = {{moduleName}}::ApiClient.new
+ headers = {'Content-Type' => 'application/json'}
+ response = double('response', headers: headers, body: '{"message": "Hello"}')
+ data = api_client.deserialize(response, 'Hash')
+ expect(data).to be_instance_of(Hash)
+ expect(data).to eq({:message => 'Hello'})
+ end
+
+ it "handles Hash" do
+ api_client = {{moduleName}}::ApiClient.new
+ headers = {'Content-Type' => 'application/json'}
+ response = double('response', headers: headers, body: '{"pet": {"id": 1}}')
+ data = api_client.deserialize(response, 'Hash')
+ expect(data).to be_instance_of(Hash)
+ expect(data.keys).to eq([:pet])
+
+ pet = data[:pet]
+ expect(pet).to be_instance_of({{moduleName}}::Pet)
+ expect(pet.id).to eq(1)
+ end
+
+ it "handles Hash>" do
+ api_client = {{moduleName}}::ApiClient.new
+ headers = {'Content-Type' => 'application/json'}
+ response = double('response', headers: headers, body: '{"data": {"pet": {"id": 1}}}')
+ result = api_client.deserialize(response, 'Hash>')
+ expect(result).to be_instance_of(Hash)
+ expect(result.keys).to match_array([:data])
+
+ data = result[:data]
+ expect(data).to be_instance_of(Hash)
+ expect(data.keys).to match_array([:pet])
+
+ pet = data[:pet]
+ expect(pet).to be_instance_of({{moduleName}}::Pet)
+ expect(pet.id).to eq(1)
+ end
+ end
+
+ describe "#object_to_hash" do
+ it "ignores nils and includes empty arrays" do
+ api_client = {{moduleName}}::ApiClient.new
+ pet = {{moduleName}}::Pet.new
+ pet.id = 1
+ pet.name = ''
+ pet.status = nil
+ pet.photo_urls = nil
+ pet.tags = []
+ expected = {id: 1, name: '', tags: []}
+ expect(api_client.object_to_hash(pet)).to eq(expected)
+ end
+ end
+
+ describe "#build_collection_param" do
+ let(:param) { ['aa', 'bb', 'cc'] }
+ let(:api_client) { {{moduleName}}::ApiClient.new }
+
+ it "works for csv" do
+ expect(api_client.build_collection_param(param, :csv)).to eq('aa,bb,cc')
+ end
+
+ it "works for ssv" do
+ expect(api_client.build_collection_param(param, :ssv)).to eq('aa bb cc')
+ end
+
+ it "works for tsv" do
+ expect(api_client.build_collection_param(param, :tsv)).to eq("aa\tbb\tcc")
+ end
+
+ it "works for pipes" do
+ expect(api_client.build_collection_param(param, :pipes)).to eq('aa|bb|cc')
+ end
+
+ it "works for multi" do
+ expect(api_client.build_collection_param(param, :multi)).to eq(['aa', 'bb', 'cc'])
+ end
+
+ it "fails for invalid collection format" do
+ expect(proc { api_client.build_collection_param(param, :INVALID) }).to raise_error(RuntimeError, 'unknown collection format: :INVALID')
+ end
+ end
+
+ describe "#json_mime?" do
+ let(:api_client) { {{moduleName}}::ApiClient.new }
+
+ it "works" do
+ expect(api_client.json_mime?(nil)).to eq false
+ expect(api_client.json_mime?('')).to eq false
+
+ expect(api_client.json_mime?('application/json')).to eq true
+ expect(api_client.json_mime?('application/json; charset=UTF8')).to eq true
+ expect(api_client.json_mime?('APPLICATION/JSON')).to eq true
+
+ expect(api_client.json_mime?('application/xml')).to eq false
+ expect(api_client.json_mime?('text/plain')).to eq false
+ expect(api_client.json_mime?('application/jsonp')).to eq false
+ end
+ end
+
+ describe "#select_header_accept" do
+ let(:api_client) { {{moduleName}}::ApiClient.new }
+
+ it "works" do
+ expect(api_client.select_header_accept(nil)).to be_nil
+ expect(api_client.select_header_accept([])).to be_nil
+
+ expect(api_client.select_header_accept(['application/json'])).to eq('application/json')
+ expect(api_client.select_header_accept(['application/xml', 'application/json; charset=UTF8'])).to eq('application/json; charset=UTF8')
+ expect(api_client.select_header_accept(['APPLICATION/JSON', 'text/html'])).to eq('APPLICATION/JSON')
+
+ expect(api_client.select_header_accept(['application/xml'])).to eq('application/xml')
+ expect(api_client.select_header_accept(['text/html', 'application/xml'])).to eq('text/html,application/xml')
+ end
+ end
+
+ describe "#select_header_content_type" do
+ let(:api_client) { {{moduleName}}::ApiClient.new }
+
+ it "works" do
+ expect(api_client.select_header_content_type(nil)).to eq('application/json')
+ expect(api_client.select_header_content_type([])).to eq('application/json')
+
+ expect(api_client.select_header_content_type(['application/json'])).to eq('application/json')
+ expect(api_client.select_header_content_type(['application/xml', 'application/json; charset=UTF8'])).to eq('application/json; charset=UTF8')
+ expect(api_client.select_header_content_type(['APPLICATION/JSON', 'text/html'])).to eq('APPLICATION/JSON')
+ expect(api_client.select_header_content_type(['application/xml'])).to eq('application/xml')
+ expect(api_client.select_header_content_type(['text/plain', 'application/xml'])).to eq('text/plain')
+ end
+ end
+
+ describe "#sanitize_filename" do
+ let(:api_client) { {{moduleName}}::ApiClient.new }
+
+ it "works" do
+ expect(api_client.sanitize_filename('sun')).to eq('sun')
+ expect(api_client.sanitize_filename('sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('../sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('/var/tmp/sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('./sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('..\sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('\var\tmp\sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('c:\var\tmp\sun.gif')).to eq('sun.gif')
+ expect(api_client.sanitize_filename('.\sun.gif')).to eq('sun.gif')
+ end
+ end
+end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
index 169920a4bc3..a2cee7f9361 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
@@ -29,8 +29,8 @@ require '{{{gemName}}}'
config.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
# Configure API key authorization: {{{name}}}
config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
- # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
- #config.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+ # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
+ #config.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
# Configure OAuth2 access token for authorization: {{{name}}}
config.access_token = 'YOUR ACCESS TOKEN'{{/isOAuth}}
{{/authMethods}}end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache
index 7e95c2d6446..d28f29e0c3a 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache
@@ -20,7 +20,7 @@ require 'json'
describe 'test an instance of {{classname}}' do
it 'should create an instact of {{classname}}' do
- @instance.should be_a({{moduleName}}::{{classname}})
+ expect(@instance).to be_instance_of({{moduleName}}::{{classname}})
end
end
@@ -34,11 +34,7 @@ require 'json'
{{/required}}{{/allParams}} # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}]
describe '{{operationId}} test' do
it "should work" do
- # assertion here
- # should be_a()
- # should be_nil
- # should ==
- # should_not ==
+ # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
end
end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/base_object_spec.mustache b/modules/swagger-codegen/src/main/resources/ruby/base_object_spec.mustache
new file mode 100644
index 00000000000..7376cd1e84d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/base_object_spec.mustache
@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+class ArrayMapObject < Petstore::Category
+ attr_accessor :int_arr, :pet_arr, :int_map, :pet_map, :int_arr_map, :pet_arr_map, :boolean_true_arr, :boolean_false_arr
+
+ def self.attribute_map
+ {
+ :int_arr => :int_arr,
+ :pet_arr => :pet_arr,
+ :int_map => :int_map,
+ :pet_map => :pet_map,
+ :int_arr_map => :int_arr_map,
+ :pet_arr_map => :pet_arr_map,
+ :boolean_true_arr => :boolean_true_arr,
+ :boolean_false_arr => :boolean_false_arr,
+ }
+ end
+
+ def self.swagger_types
+ {
+ :int_arr => :'Array',
+ :pet_arr => :'Array',
+ :int_map => :'Hash',
+ :pet_map => :'Hash',
+ :int_arr_map => :'Hash>',
+ :pet_arr_map => :'Hash>',
+ :boolean_true_arr => :'Array',
+ :boolean_false_arr => :'Array',
+ }
+ end
+end
+
+describe 'BaseObject' do
+ describe 'boolean values' do
+ let(:obj) { Petstore::Cat.new({declawed: false}) }
+
+ it 'should have values set' do
+ expect(obj.declawed).not_to be_nil
+ expect(obj.declawed).to eq(false)
+ end
+ end
+
+ describe 'array and map properties' do
+ let(:obj) { ArrayMapObject.new }
+
+ let(:data) do
+ {int_arr: [123, 456],
+ pet_arr: [{name: 'Kitty'}],
+ int_map: {'int' => 123},
+ pet_map: {'pet' => {name: 'Kitty'}},
+ int_arr_map: {'int_arr' => [123, 456]},
+ pet_arr_map: {'pet_arr' => [{name: 'Kitty'}]},
+ boolean_true_arr: [true, "true", "TruE", 1, "y", "yes", "1", "t", "T"],
+ boolean_false_arr: [false, "", 0, "0", "f", nil, "null"],
+ }
+ end
+
+ it 'works for #build_from_hash' do
+ obj.build_from_hash(data)
+
+ expect(obj.int_arr).to match_array([123, 456])
+
+ expect(obj.pet_arr).to be_instance_of(Array)
+ expect(obj.pet_arr).to be_instance_of(1)
+
+ pet = obj.pet_arr.first
+ expect(pet).to be_instance_of(Petstore::Pet)
+ expect(pet.name).to eq('Kitty')
+
+ expect(obj.int_map).to be_instance_of(Hash)
+ expect(obj.int_map).to eq({'int' => 123})
+
+ expect(obj.pet_map).to be_instance_of(Hash)
+ pet = obj.pet_map['pet']
+ expect(pet).to be_instance_of(Petstore::Pet)
+ expect(pet.name).to eq('Kitty')
+
+ expect(obj.int_arr_map).to be_instance_of(Hash)
+ arr = obj.int_arr_map['int_arr']
+ expect(arr).to match_array([123, 456])
+
+ expect(obj.pet_arr_map).to be_instance_of(Hash)
+ arr = obj.pet_arr_map['pet_arr']
+ expect(arr).to be_instance_of(Array)
+ expect(arr.size).to eq(1)
+ pet = arr.first
+ expect(pet).to be_instance_of(Petstore::Pet)
+ expect(pet.name).to eq('Kitty')
+
+ expect(obj.boolean_true_arr).to be_instance_of(Array)
+ obj.boolean_true_arr.each do |b|
+ expect(b).to eq(true)
+ end
+
+ expect(obj.boolean_false_arr).to be_instance_of(Array)
+ obj.boolean_false_arr.each do |b|
+ expect(b).to eq(false)
+ end
+ end
+
+ it 'works for #to_hash' do
+ obj.build_from_hash(data)
+ expect_data = data.dup
+ expect_data[:boolean_true_arr].map! {true}
+ expect_data[:boolean_false_arr].map! {false}
+ expect(obj.to_hash).to eq(expect_data)
+ end
+ end
+end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/configuration_spec.mustache b/modules/swagger-codegen/src/main/resources/ruby/configuration_spec.mustache
new file mode 100644
index 00000000000..4c23a067175
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/configuration_spec.mustache
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe {{moduleName}}::Configuration do
+ let(:config) { {{moduleName}}::Configuration.default }
+
+ before(:each) do
+ {{moduleName}}.configure do |c|
+ c.host = 'petstore.swagger.io'
+ c.base_path = 'v2'
+ end
+ end
+
+ describe '#base_url' do
+ it 'should have the default value' do
+ expect(config.base_url).to eq('http://petstore.swagger.io/v2')
+ end
+
+ it 'should remove trailing slashes' do
+ [nil, '', '/', '//'].each do |base_path|
+ config.base_path = base_path
+ expect(config.base_url).to eq('http://petstore.swagger.io')
+ end
+ end
+ end
+end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
index f5204447975..305a10d6467 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
@@ -21,17 +21,13 @@ require 'date'
describe 'test an instance of {{classname}}' do
it 'should create an instact of {{classname}}' do
- @instance.should be_a({{moduleName}}::{{classname}})
+ expect(@instance).to be_instance_of({{moduleName}}::{{classname}})
end
end
{{#vars}}
describe 'test attribute "{{{name}}}"' do
it 'should work' do
- # assertion here
- # should be_a()
- # should be_nil
- # should ==
- # should_not ==
+ # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
end
end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/rspec.mustache b/modules/swagger-codegen/src/main/resources/ruby/rspec.mustache
new file mode 100644
index 00000000000..83e16f80447
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/rspec.mustache
@@ -0,0 +1,2 @@
+--color
+--require spec_helper
diff --git a/modules/swagger-codegen/src/main/resources/ruby/spec_helper.mustache b/modules/swagger-codegen/src/main/resources/ruby/spec_helper.mustache
new file mode 100644
index 00000000000..bc4187c3378
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/spec_helper.mustache
@@ -0,0 +1,99 @@
+# load the gem
+require '{{{gemName}}}'
+
+# The following was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+ # rspec-expectations config goes here. You can use an alternate
+ # assertion/expectation library such as wrong or the stdlib/minitest
+ # assertions if you prefer.
+ config.expect_with :rspec do |expectations|
+ # This option will default to `true` in RSpec 4. It makes the `description`
+ # and `failure_message` of custom matchers include text for helper methods
+ # defined using `chain`, e.g.:
+ # be_bigger_than(2).and_smaller_than(4).description
+ # # => "be bigger than 2 and smaller than 4"
+ # ...rather than:
+ # # => "be bigger than 2"
+ expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+ end
+
+ # rspec-mocks config goes here. You can use an alternate test double
+ # library (such as bogus or mocha) by changing the `mock_with` option here.
+ config.mock_with :rspec do |mocks|
+ # Prevents you from mocking or stubbing a method that does not exist on
+ # a real object. This is generally recommended, and will default to
+ # `true` in RSpec 4.
+ mocks.verify_partial_doubles = true
+ end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+ # These two settings work together to allow you to limit a spec run
+ # to individual examples or groups you care about by tagging them with
+ # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+ # get run.
+ config.filter_run :focus
+ config.run_all_when_everything_filtered = true
+
+ # Allows RSpec to persist some state between runs in order to support
+ # the `--only-failures` and `--next-failure` CLI options. We recommend
+ # you configure your source control system to ignore this file.
+ config.example_status_persistence_file_path = "spec/examples.txt"
+
+ # Limits the available syntax to the non-monkey patched syntax that is
+ # recommended. For more details, see:
+ # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+ # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+ # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+ config.disable_monkey_patching!
+
+ # This setting enables warnings. It's recommended, but in some cases may
+ # be too noisy due to issues in dependencies.
+ config.warnings = true
+
+ # Many RSpec users commonly either run the entire suite or an individual
+ # file, and it's useful to allow more verbose output when running an
+ # individual spec file.
+ if config.files_to_run.one?
+ # Use the documentation formatter for detailed output,
+ # unless a formatter has already been configured
+ # (e.g. via a command-line flag).
+ config.default_formatter = 'doc'
+ end
+
+ # Print the 10 slowest examples and example groups at the
+ # end of the spec run, to help surface which specs are running
+ # particularly slow.
+ config.profile_examples = 10
+
+ # Run specs in random order to surface order dependencies. If you find an
+ # order dependency and want to debug it, you can fix the order by providing
+ # the seed, which is printed after each run.
+ # --seed 1234
+ config.order = :random
+
+ # Seed global randomization in this process using the `--seed` CLI option.
+ # Setting this allows you to use `--seed` to deterministically reproduce
+ # test failures related to randomization by passing the same `--seed` value
+ # as the one that triggered the failure.
+ Kernel.srand config.seed
+=end
+end
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.d.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.d.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.d.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-angular/api.d.mustache
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-angular/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/git_push.sh.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/TypeScript-node/git_push.sh.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-angular/git_push.sh.mustache
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-angular/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
index 18b375097c1..0b2e50acb44 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
@@ -2,6 +2,7 @@
"name": "{{npmName}}",
"version": "{{npmVersion}}",
"description": "swagger client for {{npmName}}",
+ "author": "Swagger Codegen Contributors",
"keywords": [
"swagger-client"
],
@@ -31,5 +32,4 @@
"registry":"{{npmRepository}}"
}
{{/npmRepository}}
-
}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/typings.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/typings.mustache
index 32530eeb63d..0848dcffe31 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/typings.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/typings.mustache
@@ -2,4 +2,4 @@
"ambientDependencies": {
"core-js": "registry:dt/core-js#0.0.0+20160317120654"
}
-}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
similarity index 81%
rename from modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
index bf6b76d6b41..81163d686aa 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
@@ -1,6 +1,10 @@
import request = require('request');
-import promise = require('bluebird');
import http = require('http');
+{{^supportsES6}}
+import promise = require('bluebird');
+{{/supportsES6}}
+
+let defaultBasePath = '{{basePath}}';
// ===============================================
// This file is autogenerated - Please do not edit
@@ -22,7 +26,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
* {{{description}}}
*/
{{/description}}
- "{{name}}": {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ '{{name}}': {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
{{/vars}}
}
@@ -31,7 +35,7 @@ export namespace {{classname}} {
{{#vars}}
{{#isEnum}}
export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
- {{.}} = '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
+ {{datatypeWithEnum}}_{{.}} = '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
}
{{/isEnum}}
{{/vars}}
@@ -40,14 +44,14 @@ export namespace {{classname}} {
{{/model}}
{{/models}}
-interface Authentication {
+export interface Authentication {
/**
* Apply authentication settings to header and query params.
*/
applyToRequest(requestOptions: request.Options): void;
}
-class HttpBasicAuth implements Authentication {
+export class HttpBasicAuth implements Authentication {
public username: string;
public password: string;
applyToRequest(requestOptions: request.Options): void {
@@ -57,7 +61,7 @@ class HttpBasicAuth implements Authentication {
}
}
-class ApiKeyAuth implements Authentication {
+export class ApiKeyAuth implements Authentication {
public apiKey: string;
constructor(private location: string, private paramName: string) {
@@ -72,7 +76,7 @@ class ApiKeyAuth implements Authentication {
}
}
-class OAuth implements Authentication {
+export class OAuth implements Authentication {
public accessToken: string;
applyToRequest(requestOptions: request.Options): void {
@@ -80,7 +84,7 @@ class OAuth implements Authentication {
}
}
-class VoidAuth implements Authentication {
+export class VoidAuth implements Authentication {
public username: string;
public password: string;
applyToRequest(requestOptions: request.Options): void {
@@ -105,7 +109,7 @@ export enum {{classname}}ApiKeys {
}
export class {{classname}} {
- protected basePath = '{{basePath}}';
+ protected basePath = defaultBasePath;
protected defaultHeaders : any = {};
protected authentications = {
@@ -182,7 +186,7 @@ export class {{classname}} {
* {{notes}}
{{#allParams}}* @param {{paramName}} {{description}}
{{/allParams}}*/
- public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> {
+ public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.{{#supportsES6}}IncomingMessage{{/supportsES6}}{{^supportsES6}}ClientResponse{{/supportsES6}}; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> {
const localVarPath = this.basePath + '{{path}}'{{#pathParams}}
.replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
let queryParameters: any = {};
@@ -216,8 +220,9 @@ export class {{classname}} {
{{/isFile}}
{{/formParams}}
+ {{^supportsES6}}
let localVarDeferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>();
-
+ {{/supportsES6}}
let requestOptions: request.Options = {
method: '{{httpMethod}}',
qs: queryParameters,
@@ -227,7 +232,7 @@ export class {{classname}} {
{{#bodyParam}}
body: {{paramName}},
{{/bodyParam}}
- }
+ };
{{#authMethods}}
this.authentications.{{name}}.applyToRequest(requestOptions);
@@ -242,7 +247,7 @@ export class {{classname}} {
requestOptions.form = formParams;
}
}
-
+ {{^supportsES6}}
request(requestOptions, (error, response, body) => {
if (error) {
localVarDeferred.reject(error);
@@ -254,8 +259,23 @@ export class {{classname}} {
}
}
});
-
return localVarDeferred.promise;
+ {{/supportsES6}}
+ {{#supportsES6}}
+ return new Promise<{ response: http.IncomingMessage; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>((resolve, reject) => {
+ request(requestOptions, (error, response, body) => {
+ if (error) {
+ reject(error);
+ } else {
+ if (response.statusCode >= 200 && response.statusCode <= 299) {
+ resolve({ response: response, body: body });
+ } else {
+ reject({ response: response, body: body });
+ }
+ }
+ });
+ });
+ {{/supportsES6}}
}
{{/operation}}
}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+ git_user_id="{{{gitUserId}}}"
+ echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+ git_repo_id="{{{gitRepoId}}}"
+ echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+ release_note="{{{releaseNote}}}"
+ echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+ if [ "$GIT_TOKEN" = "" ]; then
+ echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+ git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+ else
+ git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+ fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache
new file mode 100644
index 00000000000..96714500208
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache
@@ -0,0 +1,22 @@
+{
+ "name": "{{npmName}}",
+ "version": "{{npmVersion}}",
+ "description": "NodeJS client for {{npmName}}",
+ "main": "api.js",
+ "scripts": {
+ "build": "typings install && tsc"
+ },
+ "author": "Swagger Codegen Contributors",
+ "license": "MIT",
+ "dependencies": {
+ "bluebird": "^3.3.5",
+ "request": "^2.72.0"
+ },
+ "devDependencies": {
+ "typescript": "^1.8.10",
+ "typings": "^0.8.1"
+ }{{#npmRepository}},
+ "publishConfig":{
+ "registry":"{{npmRepository}}"
+ }{{/npmRepository}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache
new file mode 100644
index 00000000000..1a3bd00183a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache
@@ -0,0 +1,18 @@
+{
+ "compilerOptions": {
+ "module": "commonjs",
+ "noImplicitAny": false,
+ "suppressImplicitAnyIndexErrors": true,
+ "target": "{{#supportsES6}}ES6{{/supportsES6}}{{^supportsES6}}ES5{{/supportsES6}}",
+ "moduleResolution": "node",
+ "removeComments": true,
+ "sourceMap": true,
+ "noLib": false,
+ "declaration": true
+ },
+ "files": [
+ "api.ts",
+ "typings/main.d.ts"
+ ]
+}
+
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache
new file mode 100644
index 00000000000..76c4cc8e6af
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache
@@ -0,0 +1,10 @@
+{
+ "ambientDependencies": {
+ "bluebird": "registry:dt/bluebird#2.0.0+20160319051630",
+ "core-js": "registry:dt/core-js#0.0.0+20160317120654",
+ "node": "registry:dt/node#4.0.0+20160423143914"
+ },
+ "dependencies": {
+ "request": "registry:npm/request#2.69.0+20160304121250"
+ }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java
index 927d4d7755b..eda6602607d 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java
@@ -30,6 +30,8 @@ public class JavaScriptClientOptionsTest extends AbstractOptionsTest {
protected void setExpectations() {
// Commented generic options not yet supported by JavaScript codegen.
new Expectations(clientCodegen) {{
+ clientCodegen.setInvokerPackage(JavaScriptOptionsProvider.INVOKER_PACKAGE_VALUE);
+ times = 1;
clientCodegen.setModelPackage(JavaScriptOptionsProvider.MODEL_PACKAGE_VALUE);
times = 1;
clientCodegen.setApiPackage(JavaScriptOptionsProvider.API_PACKAGE_VALUE);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
index fed94aa04f6..84fb38d1dd3 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
@@ -27,6 +27,31 @@ import java.util.Map;
@SuppressWarnings("static-method")
public class ObjcModelTest {
+ @Test(description = "convert a model with a advanced map property")
+ public void advancedMapPropertyTest() {
+ final Model model = new ModelImpl()
+ .description("a sample model")
+ .property("translations", new MapProperty()
+ .additionalProperties(new MapProperty().additionalProperties(new StringProperty())))
+ .required("id");
+ final DefaultCodegen codegen = new ObjcClientCodegen();
+ final CodegenModel cm = codegen.fromModel("sample", model);
+
+ Assert.assertEquals(cm.name, "sample");
+ Assert.assertEquals(cm.classname, "SWGSample");
+ Assert.assertEquals(cm.description, "a sample model");
+ Assert.assertEquals(cm.vars.size(), 1);
+
+ final CodegenProperty property1 = cm.vars.get(0);
+ Assert.assertEquals(property1.baseName, "translations");
+ Assert.assertEquals(property1.datatype, "NSDictionary*>*");
+ Assert.assertEquals(property1.name, "translations");
+ Assert.assertEquals(property1.baseType, "NSDictionary");
+ Assert.assertEquals(property1.containerType, "map");
+ Assert.assertNull(property1.required);
+ Assert.assertTrue(property1.isContainer);
+ }
+
@Test(description = "convert a simple java model")
public void simpleModelTest() {
final Model model = new ModelImpl()
@@ -108,7 +133,7 @@ public class ObjcModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "NSArray* /* NSString */");
+ Assert.assertEquals(property2.datatype, "NSArray*");
Assert.assertEquals(property2.name, "urls");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "NSArray");
@@ -136,7 +161,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "NSDictionary* /* NSString, NSString */");
+ Assert.assertEquals(property1.datatype, "NSDictionary*");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.baseType, "NSDictionary");
Assert.assertEquals(property1.containerType, "map");
@@ -145,6 +170,7 @@ public class ObjcModelTest {
Assert.assertTrue(property1.isPrimitiveType);
}
+
@Test(description = "convert a model with complex property")
public void complexPropertyTest() {
final Model model = new ModelImpl()
@@ -210,7 +236,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "SWGChildren");
- Assert.assertEquals(property1.datatype, "NSDictionary* /* NSString, SWGChildren */");
+ Assert.assertEquals(property1.datatype, "NSDictionary*");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "NSDictionary");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java
index 9b0f06a1031..b445fc1c528 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java
@@ -10,9 +10,9 @@ import java.util.Map;
public class JavaScriptOptionsProvider implements OptionsProvider {
public static final String ARTIFACT_ID_VALUE = "swagger-javascript-client-test";
+ public static final String INVOKER_PACKAGE_VALUE = "invoker";
public static final String MODEL_PACKAGE_VALUE = "model";
public static final String API_PACKAGE_VALUE = "api";
-// public static final String INVOKER_PACKAGE_VALUE = "js";
public static final String SORT_PARAMS_VALUE = "false";
public static final String GROUP_ID_VALUE = "io.swagger.test";
public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
@@ -38,11 +38,11 @@ public class JavaScriptOptionsProvider implements OptionsProvider {
public JavaScriptOptionsProvider() {
// Commented generic options not yet supported by JavaScript codegen.
options = new ImmutableMap.Builder()
+ .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
.put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
.put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
-// .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
// .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
// .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
// .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
new file mode 100644
index 00000000000..af70fc1834a
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
@@ -0,0 +1,32 @@
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.SpringBootServerCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
+ public static final String CONFIG_PACKAGE_VALUE = "configPackage";
+ public static final String BASE_PACKAGE_VALUE = "basePackage";
+ public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
+
+ @Override
+ public String getLanguage() {
+ return "springboot";
+ }
+
+ @Override
+ public Map