[swift5][client] improve headers order (#14636)

This commit is contained in:
Bruno Coelho 2023-03-05 11:33:05 +00:00 committed by GitHub
parent 1beec7ef87
commit 4bb8372340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 30 additions and 90 deletions

View File

@ -92,10 +92,6 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
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] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in {{projectName}}API.customHeaders {
httpHeaders[key] = value
}
for (key, value) in {{projectName}}API.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
internal func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders

View File

@ -92,10 +92,6 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
originalRequest.httpMethod = method.rawValue
headers.forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
buildHeaders().forEach { key, value in
originalRequest.setValue(value, forHTTPHeaderField: key)
}
@ -218,10 +214,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
open func buildHeaders() -> [String: String] {
var httpHeaders: [String: String] = [:]
for (key, value) in headers {
for (key, value) in PetstoreClientAPI.customHeaders {
httpHeaders[key] = value
}
for (key, value) in PetstoreClientAPI.customHeaders {
for (key, value) in headers {
httpHeaders[key] = value
}
return httpHeaders