Skip to content

[Swift] two fixes to latest param mapping code #4587

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
merged 5 commits into from
Jan 25, 2017
Merged

[Swift] two fixes to latest param mapping code #4587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0e0cdf
two fixes: 1) extra ?'s at end of some url's 2) enums not being calle…
jaz-ah Jan 17, 2017
8e4197e
update samples
jaz-ah Jan 17, 2017
505cd0b
one step closer
jaz-ah Jan 18, 2017
dfdd5cd
closer implementation
jaz-ah Jan 18, 2017
25dae23
Merge branch 'master' of https://github.com/swagger-api/swagger-codegen
jaz-ah Jan 18, 2017
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
8 changes: 6 additions & 2 deletions modules/swagger-codegen/src/main/resources/swift3/APIHelper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,16 @@ class APIHelper {
}


static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem] {
return values
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values
.filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in
URLQueryItem(name: item._key, value:"\(item._value!)")
}
if returnValues.count == 0 {
return nil
}
return returnValues
}

}
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/main/resources/swift3/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ open class {{classname}}: APIBase {
let url = NSURLComponents(string: URLString)
{{#hasQueryParams}}
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
{{#queryParams}}
"{{paramName}}": {{paramName}}{{#hasMore}}, {{/hasMore}}
{{/queryParams}}
{{#queryParams}}
{{> _param}}{{#hasMore}}, {{/hasMore}}
{{/queryParams}}
])
{{/hasQueryParams}}

Expand Down
8 changes: 6 additions & 2 deletions samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,16 @@ class APIHelper {
}


static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem] {
return values
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values
.filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in
URLQueryItem(name: item._key, value:"\(item._value!)")
}
if returnValues.count == 0 {
return nil
}
return returnValues
}

}
6 changes: 3 additions & 3 deletions samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ open class FakeAPI: APIBase {

let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"enumQueryStringArray": enumQueryStringArray,
"enumQueryString": enumQueryString,
"enumQueryInteger": enumQueryInteger
"enum_query_string_array": enumQueryStringArray,
"enum_query_string": enumQueryString?.rawValue,
"enum_query_integer": enumQueryInteger?.encodeToJSON()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomekc @wing328 is this correct for the integer value - was this broken as well? I notice the double above in the formParams wasn't encoded...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for me locally - looks like the correct change.

])

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ open class PetAPI: APIBase {

let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"status": status
"status": status
])

let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
Expand Down Expand Up @@ -258,7 +258,7 @@ open class PetAPI: APIBase {

let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"tags": tags
"tags": tags
])

let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ open class UserAPI: APIBase {

let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"username": username,
"password": password
"username": username,
"password": password
])

let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
Expand Down
13 changes: 13 additions & 0 deletions samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,17 @@ class APIHelper {
return destination
}


static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values
.filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in
URLQueryItem(name: item._key, value:"\(item._value!)")
}
if returnValues.count == 0 {
return nil
}
return returnValues
}

}
49 changes: 21 additions & 28 deletions samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ import PromiseKit


open class FakeAPI: APIBase {

public class func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem] {
return values
.filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in
URLQueryItem(name: item._key, value:"\(item._value!)")
}
}

