forked from loafle/openapi-generator-original
[swift5][client] improve headers order (#14636)
This commit is contained in:
parent
1beec7ef87
commit
4bb8372340
@ -92,10 +92,6 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
|
|||||||
|
|
||||||
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func buildHeaders() -> [String: String] {
|
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in {{projectName}}API.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in {{projectName}}API.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
internal func buildHeaders() -> [String: String] {
|
internal func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
originalRequest.httpMethod = method.rawValue
|
originalRequest.httpMethod = method.rawValue
|
||||||
|
|
||||||
headers.forEach { key, value in
|
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
|
||||||
}
|
|
||||||
|
|
||||||
buildHeaders().forEach { key, value in
|
buildHeaders().forEach { key, value in
|
||||||
originalRequest.setValue(value, forHTTPHeaderField: key)
|
originalRequest.setValue(value, forHTTPHeaderField: key)
|
||||||
}
|
}
|
||||||
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
|
|
||||||
open func buildHeaders() -> [String: String] {
|
open func buildHeaders() -> [String: String] {
|
||||||
var httpHeaders: [String: String] = [:]
|
var httpHeaders: [String: String] = [:]
|
||||||
for (key, value) in headers {
|
for (key, value) in PetstoreClientAPI.customHeaders {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
for (key, value) in PetstoreClientAPI.customHeaders {
|
for (key, value) in headers {
|
||||||
httpHeaders[key] = value
|
httpHeaders[key] = value
|
||||||
}
|
}
|
||||||
return httpHeaders
|
return httpHeaders
|
||||||
|
Loading…
x
Reference in New Issue
Block a user