Refactored top-level APIs by removing external `resource` parameter name.

Source/Alamofire.swift

@@ -173,8 +173,8 @@ public func request(
 ///
 /// - returns: The created `DataRequest`.
 @discardableResult
-public func request(resource urlRequest: URLRequestConvertible) -> DataRequest {
-    return SessionManager.default.request(resource: urlRequest)
+public func request(_ urlRequest: URLRequestConvertible) -> DataRequest {
+    return SessionManager.default.request(urlRequest)
 }
 
 // MARK: - Download Request
@@ -227,11 +227,11 @@ public func download(
 /// - returns: The created `DownloadRequest`.
 @discardableResult
 public func download(
-    resource urlRequest: URLRequestConvertible,
+    _ urlRequest: URLRequestConvertible,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
     -> DownloadRequest
 {
-    return SessionManager.default.download(resource: urlRequest, to: destination)
+    return SessionManager.default.download(urlRequest, to: destination)
 }
 
 // MARK: Resume Data
@@ -250,11 +250,11 @@ public func download(
 /// - returns: The created `DownloadRequest`.
 @discardableResult
 public func download(
-    resourceWithin resumeData: Data,
+    resumingWith resumeData: Data,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
     -> DownloadRequest
 {
-    return SessionManager.default.download(resourceWithin: resumeData, to: destination)
+    return SessionManager.default.download(resumingWith: resumeData, to: destination)
 }
 
 // MARK: - Upload Request

Source/SessionManager.swift

@@ -234,7 +234,7 @@ open class SessionManager {
         do {
             let urlRequest = try URLRequest(urlString: urlString, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
-            return request(resource: encodedURLRequest)
+            return request(encodedURLRequest)
         } catch {
             return request(failedWith: error)
         }
@@ -247,7 +247,7 @@ open class SessionManager {
     /// - parameter urlRequest: The URL request.
     ///
     /// - returns: The created `DataRequest`.
-    open func request(resource urlRequest: URLRequestConvertible) -> DataRequest {
+    open func request(_ urlRequest: URLRequestConvertible) -> DataRequest {
         do {
             let originalRequest = try urlRequest.asURLRequest()
             let originalTask = DataRequest.Requestable(urlRequest: originalRequest)
@@ -306,7 +306,7 @@ open class SessionManager {
         do {
             let urlRequest = try URLRequest(urlString: urlString, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
-            return download(resource: encodedURLRequest, to: destination)
+            return download(encodedURLRequest, to: destination)
         } catch {
             return download(failedWith: error)
         }
@@ -326,7 +326,7 @@ open class SessionManager {
     /// - returns: The created `DownloadRequest`.
     @discardableResult
     open func download(
-        resource urlRequest: URLRequestConvertible,
+        _ urlRequest: URLRequestConvertible,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
         -> DownloadRequest
     {
@@ -356,7 +356,7 @@ open class SessionManager {
     /// - returns: The created `DownloadRequest`.
     @discardableResult
     open func download(
-        resourceWithin resumeData: Data,
+        resumingWith resumeData: Data,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
         -> DownloadRequest
     {

Tests/CacheTests.swift

@@ -187,7 +187,7 @@ class CacheTestCase: BaseTestCase {
         -> URLRequest
     {
         let urlRequest = self.urlRequest(cacheControl: cacheControl, cachePolicy: cachePolicy)
-        let request = manager.request(resource: urlRequest)
+        let request = manager.request(urlRequest)
 
         request.response(
             queue: queue,

Tests/SessionManagerTests.swift

@@ -243,7 +243,7 @@ class SessionManagerTestCase: BaseTestCase {
         var response: HTTPURLResponse?
 
         // When
-        manager.request(resource: urlRequest)
+        manager.request(urlRequest)
             .response { resp in
                 response = resp.response
                 expectation.fulfill()
@@ -268,7 +268,7 @@ class SessionManagerTestCase: BaseTestCase {
         let urlRequest = URLRequest(url: url)
 
         // When
-        let request = manager?.request(resource: urlRequest)
+        let request = manager?.request(urlRequest)
         manager = nil
 
         // Then
@@ -285,7 +285,7 @@ class SessionManagerTestCase: BaseTestCase {
         let urlRequest = URLRequest(url: url)
 
         // When
-        let request = manager!.request(resource: urlRequest)
+        let request = manager!.request(urlRequest)
         request.cancel()
         manager = nil
 

Tests/URLProtocolTests.swift

@@ -148,7 +148,7 @@ class URLProtocolTestCase: BaseTestCase {
         var response: DefaultDataResponse?
 
         // When
-        manager.request(resource: urlRequest)
+        manager.request(urlRequest)
             .response { resp in
                 response = resp
                 expectation.fulfill()

Tests/ValidationTests.swift

@@ -336,7 +336,7 @@ class ContentTypeValidationTestCase: BaseTestCase {
     func testThatValidationForRequestWithAcceptableWildcardContentTypeResponseSucceedsWhenResponseIsNil() {
         // Given
         class MockManager: SessionManager {
-            override func request(resource urlRequest: URLRequestConvertible) -> DataRequest {
+            override func request(_ urlRequest: URLRequestConvertible) -> DataRequest {
                 do {
                     let originalRequest = try urlRequest.asURLRequest()
                     let originalTask = DataRequest.Requestable(urlRequest: originalRequest)
@@ -357,7 +357,7 @@ class ContentTypeValidationTestCase: BaseTestCase {
             }
 
             override func download(
-                resource urlRequest: URLRequestConvertible,
+                _ urlRequest: URLRequestConvertible,
                 to destination: DownloadRequest.DownloadFileDestination? = nil)
                 -> DownloadRequest
             {
@@ -604,19 +604,15 @@ class AutomaticValidationTestCase: BaseTestCase {
         var downloadError: Error?
 
         // When
-        Alamofire.request(resource: urlRequest)
-            .validate()
-            .response { resp in
-                requestError = resp.error
-                expectation1.fulfill()
-            }
+        Alamofire.request(urlRequest).validate().response { resp in
+            requestError = resp.error
+            expectation1.fulfill()
+        }
 
-        Alamofire.download(resource: urlRequest)
-            .validate()
-            .response { resp in
-                downloadError = resp.error
-                expectation2.fulfill()
-            }
+        Alamofire.download(urlRequest).validate().response { resp in
+            downloadError = resp.error
+            expectation2.fulfill()
+        }
 
         waitForExpectations(timeout: timeout, handler: nil)
 
@@ -679,19 +675,15 @@ class AutomaticValidationTestCase: BaseTestCase {
         var downloadError: Error?
 
         // When
-        Alamofire.request(resource: urlRequest)
-            .validate()
-            .response { resp in
-                requestError = resp.error
-                expectation1.fulfill()
-            }
+        Alamofire.request(urlRequest).validate().response { resp in
+            requestError = resp.error
+            expectation1.fulfill()
+        }
 
-        Alamofire.download(resource: urlRequest)
-            .validate()
-            .response { resp in
-                downloadError = resp.error
-                expectation2.fulfill()
-            }
+        Alamofire.download(urlRequest).validate().response { resp in
+            downloadError = resp.error
+            expectation2.fulfill()
+        }
 
         waitForExpectations(timeout: timeout, handler: nil)
 
@@ -715,19 +707,15 @@ class AutomaticValidationTestCase: BaseTestCase {
         var downloadError: Error?
 
         // When
-        Alamofire.request(resource: urlRequest)
-            .validate()
-            .response { resp in
-                requestError = resp.error
-                expectation1.fulfill()
-            }
+        Alamofire.request(urlRequest).validate().response { resp in
+            requestError = resp.error
+            expectation1.fulfill()
+        }
 
-        Alamofire.download(resource: urlRequest)
-            .validate()
-            .response { resp in
-                downloadError = resp.error
-                expectation2.fulfill()
-            }
+        Alamofire.download(urlRequest).validate().response { resp in
+            downloadError = resp.error
+            expectation2.fulfill()
+        }
 
         waitForExpectations(timeout: timeout, handler: nil)
 
@@ -749,19 +737,15 @@ class AutomaticValidationTestCase: BaseTestCase {
         var downloadError: Error?
 
         // When
-        Alamofire.request(resource: urlRequest)
-            .validate()
-            .response { resp in
-                requestError = resp.error
-                expectation1.fulfill()
-            }
+        Alamofire.request(urlRequest).validate().response { resp in
+            requestError = resp.error
+            expectation1.fulfill()
+        }
 
-        Alamofire.download(resource: urlRequest)
-            .validate()
-            .response { resp in
-                downloadError = resp.error
-                expectation2.fulfill()
-            }
+        Alamofire.download(urlRequest).validate().response { resp in
+            downloadError = resp.error
+            expectation2.fulfill()
+        }
 
         waitForExpectations(timeout: timeout, handler: nil)