Removes unnecessary E: Encodable generic type

s4cha · s4cha · commit 55ab4bd2962b · 2023-11-13T17:01:34.000-10:00
diff --git a/Sources/Networking/Calls/NetworkingClient+Data.swift b/Sources/Networking/Calls/NetworkingClient+Data.swift
@@ -18,7 +18,7 @@ public extension NetworkingClient {
         request(.post, route, params: params).publisher()
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
         request(.post, route, encodableBody: body).publisher()
     }
 
@@ -30,7 +30,7 @@ public extension NetworkingClient {
         request(.patch, route, params: params).publisher()
     }
     
-    func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {
+    func patch(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
         request(.patch, route, encodableBody: body).publisher()
     }
 
@@ -49,7 +49,7 @@ public extension NetworkingClient {
         try await request(.post, route, params: params).execute()
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws -> Data {
+    func post(_ route: String, body: Encodable) async throws -> Data {
         try await request(.post, route, encodableBody: body).execute()
     }
     
diff --git a/Sources/Networking/Calls/NetworkingClient+Decodable.swift b/Sources/Networking/Calls/NetworkingClient+Decodable.swift
@@ -39,8 +39,8 @@ public extension NetworkingClient {
             .eraseToAnyPublisher()
     }
     
-    func post<E: Encodable, T: Decodable>(_ route: String,
-                                          body: E,
+    func post<T: Decodable>(_ route: String,
+                                          body: Encodable,
                                           keypath: String? = nil
     ) -> AnyPublisher<T, Error> {
         return post(route, body: body)
@@ -90,8 +90,8 @@ public extension NetworkingClient {
     }
     
 
-    func patch<E: Encodable, T: Decodable>(_ route: String,
-                                          body: E,
+    func patch<T: Decodable>(_ route: String,
+                                          body: Encodable,
                                           keypath: String? = nil
     ) -> AnyPublisher<T, Error> {
         return patch(route, body: body)
@@ -158,8 +158,8 @@ public extension NetworkingClient {
         return try self.toModel(json, keypath: keypath)
     }
     
-    func post<E: Encodable, T: Decodable>(_ route: String,
-                                          body: E,
+    func post<T: Decodable>(_ route: String,
+                                          body: Encodable,
                                           keypath: String? = nil
     ) async throws -> T {
         let json: Any = try await post(route, body: body)
@@ -204,8 +204,8 @@ public extension NetworkingClient {
         return try self.toModel(json, keypath: keypath)
     }
     
-    func patch<E: Encodable, T: Decodable>(_ route: String,
-                                          body: E,
+    func patch<T: Decodable>(_ route: String,
+                                          body: Encodable,
                                           keypath: String? = nil
     ) async throws -> T {
         let json: Any = try await patch(route, body: body)
diff --git a/Sources/Networking/Calls/NetworkingClient+JSON.swift b/Sources/Networking/Calls/NetworkingClient+JSON.swift
@@ -18,7 +18,7 @@ public extension NetworkingClient {
         post(route, params: params).toJSON()
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Any, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Any, Error> {
         post(route, body: body).toJSON()
     }
 
@@ -30,7 +30,7 @@ public extension NetworkingClient {
         patch(route, params: params).toJSON()
     }
     
-    func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Any, Error> {
+    func patch(_ route: String, body: Encodable) -> AnyPublisher<Any, Error> {
         patch(route, body: body).toJSON()
     }
 
@@ -53,7 +53,7 @@ public extension NetworkingClient {
         return try JSONSerialization.jsonObject(with: data, options: [])
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws -> Any {
+    func post(_ route: String, body: Encodable) async throws -> Any {
         let req = request(.post, route, encodableBody: body)
         let data = try await req.execute()
         return try JSONSerialization.jsonObject(with: data, options: [])
@@ -71,7 +71,7 @@ public extension NetworkingClient {
         return try JSONSerialization.jsonObject(with: data, options: [])
     }
     
-    func patch<E: Encodable>(_ route: String, body: E) async throws -> Any {
+    func patch(_ route: String, body: Encodable) async throws -> Any {
         let req = request(.patch, route, encodableBody: body)
         let data = try await req.execute()
         return try JSONSerialization.jsonObject(with: data, options: [])
diff --git a/Sources/Networking/Calls/NetworkingClient+Requests.swift b/Sources/Networking/Calls/NetworkingClient+Requests.swift
@@ -59,10 +59,10 @@ public extension NetworkingClient {
         return req
     }
     
-    internal func request<E: Encodable>(_ httpMethod: HTTPMethod,
+    internal func request(_ httpMethod: HTTPMethod,
                           _ route: String,
                           params: Params = Params(),
-                          encodableBody: E? = nil
+                          encodableBody: Encodable? = nil
     ) -> NetworkingRequest {
         let req = NetworkingRequest()
         req.httpMethod             = httpMethod
diff --git a/Sources/Networking/Calls/NetworkingClient+Void.swift b/Sources/Networking/Calls/NetworkingClient+Void.swift
@@ -22,7 +22,7 @@ public extension NetworkingClient {
         .eraseToAnyPublisher()
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {
         post(route, body: body)
             .map { (data: Data) -> Void in () }
         .eraseToAnyPublisher()
@@ -40,7 +40,7 @@ public extension NetworkingClient {
             .eraseToAnyPublisher()
     }
     
-    func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {
+    func patch(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {
         patch(route, body: body)
             .map { (data: Data) -> Void in () }
         .eraseToAnyPublisher()
@@ -65,7 +65,7 @@ public extension NetworkingClient {
         _ = try await req.execute()
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws {
+    func post(_ route: String, body: Encodable) async throws {
         let req = request(.post, route, encodableBody: body)
         _ = try await req.execute()
     }
diff --git a/Sources/Networking/NetworkingService.swift b/Sources/Networking/NetworkingService.swift
@@ -26,7 +26,7 @@ public extension NetworkingService {
         network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
         network.post(route, body: body)
     }
     
@@ -38,7 +38,7 @@ public extension NetworkingService {
         network.patch(route, params: params)
     }
     
-    func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {
+    func patch(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
         network.patch(route, body: body)
     }
     
@@ -56,7 +56,7 @@ public extension NetworkingService {
         network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {
         network.post(route, body: body)
     }
     
@@ -82,7 +82,7 @@ public extension NetworkingService {
         network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Any, Error> {
+    func post(_ route: String, body: Encodable) -> AnyPublisher<Any, Error> {
         network.post(route, body: body)
     }
     
@@ -242,7 +242,7 @@ public extension NetworkingService {
         try await network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws -> Data {
+    func post(_ route: String, body: Encodable) async throws -> Data {
         try await network.post(route, body: body)
     }
 
@@ -268,7 +268,7 @@ public extension NetworkingService {
         return try await network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws {
+    func post(_ route: String, body: Encodable) async throws {
         return try await network.post(route, body: body)
     }
 
@@ -294,7 +294,7 @@ public extension NetworkingService {
         try await network.post(route, params: params)
     }
     
-    func post<E: Encodable>(_ route: String, body: E) async throws -> Any {
+    func post(_ route: String, body: Encodable) async throws -> Any {
         try await network.post(route, body: body)
     }
 
@@ -324,7 +324,7 @@ public extension NetworkingService {
         try await network.post(route, params: params, keypath: keypath)
     }
     
-    func post<E: Encodable, T: Decodable>(_ route: String, body: E) async throws -> T {
+    func post<T: Decodable>(_ route: String, body: Encodable) async throws -> T {
         try await network.post(route, body: body)
     }
     
@@ -340,7 +340,7 @@ public extension NetworkingService {
         try await network.patch(route, params: params, keypath: keypath)
     }
     
-    func patch<E: Encodable, T: Decodable>(_ route: String, body: E) async throws -> T {
+    func patch<T: Decodable>(_ route: String, body: Encodable) async throws -> T {
         try await network.patch(route, body: body)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public extension NetworkingClient {`
`18`	`18`	`request(.post, route, params: params).publisher()`
`19`	`19`	`}`
`20`	`20`
`21`		`- func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {`
	`21`	`+ func post(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {`
`22`	`22`	`request(.post, route, encodableBody: body).publisher()`
`23`	`23`	`}`
`24`	`24`
`@@ -30,7 +30,7 @@ public extension NetworkingClient {`
`30`	`30`	`request(.patch, route, params: params).publisher()`
`31`	`31`	`}`
`32`	`32`
`33`		`- func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {`
	`33`	`+ func patch(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {`
`34`	`34`	`request(.patch, route, encodableBody: body).publisher()`
`35`	`35`	`}`
`36`	`36`
`@@ -49,7 +49,7 @@ public extension NetworkingClient {`
`49`	`49`	`try await request(.post, route, params: params).execute()`
`50`	`50`	`}`
`51`	`51`
`52`		`- func post<E: Encodable>(_ route: String, body: E) async throws -> Data {`
	`52`	`+ func post(_ route: String, body: Encodable) async throws -> Data {`
`53`	`53`	`try await request(.post, route, encodableBody: body).execute()`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public extension NetworkingClient {`
`22`	`22`	`.eraseToAnyPublisher()`
`23`	`23`	`}`
`24`	`24`
`25`		`- func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {`
	`25`	`+ func post(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {`
`26`	`26`	`post(route, body: body)`
`27`	`27`	`.map { (data: Data) -> Void in () }`
`28`	`28`	`.eraseToAnyPublisher()`
`@@ -40,7 +40,7 @@ public extension NetworkingClient {`
`40`	`40`	`.eraseToAnyPublisher()`
`41`	`41`	`}`
`42`	`42`
`43`		`- func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {`
	`43`	`+ func patch(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {`
`44`	`44`	`patch(route, body: body)`
`45`	`45`	`.map { (data: Data) -> Void in () }`
`46`	`46`	`.eraseToAnyPublisher()`
`@@ -65,7 +65,7 @@ public extension NetworkingClient {`
`65`	`65`	`_ = try await req.execute()`
`66`	`66`	`}`
`67`	`67`
`68`		`- func post<E: Encodable>(_ route: String, body: E) async throws {`
	`68`	`+ func post(_ route: String, body: Encodable) async throws {`
`69`	`69`	`let req = request(.post, route, encodableBody: body)`
`70`	`70`	`_ = try await req.execute()`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public extension NetworkingService {`
`26`	`26`	`network.post(route, params: params)`
`27`	`27`	`}`
`28`	`28`
`29`		`- func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {`
	`29`	`+ func post(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {`
`30`	`30`	`network.post(route, body: body)`
`31`	`31`	`}`
`32`	`32`
`@@ -38,7 +38,7 @@ public extension NetworkingService {`
`38`	`38`	`network.patch(route, params: params)`
`39`	`39`	`}`
`40`	`40`
`41`		`- func patch<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Data, Error> {`
	`41`	`+ func patch(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {`
`42`	`42`	`network.patch(route, body: body)`
`43`	`43`	`}`
`44`	`44`
`@@ -56,7 +56,7 @@ public extension NetworkingService {`
`56`	`56`	`network.post(route, params: params)`
`57`	`57`	`}`
`58`	`58`
`59`		`- func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Void, Error> {`
	`59`	`+ func post(_ route: String, body: Encodable) -> AnyPublisher<Void, Error> {`
`60`	`60`	`network.post(route, body: body)`
`61`	`61`	`}`
`62`	`62`
`@@ -82,7 +82,7 @@ public extension NetworkingService {`
`82`	`82`	`network.post(route, params: params)`
`83`	`83`	`}`
`84`	`84`
`85`		`- func post<E: Encodable>(_ route: String, body: E) -> AnyPublisher<Any, Error> {`
	`85`	`+ func post(_ route: String, body: Encodable) -> AnyPublisher<Any, Error> {`
`86`	`86`	`network.post(route, body: body)`
`87`	`87`	`}`
`88`	`88`
`@@ -242,7 +242,7 @@ public extension NetworkingService {`
`242`	`242`	`try await network.post(route, params: params)`
`243`	`243`	`}`
`244`	`244`
`245`		`- func post<E: Encodable>(_ route: String, body: E) async throws -> Data {`
	`245`	`+ func post(_ route: String, body: Encodable) async throws -> Data {`
`246`	`246`	`try await network.post(route, body: body)`
`247`	`247`	`}`
`248`	`248`
`@@ -268,7 +268,7 @@ public extension NetworkingService {`
`268`	`268`	`return try await network.post(route, params: params)`
`269`	`269`	`}`
`270`	`270`
`271`		`- func post<E: Encodable>(_ route: String, body: E) async throws {`
	`271`	`+ func post(_ route: String, body: Encodable) async throws {`
`272`	`272`	`return try await network.post(route, body: body)`
`273`	`273`	`}`
`274`	`274`
`@@ -294,7 +294,7 @@ public extension NetworkingService {`
`294`	`294`	`try await network.post(route, params: params)`
`295`	`295`	`}`
`296`	`296`
`297`		`- func post<E: Encodable>(_ route: String, body: E) async throws -> Any {`
	`297`	`+ func post(_ route: String, body: Encodable) async throws -> Any {`
`298`	`298`	`try await network.post(route, body: body)`
`299`	`299`	`}`
`300`	`300`
`@@ -324,7 +324,7 @@ public extension NetworkingService {`
`324`	`324`	`try await network.post(route, params: params, keypath: keypath)`
`325`	`325`	`}`
`326`	`326`
`327`		`- func post<E: Encodable, T: Decodable>(_ route: String, body: E) async throws -> T {`
	`327`	`+ func post<T: Decodable>(_ route: String, body: Encodable) async throws -> T {`
`328`	`328`	`try await network.post(route, body: body)`
`329`	`329`	`}`
`330`	`330`
`@@ -340,7 +340,7 @@ public extension NetworkingService {`
`340`	`340`	`try await network.patch(route, params: params, keypath: keypath)`
`341`	`341`	`}`
`342`	`342`
`343`		`- func patch<E: Encodable, T: Decodable>(_ route: String, body: E) async throws -> T {`
	`343`	`+ func patch<T: Decodable>(_ route: String, body: Encodable) async throws -> T {`
`344`	`344`	`try await network.patch(route, body: body)`
`345`	`345`	`}`
`346`	`346`