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

[Swift3] Fix handling of query item with array value (#5684)

Browse Source
This commit is contained in:
Jason Gavris 2017-06-11 05:30:51 +01:00 committed by wing328
parent 022eb0d379
commit ef8365ecd2
4 changed files with 68 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/swagger-codegen/src/main/resources/swift3/APIHelper.mustache
View File

@ -49,16 +49,30 @@ class APIHelper {
return destination return destination
} }
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? { static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values let returnValues = values
.filter { $0.1 != nil } .filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in .map { (item: (_key: String, _value: Any?)) -> [URLQueryItem] in
URLQueryItem(name: item._key, value:"\(item._value!)") if let value = item._value as? Array<String> {
return value.map { (v) -> URLQueryItem in
URLQueryItem(
name: item._key,
value: v
)
} }
} else {
return [URLQueryItem(
name: item._key,
value: "\(item._value!)"
)]
}
}
.flatMap { $0 }
if returnValues.count == 0 { if returnValues.count == 0 {
return nil return nil
} }
return returnValues return returnValues
} }

20
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIHelper.swift
View File

@ -49,16 +49,30 @@ class APIHelper {
return destination return destination
} }
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? { static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values let returnValues = values
.filter { $0.1 != nil } .filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in .map { (item: (_key: String, _value: Any?)) -> [URLQueryItem] in
URLQueryItem(name: item._key, value:"\(item._value!)") if let value = item._value as? Array<String> {
return value.map { (v) -> URLQueryItem in
URLQueryItem(
name: item._key,
value: v
)
} }
} else {
return [URLQueryItem(
name: item._key,
value: "\(item._value!)"
)]
}
}
.flatMap { $0 }
if returnValues.count == 0 { if returnValues.count == 0 {
return nil return nil
} }
return returnValues return returnValues
} }

20
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
View File

@ -49,16 +49,30 @@ class APIHelper {
return destination return destination
} }
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? { static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values let returnValues = values
.filter { $0.1 != nil } .filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in .map { (item: (_key: String, _value: Any?)) -> [URLQueryItem] in
URLQueryItem(name: item._key, value:"\(item._value!)") if let value = item._value as? Array<String> {
return value.map { (v) -> URLQueryItem in
URLQueryItem(
name: item._key,
value: v
)
} }
} else {
return [URLQueryItem(
name: item._key,
value: "\(item._value!)"
)]
}
}
.flatMap { $0 }
if returnValues.count == 0 { if returnValues.count == 0 {
return nil return nil
} }
return returnValues return returnValues
} }

20
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIHelper.swift
View File

@ -49,16 +49,30 @@ class APIHelper {
return destination return destination
} }
static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? { static func mapValuesToQueryItems(values: [String:Any?]) -> [URLQueryItem]? {
let returnValues = values let returnValues = values
.filter { $0.1 != nil } .filter { $0.1 != nil }
.map { (item: (_key: String, _value: Any?)) -> URLQueryItem in .map { (item: (_key: String, _value: Any?)) -> [URLQueryItem] in
URLQueryItem(name: item._key, value:"\(item._value!)") if let value = item._value as? Array<String> {
return value.map { (v) -> URLQueryItem in
URLQueryItem(
name: item._key,
value: v
)
} }
} else {
return [URLQueryItem(
name: item._key,
value: "\(item._value!)"
)]
}
}
.flatMap { $0 }
if returnValues.count == 0 { if returnValues.count == 0 {
return nil return nil
} }
return returnValues return returnValues
} }