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

Swift5/Vapor query parameter coding keys required (#9924)

Browse Source 
* Fixes camel-case query parameters (perPage => per_page)

* Prep for PR
This commit is contained in:
Jacob Heider 2021-07-13 03:27:44 -04:00 committed by GitHub
parent 26f998b043
commit aa88d5bbe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/swift5/api.mustache vendored
View File

@ -251,6 +251,12 @@ extension {{projectName}} {
{{#queryParams}} {{#queryParams}}
var {{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}} var {{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}
{{/queryParams}} {{/queryParams}}
enum CodingKeys: String, CodingKey {
{{#queryParams}}
case {{paramName}}{{#baseName}} = "{{baseName}}"{{/baseName}}
{{/queryParams}}
}
} }
try localVariableRequest.query.encode(QueryParams({{#queryParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/queryParams}})){{/hasQueryParams}} try localVariableRequest.query.encode(QueryParams({{#queryParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/queryParams}})){{/hasQueryParams}}
{{#hasBodyParam}} {{#hasBodyParam}}

26
samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift
View File

@ -324,6 +324,10 @@ open class FakeAPI {
struct QueryParams: Content { struct QueryParams: Content {
var query: String var query: String
enum CodingKeys: String, CodingKey {
case query = "query"
}
} }
try localVariableRequest.query.encode(QueryParams(query: query)) try localVariableRequest.query.encode(QueryParams(query: query))
try localVariableRequest.content.encode(body, using: Configuration.contentConfiguration.requireEncoder(for: User.defaultContentType)) try localVariableRequest.content.encode(body, using: Configuration.contentConfiguration.requireEncoder(for: User.defaultContentType))
@ -605,6 +609,13 @@ open class FakeAPI {
var enumQueryString: EnumQueryString_testEnumParameters? var enumQueryString: EnumQueryString_testEnumParameters?
var enumQueryInteger: EnumQueryInteger_testEnumParameters? var enumQueryInteger: EnumQueryInteger_testEnumParameters?
var enumQueryDouble: EnumQueryDouble_testEnumParameters? var enumQueryDouble: EnumQueryDouble_testEnumParameters?
enum CodingKeys: String, CodingKey {
case enumQueryStringArray = "enum_query_string_array"
case enumQueryString = "enum_query_string"
case enumQueryInteger = "enum_query_integer"
case enumQueryDouble = "enum_query_double"
}
} }
try localVariableRequest.query.encode(QueryParams(enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble)) try localVariableRequest.query.encode(QueryParams(enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble))
struct FormParams: Content { struct FormParams: Content {
@ -683,6 +694,13 @@ open class FakeAPI {
var requiredInt64Group: Int64 var requiredInt64Group: Int64
var stringGroup: Int? var stringGroup: Int?
var int64Group: Int64? var int64Group: Int64?
enum CodingKeys: String, CodingKey {
case requiredStringGroup = "required_string_group"
case requiredInt64Group = "required_int64_group"
case stringGroup = "string_group"
case int64Group = "int64_group"
}
} }
try localVariableRequest.query.encode(QueryParams(requiredStringGroup: requiredStringGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, int64Group: int64Group)) try localVariableRequest.query.encode(QueryParams(requiredStringGroup: requiredStringGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, int64Group: int64Group))
@ -846,6 +864,14 @@ open class FakeAPI {
var http: [String] var http: [String]
var url: [String] var url: [String]
var context: [String] var context: [String]
enum CodingKeys: String, CodingKey {
case pipe = "pipe"
case ioutil = "ioutil"
case http = "http"
case url = "url"
case context = "context"
}
} }
try localVariableRequest.query.encode(QueryParams(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context)) try localVariableRequest.query.encode(QueryParams(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context))

8
samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
View File

@ -163,6 +163,10 @@ open class PetAPI {
struct QueryParams: Content { struct QueryParams: Content {
var status: [Status_findPetsByStatus] var status: [Status_findPetsByStatus]
enum CodingKeys: String, CodingKey {
case status = "status"
}
} }
try localVariableRequest.query.encode(QueryParams(status: status)) try localVariableRequest.query.encode(QueryParams(status: status))
@ -224,6 +228,10 @@ open class PetAPI {
struct QueryParams: Content { struct QueryParams: Content {
var tags: Set<String> var tags: Set<String>
enum CodingKeys: String, CodingKey {
case tags = "tags"
}
} }
try localVariableRequest.query.encode(QueryParams(tags: tags)) try localVariableRequest.query.encode(QueryParams(tags: tags))

5
samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/UserAPI.swift
View File

@ -278,6 +278,11 @@ open class UserAPI {
struct QueryParams: Content { struct QueryParams: Content {
var username: String var username: String
var password: String var password: String
enum CodingKeys: String, CodingKey {
case username = "username"
case password = "password"
}
} }
try localVariableRequest.query.encode(QueryParams(username: username, password: password)) try localVariableRequest.query.encode(QueryParams(username: username, password: password))