@@ -28,32 +28,32 @@ public class Endpoint<R>: ResponseRequestable {
28
28
public let path : String
29
29
public let isFullPath : Bool
30
30
public let method : HTTPMethodType
31
- public let headerParamaters : [ String : String ]
31
+ public let headerParameters : [ String : String ]
32
32
public let queryParametersEncodable : Encodable ?
33
33
public let queryParameters : [ String : Any ]
34
- public let bodyParamatersEncodable : Encodable ?
35
- public let bodyParamaters : [ String : Any ]
34
+ public let bodyParametersEncodable : Encodable ?
35
+ public let bodyParameters : [ String : Any ]
36
36
public let bodyEncoding : BodyEncoding
37
37
public let responseDecoder : ResponseDecoder
38
38
39
39
init ( path: String ,
40
40
isFullPath: Bool = false ,
41
41
method: HTTPMethodType ,
42
- headerParamaters : [ String : String ] = [ : ] ,
42
+ headerParameters : [ String : String ] = [ : ] ,
43
43
queryParametersEncodable: Encodable ? = nil ,
44
44
queryParameters: [ String : Any ] = [ : ] ,
45
- bodyParamatersEncodable : Encodable ? = nil ,
46
- bodyParamaters : [ String : Any ] = [ : ] ,
45
+ bodyParametersEncodable : Encodable ? = nil ,
46
+ bodyParameters : [ String : Any ] = [ : ] ,
47
47
bodyEncoding: BodyEncoding = . jsonSerializationData,
48
48
responseDecoder: ResponseDecoder = JSONResponseDecoder ( ) ) {
49
49
self . path = path
50
50
self . isFullPath = isFullPath
51
51
self . method = method
52
- self . headerParamaters = headerParamaters
52
+ self . headerParameters = headerParameters
53
53
self . queryParametersEncodable = queryParametersEncodable
54
54
self . queryParameters = queryParameters
55
- self . bodyParamatersEncodable = bodyParamatersEncodable
56
- self . bodyParamaters = bodyParamaters
55
+ self . bodyParametersEncodable = bodyParametersEncodable
56
+ self . bodyParameters = bodyParameters
57
57
self . bodyEncoding = bodyEncoding
58
58
self . responseDecoder = responseDecoder
59
59
}
@@ -63,11 +63,11 @@ public protocol Requestable {
63
63
var path : String { get }
64
64
var isFullPath : Bool { get }
65
65
var method : HTTPMethodType { get }
66
- var headerParamaters : [ String : String ] { get }
66
+ var headerParameters : [ String : String ] { get }
67
67
var queryParametersEncodable : Encodable ? { get }
68
68
var queryParameters : [ String : Any ] { get }
69
- var bodyParamatersEncodable : Encodable ? { get }
70
- var bodyParamaters : [ String : Any ] { get }
69
+ var bodyParametersEncodable : Encodable ? { get }
70
+ var bodyParameters : [ String : Any ] { get }
71
71
var bodyEncoding : BodyEncoding { get }
72
72
73
73
func urlRequest( with networkConfig: NetworkConfigurable ) throws -> URLRequest
@@ -110,23 +110,23 @@ extension Requestable {
110
110
let url = try self . url ( with: config)
111
111
var urlRequest = URLRequest ( url: url)
112
112
var allHeaders : [ String : String ] = config. headers
113
- headerParamaters . forEach { allHeaders. updateValue ( $1, forKey: $0) }
113
+ headerParameters . forEach { allHeaders. updateValue ( $1, forKey: $0) }
114
114
115
- let bodyParamaters = try bodyParamatersEncodable ? . toDictionary ( ) ?? self . bodyParamaters
116
- if !bodyParamaters . isEmpty {
117
- urlRequest. httpBody = encodeBody ( bodyParamaters : bodyParamaters , bodyEncoding: bodyEncoding)
115
+ let bodyParameters = try bodyParametersEncodable ? . toDictionary ( ) ?? self . bodyParameters
116
+ if !bodyParameters . isEmpty {
117
+ urlRequest. httpBody = encodeBody ( bodyParameters : bodyParameters , bodyEncoding: bodyEncoding)
118
118
}
119
119
urlRequest. httpMethod = method. rawValue
120
120
urlRequest. allHTTPHeaderFields = allHeaders
121
121
return urlRequest
122
122
}
123
123
124
- private func encodeBody( bodyParamaters : [ String : Any ] , bodyEncoding: BodyEncoding ) -> Data ? {
124
+ private func encodeBody( bodyParameters : [ String : Any ] , bodyEncoding: BodyEncoding ) -> Data ? {
125
125
switch bodyEncoding {
126
126
case . jsonSerializationData:
127
- return try ? JSONSerialization . data ( withJSONObject: bodyParamaters )
127
+ return try ? JSONSerialization . data ( withJSONObject: bodyParameters )
128
128
case . stringEncodingAscii:
129
- return bodyParamaters . queryString. data ( using: String . Encoding. ascii, allowLossyConversion: true )
129
+ return bodyParameters . queryString. data ( using: String . Encoding. ascii, allowLossyConversion: true )
130
130
}
131
131
}
132
132
}
0 commit comments