@@ -145,7 +145,7 @@ final class URLParametersTests: XCTestCase {
145145 }
146146
147147 func testOptionalsParametersEncodingWithValues( ) async throws {
148- let parameters = OptionalParametersRouter . Parameters (
148+ let parameters = OptionalParameters (
149149 int: 10 ,
150150 string: " testString " ,
151151 stringsArray: [ " 1 " , " 2 " ]
@@ -162,21 +162,21 @@ final class URLParametersTests: XCTestCase {
162162 let queryItems = percentEncodedQueryItems ( from: url)
163163
164164 XCTAssertEqual (
165- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. int. stringValue) ,
165+ queryItems. value ( for: OptionalParameters . CodingKeys. int. stringValue) ,
166166 " 10 "
167167 )
168168 XCTAssertEqual (
169- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. string. stringValue) ,
169+ queryItems. value ( for: OptionalParameters . CodingKeys. string. stringValue) ,
170170 " testString "
171171 )
172172 XCTAssertEqual (
173- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. stringsArray. stringValue) ,
173+ queryItems. value ( for: OptionalParameters . CodingKeys. stringsArray. stringValue) ,
174174 " 1,2 "
175175 )
176176 }
177177
178178 func testOptionalsParametersEncodingWithNils( ) async throws {
179- let parameters = OptionalParametersRouter . Parameters (
179+ let parameters = OptionalParameters (
180180 int: 10 ,
181181 string: nil ,
182182 stringsArray: nil
@@ -193,15 +193,15 @@ final class URLParametersTests: XCTestCase {
193193 let queryItems = percentEncodedQueryItems ( from: url)
194194
195195 XCTAssertEqual (
196- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. int. stringValue) ,
196+ queryItems. value ( for: OptionalParameters . CodingKeys. int. stringValue) ,
197197 " 10 "
198198 )
199199 XCTAssertEqual (
200- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. string. stringValue) ,
200+ queryItems. value ( for: OptionalParameters . CodingKeys. string. stringValue) ,
201201 nil
202202 )
203203 XCTAssertEqual (
204- queryItems. value ( for: OptionalParametersRouter . Parameters . CodingKeys. stringsArray. stringValue) ,
204+ queryItems. value ( for: OptionalParameters . CodingKeys. stringsArray. stringValue) ,
205205 nil
206206 )
207207 }
@@ -244,20 +244,20 @@ private enum Router: Requestable {
244244 }
245245}
246246
247- private enum OptionalParametersRouter : Requestable {
248- struct Parameters : Codable {
249- enum CodingKeys : CodingKey {
250- case int
251- case string
252- case stringsArray
253- }
254-
255- let int : Int ?
256- let string : String ?
257- let stringsArray : [ String ] ?
247+ private struct OptionalParameters : Codable {
248+ enum CodingKeys : CodingKey {
249+ case int
250+ case string
251+ case stringsArray
258252 }
259253
260- case test( Parameters )
254+ let int : Int ?
255+ let string : String ?
256+ let stringsArray : [ String ] ?
257+ }
258+
259+ private enum OptionalParametersRouter : Requestable {
260+ case test( OptionalParameters )
261261
262262 var baseURL : URL {
263263 // swiftlint:disable:next force_unwrapping
@@ -272,15 +272,15 @@ private enum OptionalParametersRouter: Requestable {
272272 switch self {
273273 case let . test( params) :
274274 var urlParameters : [ String : Any ] = [
275- Parameters . CodingKeys. int. stringValue: params. int as Any ,
276- Parameters . CodingKeys. string. stringValue: params. string as Any
275+ OptionalParameters . CodingKeys. int. stringValue: params. int as Any ,
276+ OptionalParameters . CodingKeys. string. stringValue: params. string as Any
277277 ]
278278
279279 if let stringsArray = params. stringsArray {
280- urlParameters [ Parameters . CodingKeys. stringsArray. stringValue] = ArrayParameter ( stringsArray, arrayEncoding: . commaSeparated)
280+ urlParameters [ OptionalParameters . CodingKeys. stringsArray. stringValue] = ArrayParameter ( stringsArray, arrayEncoding: . commaSeparated)
281281 }
282282
283- return urlParameters. compactMapValues { $0 }
283+ return urlParameters
284284 }
285285 }
286286
0 commit comments