FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Removes unnecessary HTTPBody .jsonParams · freshOS/Networking@47e39cd · GitHub

  1. freshOS
  2. Networking

Repository navigation

Commit 47e39cd

Browse files
s4cha
committed
Removes unnecessary HTTPBody .jsonParams
1 parent 6b7cb72 commit 47e39cd

7 files changed

Lines changed: 62 additions & 60 deletions

File tree

‎Sources/Networking/Async Api/Get.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,59 @@ import Foundation
99

1010
public extension NetworkingClient {
1111

12-
func get(_ route: String, urlParams: Params? = nil) async throws {
13-
let _:Data = try await get(route, urlParams: urlParams)
12+
func get(_ route: String, params: Params? = nil) async throws {
13+
let _:Data = try await get(route, params: params)
1414
}
1515

1616
func get<T: Decodable>(_ route: String,
17-
urlParams: Params? = nil,
17+
params: Params? = nil,
1818
keypath: String? = nil) async throws -> T {
19-
let json: Any = try await get(route, urlParams: urlParams)
19+
let json: Any = try await get(route, params: params)
2020
return try self.toModel(json, keypath: keypath)
2121
}
2222

2323
func get<T: Decodable>(_ route: String,
24-
urlParams: Params? = nil,
24+
params: Params? = nil,
2525
keypath: String? = nil) async throws -> T where T: Collection {
2626
let keypath = keypath ?? defaultCollectionParsingKeyPath
27-
let json: Any = try await get(route, urlParams: urlParams)
27+
let json: Any = try await get(route, params: params)
2828
return try self.toModel(json, keypath: keypath)
2929
}
3030

31-
func get(_ route: String, urlParams: Params? = nil) async throws -> Any {
32-
let data: Data = try await get(route, urlParams: urlParams)
31+
func get(_ route: String, params: Params? = nil) async throws -> Any {
32+
let data: Data = try await get(route, params: params)
3333
return try JSONSerialization.jsonObject(with: data, options: [])
3434
}
3535

36-
func get(_ route: String, urlParams: Params? = nil) async throws -> Data {
37-
try await request(.get, route, urlParams: urlParams).execute()
36+
func get(_ route: String, params: Params? = nil) async throws -> Data {
37+
try await request(.get, route, queryParams: params).execute()
3838
}
3939
}
4040

4141
public extension NetworkingService {
4242

43-
func get(_ route: String, urlParams: Params? = nil) async throws {
44-
return try await network.get(route, urlParams: urlParams)
43+
func get(_ route: String, params: Params? = nil) async throws {
44+
return try await network.get(route, params: params)
4545
}
4646

4747
func get<T: Decodable>(_ route: String,
48-
urlParams: Params? = nil,
48+
params: Params? = nil,
4949
keypath: String? = nil) async throws -> T {
50-
try await network.get(route, urlParams: urlParams, keypath: keypath)
50+
try await network.get(route, params: params, keypath: keypath)
5151
}
5252

5353
func get<T: Decodable>(_ route: String,
54-
urlParams: Params? = nil,
54+
params: Params? = nil,
5555
keypath: String? = nil) async throws -> T where T: Collection {
56-
try await network.get(route, urlParams: urlParams, keypath: keypath)
56+
try await network.get(route, params: params, keypath: keypath)
5757
}
5858

5959

60-
func get(_ route: String, urlParams: Params? = nil) async throws -> Any {
61-
try await network.get(route, urlParams: urlParams)
60+
func get(_ route: String, params: Params? = nil) async throws -> Any {
61+
try await network.get(route, params: params)
6262
}
6363

64-
func get(_ route: String, urlParams: Params? = nil) async throws -> Data {
65-
try await network.get(route, urlParams: urlParams)
64+
func get(_ route: String, params: Params? = nil) async throws -> Data {
65+
try await network.get(route, params: params)
6666
}
6767
}

‎Sources/Networking/Combine Api/Get+Combine.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,78 +10,78 @@ import Combine
1010

1111
public extension NetworkingClient {
1212

13-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Void, Error> {
14-
get(route, urlParams: urlParams)
13+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Void, Error> {
14+
get(route, params: params)
1515
.map { (data: Data) -> Void in () }
1616
.eraseToAnyPublisher()
1717
}
1818

1919
func get<T: Decodable>(_ route: String,
20-
urlParams: Params? = nil,
20+
params: Params? = nil,
2121
keypath: String? = nil) -> AnyPublisher<T, Error> {
22-
return get(route, urlParams: urlParams)
22+
return get(route, params: params)
2323
.tryMap { json -> T in try self.toModel(json, keypath: keypath) }
2424
.receive(on: DispatchQueue.main)
2525
.eraseToAnyPublisher()
2626
}
2727

2828
// Array version
2929
func get<T: Decodable>(_ route: String,
30-
urlParams: Params? = nil,
30+
params: Params? = nil,
3131
keypath: String? = nil) -> AnyPublisher<T, Error> where T: Collection {
3232
let keypath = keypath ?? defaultCollectionParsingKeyPath
33-
return get(route, urlParams: urlParams)
33+
return get(route, params: params)
3434
.tryMap { json -> T in try self.toModel(json, keypath: keypath) }
3535
.receive(on: DispatchQueue.main)
3636
.eraseToAnyPublisher()
3737
}
3838

39-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Any, Error> {
40-
get(route, urlParams: urlParams).toJSON()
39+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Any, Error> {
40+
get(route, params: params).toJSON()
4141
}
4242

43-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Data, Error> {
44-
request(.get, route, urlParams: urlParams).publisher()
43+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Data, Error> {
44+
request(.get, route, queryParams: params).publisher()
4545
}
4646
}
4747

4848
public extension NetworkingService {
4949

50-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Void, Error> {
51-
network.get(route, urlParams: urlParams)
50+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Void, Error> {
51+
network.get(route, params: params)
5252
}
5353

5454
func get<T: Decodable>(_ route: String,
55-
urlParams: Params? = nil,
55+
params: Params? = nil,
5656
keypath: String? = nil) -> AnyPublisher<T, Error> {
57-
network.get(route, urlParams: urlParams, keypath: keypath)
57+
network.get(route, params: params, keypath: keypath)
5858
}
5959

6060
func get<T: Decodable>(_ route: String,
61-
urlParams: Params? = nil,
61+
params: Params? = nil,
6262
keypath: String? = nil) -> AnyPublisher<T, Error> where T: Collection {
63-
network.get(route, urlParams: urlParams, keypath: keypath)
63+
network.get(route, params: params, keypath: keypath)
6464
}
6565

6666
func get<T: NetworkingJSONDecodable>(_ route: String,
67-
urlParams: Params? = nil,
67+
params: Params? = nil,
6868
keypath: String? = nil) -> AnyPublisher<T, Error> {
69-
network.get(route, urlParams: urlParams, keypath: keypath)
69+
network.get(route, params: params, keypath: keypath)
7070
}
7171

7272
func get<T: NetworkingJSONDecodable>(_ route: String,
73-
urlParams: Params? = nil,
73+
params: Params? = nil,
7474
keypath: String? = nil) -> AnyPublisher<[T], Error> {
75-
network.get(route, urlParams: urlParams, keypath: keypath)
75+
network.get(route, params: params, keypath: keypath)
7676
}
7777

7878

79-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Any, Error> {
80-
network.get(route, urlParams: urlParams)
79+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Any, Error> {
80+
network.get(route, params: params)
8181
}
8282

83-
func get(_ route: String, urlParams: Params? = nil) -> AnyPublisher<Data, Error> {
84-
network.get(route, urlParams: urlParams)
83+
func get(_ route: String, params: Params? = nil) -> AnyPublisher<Data, Error> {
84+
network.get(route, params: params)
8585
}
8686

8787

‎Sources/Networking/HTTPBody.swift‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import Foundation
99

1010
public enum HTTPBody {
1111
case urlEncoded(params: Params)
12-
case json(Encodable)
13-
case jsonParams(params: Params)
14-
case multipart(params: Params?, parts:[MultipartData])
12+
case json(_ encodable: Encodable)
13+
case multipart(params: Params? = nil, parts:[MultipartData])
1514
}
1615

1716

@@ -22,8 +21,6 @@ extension HTTPBody {
2221
return "application/x-www-form-urlencoded"
2322
case .json(_):
2423
return "application/json"
25-
case .jsonParams(_):
26-
return "application/json"
2724
case .multipart(_, _):
2825
return "multipart/form-data; boundary=\(boundary)"
2926
}
@@ -45,8 +42,6 @@ extension HTTPBody {
4542
print(error)
4643
return nil
4744
}
48-
case .jsonParams(params: let params):
49-
return try? JSONSerialization.data(withJSONObject: params)
5045
case .multipart(params: let params, parts: let parts):
5146
return buildMultipartHttpBody(params: params ?? [:], multiparts: parts, boundary: boundary)
5247
}

‎Sources/Networking/NetworkingClient+NetworkingJSONDecodable.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ public protocol NetworkingJSONDecodable {
1717
public extension NetworkingClient {
1818

1919
func get<T: NetworkingJSONDecodable>(_ route: String,
20-
urlParams: Params? = nil,
20+
params: Params? = nil,
2121
keypath: String? = nil) -> AnyPublisher<T, Error> {
22-
return get(route, urlParams: urlParams)
22+
return get(route, params: params)
2323
.tryMap { json -> T in try self.toModel(json, keypath: keypath) }
2424
.receive(on: DispatchQueue.main)
2525
.eraseToAnyPublisher()
2626
}
2727

2828
// Array version
2929
func get<T: NetworkingJSONDecodable>(_ route: String,
30-
urlParams: Params? = nil,
30+
params: Params? = nil,
3131
keypath: String? = nil) -> AnyPublisher<[T], Error> {
3232
let keypath = keypath ?? defaultCollectionParsingKeyPath
33-
return get(route, urlParams: urlParams)
33+
return get(route, params: params)
3434
.tryMap { json -> [T] in try self.toModels(json, keypath: keypath) }
3535
.receive(on: DispatchQueue.main)
3636
.eraseToAnyPublisher()

‎Sources/Networking/NetworkingClient+Requests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Combine
1010

1111
public extension NetworkingClient {
1212

13-
func getRequest(_ route: String, urlParams: Params? = nil) -> NetworkingRequest {
14-
request(.get, route, urlParams: urlParams)
13+
func getRequest(_ route: String, queryParams: Params? = nil) -> NetworkingRequest {
14+
request(.get, route, queryParams: queryParams)
1515
}
1616

1717
func postRequest(_ route: String, body: HTTPBody? = nil) -> NetworkingRequest {
@@ -32,13 +32,13 @@ public extension NetworkingClient {
3232

3333
internal func request(_ httpMethod: HTTPMethod,
3434
_ route: String,
35-
urlParams: Params? = nil,
35+
queryParams: Params? = nil,
3636
body: HTTPBody? = nil
3737
) -> NetworkingRequest {
3838
let req = NetworkingRequest()
3939
req.httpMethod = httpMethod
4040
req.route = route
41-
req.queryParams = urlParams
41+
req.queryParams = queryParams
4242
req.httpBody = body
4343

4444
let updateRequest = { [weak req, weak self] in

‎Sources/Networking/NetworkingClient.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import Foundation
22
import Combine
33

4+
public enum ParameterEncoding {
5+
case urlEncode
6+
case json
7+
}
8+
49
public class NetworkingClient {
510
/**
611
Instead of using the same keypath for every call eg: "collection",
@@ -15,6 +20,9 @@ public class NetworkingClient {
1520
public var sessionConfiguration = URLSessionConfiguration.default
1621
public var requestRetrier: NetworkRequestRetrier?
1722
public var jsonDecoderFactory: (() -> JSONDecoder)?
23+
24+
@available(*, deprecated, message: "Parameter encoding is now done explicitly via `body` param for POST PUT & PATCH requests.")
25+
public var parameterEncoding: ParameterEncoding = .urlEncode
1826

1927
/**
2028
Prints network calls to the console.

‎Sources/Networking/NetworkingService.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//
77

88
import Foundation
9-
import Combine
109

1110
public protocol NetworkingService {
1211
var network: NetworkingClient { get }

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL