forked from loafle/openapi-generator-original
Swift3 headers (#5340)
* added headers to makeRequest function for swift3 template * petstore update
This commit is contained in:
parent
19d5e74dbd
commit
c6959b0d21
@ -45,8 +45,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
May be overridden by a subclass if you want to control the request
|
May be overridden by a subclass if you want to control the request
|
||||||
configuration (e.g. to override the cache policy).
|
configuration (e.g. to override the cache policy).
|
||||||
*/
|
*/
|
||||||
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding) -> DataRequest {
|
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
|
||||||
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding)
|
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
||||||
@ -96,7 +96,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding)
|
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding, headers: headers)
|
||||||
if let onProgressReady = self.onProgressReady {
|
if let onProgressReady = self.onProgressReady {
|
||||||
onProgressReady(request.progress)
|
onProgressReady(request.progress)
|
||||||
}
|
}
|
||||||
|
@ -45,8 +45,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
May be overridden by a subclass if you want to control the request
|
May be overridden by a subclass if you want to control the request
|
||||||
configuration (e.g. to override the cache policy).
|
configuration (e.g. to override the cache policy).
|
||||||
*/
|
*/
|
||||||
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding) -> DataRequest {
|
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
|
||||||
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding)
|
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
||||||
@ -96,7 +96,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding)
|
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding, headers: headers)
|
||||||
if let onProgressReady = self.onProgressReady {
|
if let onProgressReady = self.onProgressReady {
|
||||||
onProgressReady(request.progress)
|
onProgressReady(request.progress)
|
||||||
}
|
}
|
||||||
|
@ -45,8 +45,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
May be overridden by a subclass if you want to control the request
|
May be overridden by a subclass if you want to control the request
|
||||||
configuration (e.g. to override the cache policy).
|
configuration (e.g. to override the cache policy).
|
||||||
*/
|
*/
|
||||||
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding) -> DataRequest {
|
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
|
||||||
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding)
|
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
||||||
@ -96,7 +96,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding)
|
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding, headers: headers)
|
||||||
if let onProgressReady = self.onProgressReady {
|
if let onProgressReady = self.onProgressReady {
|
||||||
onProgressReady(request.progress)
|
onProgressReady(request.progress)
|
||||||
}
|
}
|
||||||
|
@ -45,8 +45,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
May be overridden by a subclass if you want to control the request
|
May be overridden by a subclass if you want to control the request
|
||||||
configuration (e.g. to override the cache policy).
|
configuration (e.g. to override the cache policy).
|
||||||
*/
|
*/
|
||||||
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding) -> DataRequest {
|
open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
|
||||||
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding)
|
return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
|
||||||
@ -96,7 +96,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding)
|
let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding, headers: headers)
|
||||||
if let onProgressReady = self.onProgressReady {
|
if let onProgressReady = self.onProgressReady {
|
||||||
onProgressReady(request.progress)
|
onProgressReady(request.progress)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user