loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #2267 from wing328/objc_model_prefix

Browse Source 
[ObjC] add prefix and suffix support to ObjC models
This commit is contained in:
wing328 2016-02-28 18:49:50 +08:00
commit 9f3c34dbfa
7 changed files with 154 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
// local variable names in API methods (endpoints)
"resourcePath", "pathParams", "queryParams", "headerParams",
"responseContentType", "requestContentType", "authSettings",
"formParams", "files", "bodyParam",
"formParams", "localVarFiles", "bodyParam",
// objc reserved words
"auto", "else", "long", "switch",
"break", "enum", "register", "typedef",
@ -343,7 +343,15 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
}
// custom classes
else {
return classPrefix + camelize(type);
if (!StringUtils.isEmpty(modelNameSuffix)) { // set model suffix
type = type + "_" + modelNameSuffix;
}
if (!StringUtils.isEmpty(modelNamePrefix)) { // set model prefix
type = modelNamePrefix + "_" + type;
}
return classPrefix + camelize(type); // add class prefix
}
}

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

@ -141,7 +141,7 @@ static {{classname}}* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
{{#bodyParam}}
bodyParam = {{paramName}};
{{/bodyParam}}{{^bodyParam}}
@ -151,7 +151,7 @@ static {{classname}}* singletonAPI = nil;
formParams[@"{{baseName}}"] = {{paramName}};
}
{{/notFile}}{{#isFile}}
files[@"{{paramName}}"] = {{paramName}};
localVarFiles[@"{{paramName}}"] = {{paramName}};
{{/isFile}}
{{/formParams}}
{{/bodyParam}}
@ -168,7 +168,7 @@ static {{classname}}* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings

4
samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
View File

@ -48,9 +48,9 @@
///
///
/// Finds Pets by status
/// Multiple status values can be provided with comma seperated strings
/// Multiple status values can be provided with comma separated strings
///
/// @param status Status values that need to be considered for filter
/// @param status Status values that need to be considered for query
///
///
/// @return NSArray<SWGPet>*

46
samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
View File

@ -120,7 +120,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -131,7 +131,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -195,7 +195,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -206,7 +206,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -221,8 +221,8 @@ static SWGPetApi* singletonAPI = nil;
///
/// Finds Pets by status
/// Multiple status values can be provided with comma seperated strings
/// @param status Status values that need to be considered for filter
/// Multiple status values can be provided with comma separated strings
/// @param status Status values that need to be considered for query
///
/// @returns NSArray<SWGPet>*
///
@ -276,7 +276,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -287,7 +287,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -357,7 +357,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -368,7 +368,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -440,7 +440,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -451,7 +451,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -529,7 +529,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -552,7 +552,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -630,7 +630,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -641,7 +641,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -719,7 +719,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -729,7 +729,7 @@ static SWGPetApi* singletonAPI = nil;
files[@"file"] = file;
localVarFiles[@"file"] = file;
@ -740,7 +740,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -812,7 +812,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -823,7 +823,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -887,7 +887,7 @@ static SWGPetApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -898,7 +898,7 @@ static SWGPetApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings

13
samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
View File

@ -19,6 +19,19 @@
-(unsigned long) requestQueueSize;
+(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
+(SWGStoreApi*) sharedAPI;
///
///
/// Finds orders by status
/// A single status value can be provided as a string
///
/// @param status Status value that needs to be considered for query
///
///
/// @return NSArray<SWGOrder>*
-(NSNumber*) findOrdersByStatusWithStatus: (NSString*) status
completionHandler: (void (^)(NSArray<SWGOrder>* output, NSError* error)) handler;
///
///
/// Returns pet inventories by status

95
samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
View File

@ -69,6 +69,85 @@ static SWGStoreApi* singletonAPI = nil;
#pragma mark - Api Methods
///
/// Finds orders by status
/// A single status value can be provided as a string
/// @param status Status value that needs to be considered for query
///
/// @returns NSArray<SWGOrder>*
///
-(NSNumber*) findOrdersByStatusWithStatus: (NSString*) status
completionHandler: (void (^)(NSArray<SWGOrder>* output, NSError* error)) handler {
NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/findByStatus"];
// remove format in URL if needed
if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
[resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
}
NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
if (status != nil) {
queryParams[@"status"] = status;
}
NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
// HTTP header `Accept`
headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
if ([headerParams[@"Accept"] length] == 0) {
[headerParams removeObjectForKey:@"Accept"];
}
// response content type
NSString *responseContentType;
if ([headerParams objectForKey:@"Accept"]) {
responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
}
else {
responseContentType = @"";
}
// request content type
NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
// Authentication setting
NSArray *authSettings = @[@"test_api_client_id", @"test_api_client_secret"];
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
return [self.apiClient requestWithPath: resourcePath
method: @"GET"
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
requestContentType: requestContentType
responseContentType: responseContentType
responseType: @"NSArray<SWGOrder>*"
completionBlock: ^(id data, NSError *error) {
handler((NSArray<SWGOrder>*)data, error);
}
];
}
///
/// Returns pet inventories by status
/// Returns a map of status codes to quantities
@ -118,7 +197,7 @@ static SWGStoreApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -129,7 +208,7 @@ static SWGStoreApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -193,7 +272,7 @@ static SWGStoreApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -204,7 +283,7 @@ static SWGStoreApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -276,7 +355,7 @@ static SWGStoreApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -287,7 +366,7 @@ static SWGStoreApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -359,7 +438,7 @@ static SWGStoreApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -370,7 +449,7 @@ static SWGStoreApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings

32
samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
View File

@ -120,7 +120,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -131,7 +131,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -195,7 +195,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -206,7 +206,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -270,7 +270,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -281,7 +281,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -356,7 +356,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -367,7 +367,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -429,7 +429,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -440,7 +440,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -512,7 +512,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -523,7 +523,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -598,7 +598,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
bodyParam = body;
@ -609,7 +609,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings
@ -681,7 +681,7 @@ static SWGUserApi* singletonAPI = nil;
id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
@ -692,7 +692,7 @@ static SWGUserApi* singletonAPI = nil;
pathParams: pathParams
queryParams: queryParams
formParams: formParams
files: files
files: localVarFiles
body: bodyParam
headerParams: headerParams
authSettings: authSettings