@@ -281,7 +281,7 @@ open class URLSession : NSObject {
281281 */
282282
283283 /* Creates a data task with the given request. The request may have a body stream. */
284- open func dataTask( with request: NSURLRequest ) -> URLSessionDataTask {
284+ open func dataTask( with request: URLRequest ) -> URLSessionDataTask {
285285 return dataTask ( with: _Request ( request) , behaviour: . callDelegate)
286286 }
287287
@@ -291,22 +291,22 @@ open class URLSession : NSObject {
291291 }
292292
293293 /* Creates an upload task with the given request. The body of the request will be created from the file referenced by fileURL */
294- open func uploadTask( with request: NSURLRequest , fromFile fileURL: URL ) -> URLSessionUploadTask {
294+ open func uploadTask( with request: URLRequest , fromFile fileURL: URL ) -> URLSessionUploadTask {
295295 let r = URLSession . _Request ( request)
296296 return uploadTask ( with: r, body: . file( fileURL) , behaviour: . callDelegate)
297297 }
298298
299299 /* Creates an upload task with the given request. The body of the request is provided from the bodyData. */
300- open func uploadTask( with request: NSURLRequest , fromData bodyData: Data ) -> URLSessionUploadTask {
300+ open func uploadTask( with request: URLRequest , fromData bodyData: Data ) -> URLSessionUploadTask {
301301 let r = URLSession . _Request ( request)
302302 return uploadTask ( with: r, body: . data( createDispatchData ( bodyData) ) , behaviour: . callDelegate)
303303 }
304304
305305 /* Creates an upload task with the given request. The previously set body stream of the request (if any) is ignored and the URLSession:task:needNewBodyStream: delegate will be called when the body payload is required. */
306- open func uploadTask( withStreamedRequest request: NSURLRequest ) -> URLSessionUploadTask { NSUnimplemented ( ) }
306+ open func uploadTask( withStreamedRequest request: URLRequest ) -> URLSessionUploadTask { NSUnimplemented ( ) }
307307
308308 /* Creates a download task with the given request. */
309- open func downloadTask( with request: NSURLRequest ) -> URLSessionDownloadTask {
309+ open func downloadTask( with request: URLRequest ) -> URLSessionDownloadTask {
310310 let r = URLSession . _Request ( request)
311311 return downloadTask ( with: r, behavior: . callDelegate)
312312 }
@@ -328,10 +328,10 @@ open class URLSession : NSObject {
328328// Helpers
329329fileprivate extension URLSession {
330330 enum _Request {
331- case request( NSURLRequest )
331+ case request( URLRequest )
332332 case url( URL )
333333 }
334- func createConfiguredRequest( from request: URLSession . _Request ) -> NSURLRequest {
334+ func createConfiguredRequest( from request: URLSession . _Request ) -> URLRequest {
335335 let r = request. createMutableURLRequest ( )
336336 _configuration. configure ( request: r)
337337 return r
@@ -341,15 +341,15 @@ extension URLSession._Request {
341341 init ( _ url: URL ) {
342342 self = . url( url)
343343 }
344- init ( _ request: NSURLRequest ) {
344+ init ( _ request: URLRequest ) {
345345 self = . request( request)
346346 }
347347}
348348extension URLSession . _Request {
349- func createMutableURLRequest( ) -> NSMutableURLRequest {
349+ func createMutableURLRequest( ) -> URLRequest {
350350 switch self {
351- case . url( let url) : return NSMutableURLRequest ( url: url)
352- case . request( let r) : return r. mutableCopy ( ) as! NSMutableURLRequest
351+ case . url( let url) : return URLRequest ( url: url)
352+ case . request( let r) : return r
353353 }
354354 }
355355}
@@ -420,7 +420,7 @@ extension URLSession {
420420 * see <Foundation/NSURLError.h>. The delegate, if any, will still be
421421 * called for authentication challenges.
422422 */
423- open func dataTask( with request: NSURLRequest , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionDataTask {
423+ open func dataTask( with request: URLRequest , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionDataTask {
424424 return dataTask ( with: _Request ( request) , behaviour: . dataCompletionHandler( completionHandler) )
425425 }
426426
@@ -431,12 +431,12 @@ extension URLSession {
431431 /*
432432 * upload convenience method.
433433 */
434- open func uploadTask( with request: NSURLRequest , fromFile fileURL: URL , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionUploadTask {
434+ open func uploadTask( with request: URLRequest , fromFile fileURL: URL , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionUploadTask {
435435 let fileData = try ! Data ( contentsOf: fileURL)
436436 return uploadTask ( with: request, fromData: fileData, completionHandler: completionHandler)
437437 }
438438
439- open func uploadTask( with request: NSURLRequest , fromData bodyData: Data ? , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionUploadTask {
439+ open func uploadTask( with request: URLRequest , fromData bodyData: Data ? , completionHandler: @escaping ( Data ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionUploadTask {
440440 return uploadTask ( with: _Request ( request) , body: . data( createDispatchData ( bodyData!) ) , behaviour: . dataCompletionHandler( completionHandler) )
441441 }
442442
@@ -446,7 +446,7 @@ extension URLSession {
446446 * copied during the invocation of the completion routine. The file
447447 * will be removed automatically.
448448 */
449- open func downloadTask( with request: NSURLRequest , completionHandler: @escaping ( URL ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionDownloadTask {
449+ open func downloadTask( with request: URLRequest , completionHandler: @escaping ( URL ? , URLResponse ? , NSError ? ) -> Void ) -> URLSessionDownloadTask {
450450 return downloadTask ( with: _Request ( request) , behavior: . downloadCompletionHandler( completionHandler) )
451451 }
452452
0 commit comments