Skip to content

[ObjC] Added support for lower case discriminator #3927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 3 commits into from
Oct 6, 2016
Merged

[ObjC] Added support for lower case discriminator #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec194ce
[Objc] Added support for lower case discriminator
Oct 5, 2016
626270f
Updated Objc petstore samples
Oct 6, 2016
12f05d0
Fixed code style
Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/swagger-codegen/src/main/resources/objc/model-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
return [super initWithDictionary:dict error:err];
}
Class class = NSClassFromString([@"{{classPrefix}}" stringByAppendingString:discriminatedClassName]);
if(!class) {
class = NSClassFromString([@"{{classPrefix}}" stringByAppendingString:[discriminatedClassName capitalizedString]]);
}
if([self class ] == class) {
return [super initWithDictionary:dict error:err];
}
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/objc/core-data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi

- API version: 1.0.0
- Package version:
- Build date: 2016-08-28T17:01:51.939+03:00
- Build package: class io.swagger.codegen.languages.ObjcClientCodegen

## Requirements
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ -(NSNumber*) getPetByIdWithPetId: (NSNumber*) petId
NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];

// Authentication setting
NSArray *authSettings = @[@"api_key", @"petstore_auth"];
NSArray *authSettings = @[@"petstore_auth", @"api_key"];

id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ -(NSNumber*) getPetByIdWithPetId: (NSNumber*) petId
NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];

// Authentication setting
NSArray *authSettings = @[@"api_key", @"petstore_auth"];
NSArray *authSettings = @[@"petstore_auth", @"api_key"];

id bodyParam = nil;
NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/objc/default/docs/SWGPetApi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,14 @@ Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error cond
```objc
SWGConfiguration *apiConfig = [SWGConfiguration sharedConfig];

// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];

// Configure API key authorization: (authentication scheme: api_key)
[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];

// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];


NSNumber* petId = @789; // ID of pet that needs to be fetched

Expand Down Expand Up @@ -283,7 +283,7 @@ Name | Type | Description | Notes

### Authorization

[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
[petstore_auth](../README.md#petstore_auth), [api_key](../README.md#api_key)

### HTTP request headers

Expand Down