/**
To test \"client\" model

Expand Down Expand Up @@ -68,13 +59,10 @@ open class FakeAPI: APIBase {
let parameters = body.encodeToJSON() as? [String:AnyObject]

let url = NSURLComponents(string: URLString)


let convertedParameters = APIHelper.convertBoolToString(parameters)

let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: convertedParameters, isBody: true)
return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
}

/**
Expand Down Expand Up @@ -161,8 +149,7 @@ open class FakeAPI: APIBase {
open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
let path = "/fake"
let URLString = PetstoreClientAPI.basePath + path

let nillableParameters: [String:Any?] = [
let formParams: [String:Any?] = [
"integer": integer?.encodeToJSON(),
"int32": int32?.encodeToJSON(),
"int64": int64?.encodeToJSON(),
Expand All @@ -178,14 +165,15 @@ open class FakeAPI: APIBase {
"password": password,
"callback": callback
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let nonNullParameters = APIHelper.rejectNil(formParams)
let parameters = APIHelper.convertBoolToString(nonNullParameters)

let url = NSURLComponents(string: URLString)

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "POST", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -279,20 +267,25 @@ open class FakeAPI: APIBase {
open class func testEnumParametersWithRequestBuilder(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: Int32? = nil, enumQueryDouble: Double? = nil) -> RequestBuilder<Void> {
let path = "/fake"
let URLString = PetstoreClientAPI.basePath + path

let nillableParameters: [String:Any?] = [
"enum_query_string_array": enumQueryStringArray,
"enum_query_string": enumQueryString?.rawValue,
"enum_query_integer": enumQueryInteger?.encodeToJSON()
let formParams: [String:Any?] = [
"enum_form_string_array": enumFormStringArray,
"enum_form_string": enumFormString?.rawValue,
"enum_query_double": enumQueryDouble
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let nonNullParameters = APIHelper.rejectNil(formParams)
let parameters = APIHelper.convertBoolToString(nonNullParameters)

let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"enum_query_string_array": enumQueryStringArray,
"enum_query_string": enumQueryString?.rawValue,
"enum_query_integer": enumQueryInteger?.encodeToJSON()
])

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "GET", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

}
85 changes: 30 additions & 55 deletions samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ import PromiseKit


open class PetAPI: APIBase {

public class func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem] {
return values
.filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in
URLQueryItem(name: item._key, value:"\(item._value!)")
}
}

/**
Add a new pet to the store

Expand Down Expand Up @@ -68,13 +59,10 @@ open class PetAPI: APIBase {
let parameters = body.encodeToJSON() as? [String:AnyObject]

let url = NSURLComponents(string: URLString)


let convertedParameters = APIHelper.convertBoolToString(parameters)

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: convertedParameters, isBody: true)
return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
}

/**
Expand Down Expand Up @@ -123,16 +111,13 @@ open class PetAPI: APIBase {
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)", options: .literal, range: nil)
let URLString = PetstoreClientAPI.basePath + path
let parameters: [String:Any]? = nil

let nillableParameters: [String:Any?] = [:]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let url = NSURLComponents(string: URLString)

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -235,18 +220,16 @@ open class PetAPI: APIBase {
open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
let path = "/pet/findByStatus"
let URLString = PetstoreClientAPI.basePath + path
let parameters: [String:Any]? = nil

let nillableParameters: [String:Any?] = [
let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"status": status
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
])

let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "GET", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -340,18 +323,16 @@ open class PetAPI: APIBase {
open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
let path = "/pet/findByTags"
let URLString = PetstoreClientAPI.basePath + path
let parameters: [String:Any]? = nil

let nillableParameters: [String:Any?] = [
let url = NSURLComponents(string: URLString)
url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
"tags": tags
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
])

let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "GET", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -446,16 +427,13 @@ open class PetAPI: APIBase {
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)", options: .literal, range: nil)
let URLString = PetstoreClientAPI.basePath + path
let parameters: [String:Any]? = nil

let nillableParameters: [String:Any?] = [:]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let url = NSURLComponents(string: URLString)

let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "GET", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -506,13 +484,10 @@ open class PetAPI: APIBase {
let parameters = body.encodeToJSON() as? [String:AnyObject]

let url = NSURLComponents(string: URLString)


let convertedParameters = APIHelper.convertBoolToString(parameters)

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: convertedParameters, isBody: true)
return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
}

/**
Expand Down Expand Up @@ -567,19 +542,19 @@ open class PetAPI: APIBase {
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)", options: .literal, range: nil)
let URLString = PetstoreClientAPI.basePath + path

let nillableParameters: [String:Any?] = [
let formParams: [String:Any?] = [
"name": name,
"status": status
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let nonNullParameters = APIHelper.rejectNil(formParams)
let parameters = APIHelper.convertBoolToString(nonNullParameters)

let url = NSURLComponents(string: URLString)

let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "POST", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

/**
Expand Down Expand Up @@ -639,19 +614,19 @@ open class PetAPI: APIBase {
var path = "/pet/{petId}/uploadImage"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)", options: .literal, range: nil)
let URLString = PetstoreClientAPI.basePath + path

let nillableParameters: [String:Any?] = [
let formParams: [String:Any?] = [
"additionalMetadata": additionalMetadata,
"file": file
]

let parameters = APIHelper.rejectNil(nillableParameters)

let convertedParameters = APIHelper.convertBoolToString(parameters)
let nonNullParameters = APIHelper.rejectNil(formParams)
let parameters = APIHelper.convertBoolToString(nonNullParameters)

let url = NSURLComponents(string: URLString)

let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()

return requestBuilder.init(method: "POST", URLString: URLString, parameters: convertedParameters, isBody: false)
return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
}

}
Loading