reverted: HTTPURLResponse does not need to be part of Resource

Author: hoereth

Tests/DecodableResoureTest.swift

@@ -33,7 +33,7 @@ class DecodableResoureTest: XCTestCase {
 
     func testResource_withValidData() {
         //When
-        let fetchedTrain = try? resource.parse(HTTPURLResponse.defaultMock, Train.validJSONData)
+        let fetchedTrain = try? resource.parse(Train.validJSONData)
 
         //Then
         XCTAssertEqual(fetchedTrain?.name, "ICE")
@@ -42,7 +42,7 @@ class DecodableResoureTest: XCTestCase {
     func testResource_withMAppedResult() {
         //When
         let nameResource = resource.map { $0.name }
-        let fetchedTrainName = try? nameResource.parse(HTTPURLResponse.defaultMock, Train.validJSONData)
+        let fetchedTrainName = try? nameResource.parse(Train.validJSONData)
 
         //Then
         XCTAssertEqual(fetchedTrainName, "ICE")
@@ -51,7 +51,7 @@ class DecodableResoureTest: XCTestCase {
     func testResource_WithInvalidData() throws {
         //When
         do {
-            _ = try resource.parse(HTTPURLResponse.defaultMock, Train.invalidJSONData)
+            _ = try resource.parse(Train.invalidJSONData)
             XCTFail("Expected method to throws")
         } catch { }
     }

Tests/ModifyRequestNetworkService.swift

@@ -35,7 +35,7 @@ class ModifyRequestNetworkServiceTest: XCTestCase {
         ]
         let networkService = ModifyRequestNetworkService(networkService: networkServiceMock, requestModifications: modification)
         let request = URLRequest(path: "/trains", baseURL: .defaultMock)
-        let resource = Resource<Int, NetworkError>(request: request, parse: { _, _ in return 1 })
+        let resource = Resource<Int, NetworkError>(request: request, parse: { _ in return 1 })
 
         //When
         await networkService.requestResult(for: resource)

Tests/ResourceInspectTest.swift

@@ -30,16 +30,16 @@ final class ResourceInspectTest: XCTestCase {
         let capturedParsingData = Container<Data?>(nil)
         let capturedInspectedData = Container<Data?>(nil)
 
-        let resource = Resource<Int, NetworkError>(request: URLRequest.defaultMock, parse: { response, data in
+        let resource = Resource<Int, NetworkError>(request: URLRequest.defaultMock, parse: { data in
             capturedParsingData.setValue(data)
             return 1
         })
 
         //When
-        let inspectedResource = resource.inspectData({ response, data in
+        let inspectedResource = resource.inspectData({ data in
             capturedInspectedData.setValue(data)
         })
-        let result = try? inspectedResource.parse(HTTPURLResponse.defaultMock, data)
+        let result = try? inspectedResource.parse(data)
 
         //Then
         XCTAssertNotNil(result)

Tests/ResourceTest.swift

@@ -31,10 +31,10 @@ class ResourceTest: XCTestCase {
         //Given
         let validData: Data! = "ICE".data(using: .utf8)
 
-        let resource = Resource<String?, NetworkError>(request: URLRequest.defaultMock, parse: { String(data: $1, encoding: .utf8) })
+        let resource = Resource<String?, NetworkError>(request: URLRequest.defaultMock, parse: { String(data: $0, encoding: .utf8) })
 
         //When
-        let name = try resource.parse(HTTPURLResponse.defaultMock, validData)
+        let name = try resource.parse(validData)
 
         //Then
         XCTAssertEqual(name, "ICE")
@@ -45,7 +45,7 @@ class ResourceTest: XCTestCase {
         let resource = Resource<Void, NetworkError>(request: URLRequest.defaultMock)
 
         //When
-        try resource.parse(HTTPURLResponse.defaultMock, Data())
+        try resource.parse(Data())
     }
 
 }

Tests/ResourceWithErrorTest.swift

@@ -33,12 +33,12 @@ class ResourceWithErrorTest: XCTestCase {
 
         let resource = Resource<String?, NetworkError>(
             request: URLRequest.defaultMock,
-            parse: { String(data: $1, encoding: .utf8) },
+            parse: { String(data: $0, encoding: .utf8) },
             mapError: { $0 }
         )
 
         //When
-        let name = try resource.parse(HTTPURLResponse.defaultMock, validData)
+        let name = try resource.parse(validData)
 
         //Then
         XCTAssertEqual(name, "ICE")
@@ -50,12 +50,12 @@ class ResourceWithErrorTest: XCTestCase {
 
         let resource = Resource<String?, NetworkError>(
             request: URLRequest.defaultMock,
-            parse: { String(data: $1, encoding: .utf8) },
+            parse: { String(data: $0, encoding: .utf8) },
             mapError: { $0 }
         )
 
         //When
-        let numberOfCharacters = try resource.map(transform: { $0?.count }).parse(HTTPURLResponse.defaultMock, validData)
+        let numberOfCharacters = try resource.map(transform: { $0?.count }).parse(validData)
 
         //Then
         XCTAssertEqual(numberOfCharacters, 3)
@@ -86,7 +86,7 @@ class ResourceWithErrorTest: XCTestCase {
         )
 
         //When
-        try resource.parse(HTTPURLResponse.defaultMock, Data())
+        try resource.parse(Data())
     }
 
 }

Tests/RetryNetworkserviceTest.swift

@@ -27,7 +27,7 @@ import XCTest
 class RetryNetworkserviceTest: XCTestCase {
     var resource: Resource<Int, NetworkError> {
         let request = URLRequest(path: "/train", baseURL: .defaultMock)
-        return Resource(request: request, parse: { _, _ in return 1})
+        return Resource(request: request, parse: { _ in return 1})
     }
 
     func testRetryRequest_shouldRetry() async throws {