Skip to content

Commit 22b6787

Browse files
4brunu4brunu
authored
[Swift][client] fix parameters encoding (#20934)
* [Swift][client] fix parameters encoding * [Swift][client] fix parameters encoding
1 parent 6e3b199 commit 22b6787

File tree

28 files changed

+574
-168
lines changed

28 files changed

+574
-168
lines changed

‎modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import Vapor{{/useVapor}}
7171
/// maps all values from source to query parameters
7272
///
7373
/// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
74-
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
74+
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? {
7575
let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
7676
if let collection = item.value.wrappedValue as? [Any?] {
7777

‎modules/openapi-generator/src/main/resources/swift6/Extensions.mustache‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,51 @@ import FoundationNetworking
1111
@preconcurrency import PromiseKit{{/usePromiseKit}}{{#useVapor}}
1212
import Vapor{{/useVapor}}{{^useVapor}}
1313

14-
extension Bool: QueryStringEncodable {}
15-
extension Float: QueryStringEncodable {}
16-
extension Int: QueryStringEncodable {}
17-
extension Int32: QueryStringEncodable {}
18-
extension Int64: QueryStringEncodable {}
19-
extension Double: QueryStringEncodable {}
20-
extension Decimal: QueryStringEncodable {}
21-
extension String: QueryStringEncodable {}
22-
extension URL: QueryStringEncodable {}
23-
extension UUID: QueryStringEncodable {}
24-
2514
extension QueryStringEncodable {
2615
@_disfavoredOverload
2716
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
2817
}
2918

19+
extension Bool: QueryStringEncodable {
20+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
21+
}
22+
23+
extension Float: QueryStringEncodable {
24+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
25+
}
26+
27+
extension Int: QueryStringEncodable {
28+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
29+
}
30+
31+
extension Int32: QueryStringEncodable {
32+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
33+
}
34+
35+
extension Int64: QueryStringEncodable {
36+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
37+
}
38+
39+
extension Double: QueryStringEncodable {
40+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
41+
}
42+
43+
extension Decimal: QueryStringEncodable {
44+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
45+
}
46+
47+
extension String: QueryStringEncodable {
48+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
49+
}
50+
51+
extension URL: QueryStringEncodable {
52+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
53+
}
54+
55+
extension UUID: QueryStringEncodable {
56+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
57+
}
58+
3059
extension RawRepresentable where RawValue: QueryStringEncodable {
3160
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) }
3261
}

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public struct APIHelper {
7070
/// maps all values from source to query parameters
7171
///
7272
/// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
73-
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
73+
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? {
7474
let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
7575
if let collection = item.value.wrappedValue as? [Any?] {
7676

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,51 @@ import Foundation
99
import FoundationNetworking
1010
#endif
1111

12-
extension Bool: QueryStringEncodable {}
13-
extension Float: QueryStringEncodable {}
14-
extension Int: QueryStringEncodable {}
15-
extension Int32: QueryStringEncodable {}
16-
extension Int64: QueryStringEncodable {}
17-
extension Double: QueryStringEncodable {}
18-
extension Decimal: QueryStringEncodable {}
19-
extension String: QueryStringEncodable {}
20-
extension URL: QueryStringEncodable {}
21-
extension UUID: QueryStringEncodable {}
22-
2312
extension QueryStringEncodable {
2413
@_disfavoredOverload
2514
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
2615
}
2716

17+
extension Bool: QueryStringEncodable {
18+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
19+
}
20+
21+
extension Float: QueryStringEncodable {
22+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
23+
}
24+
25+
extension Int: QueryStringEncodable {
26+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
27+
}
28+
29+
extension Int32: QueryStringEncodable {
30+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
31+
}
32+
33+
extension Int64: QueryStringEncodable {
34+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
35+
}
36+
37+
extension Double: QueryStringEncodable {
38+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
39+
}
40+
41+
extension Decimal: QueryStringEncodable {
42+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
43+
}
44+
45+
extension String: QueryStringEncodable {
46+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
47+
}
48+
49+
extension URL: QueryStringEncodable {
50+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
51+
}
52+
53+
extension UUID: QueryStringEncodable {
54+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
55+
}
56+
2857
extension RawRepresentable where RawValue: QueryStringEncodable {
2958
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) }
3059
}

‎samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public struct APIHelper {
7070
/// maps all values from source to query parameters
7171
///
7272
/// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
73-
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
73+
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? {
7474
let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
7575
if let collection = item.value.wrappedValue as? [Any?] {
7676

‎samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,51 @@ import FoundationNetworking
1010
#endif
1111
@preconcurrency import PromiseKit
1212

13-
extension Bool: QueryStringEncodable {}
14-
extension Float: QueryStringEncodable {}
15-
extension Int: QueryStringEncodable {}
16-
extension Int32: QueryStringEncodable {}
17-
extension Int64: QueryStringEncodable {}
18-
extension Double: QueryStringEncodable {}
19-
extension Decimal: QueryStringEncodable {}
20-
extension String: QueryStringEncodable {}
21-
extension URL: QueryStringEncodable {}
22-
extension UUID: QueryStringEncodable {}
23-
2413
extension QueryStringEncodable {
2514
@_disfavoredOverload
2615
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
2716
}
2817

18+
extension Bool: QueryStringEncodable {
19+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
20+
}
21+
22+
extension Float: QueryStringEncodable {
23+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
24+
}
25+
26+
extension Int: QueryStringEncodable {
27+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
28+
}
29+
30+
extension Int32: QueryStringEncodable {
31+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
32+
}
33+
34+
extension Int64: QueryStringEncodable {
35+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
36+
}
37+
38+
extension Double: QueryStringEncodable {
39+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
40+
}
41+
42+
extension Decimal: QueryStringEncodable {
43+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
44+
}
45+
46+
extension String: QueryStringEncodable {
47+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
48+
}
49+
50+
extension URL: QueryStringEncodable {
51+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
52+
}
53+
54+
extension UUID: QueryStringEncodable {
55+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
56+
}
57+
2958
extension RawRepresentable where RawValue: QueryStringEncodable {
3059
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) }
3160
}

‎samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public struct APIHelper {
7070
/// maps all values from source to query parameters
7171
///
7272
/// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
73-
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
73+
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? {
7474
let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
7575
if let collection = item.value.wrappedValue as? [Any?] {
7676

‎samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,51 @@ import Foundation
99
import FoundationNetworking
1010
#endif
1111

12-
extension Bool: QueryStringEncodable {}
13-
extension Float: QueryStringEncodable {}
14-
extension Int: QueryStringEncodable {}
15-
extension Int32: QueryStringEncodable {}
16-
extension Int64: QueryStringEncodable {}
17-
extension Double: QueryStringEncodable {}
18-
extension Decimal: QueryStringEncodable {}
19-
extension String: QueryStringEncodable {}
20-
extension URL: QueryStringEncodable {}
21-
extension UUID: QueryStringEncodable {}
22-
2312
extension QueryStringEncodable {
2413
@_disfavoredOverload
2514
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
2615
}
2716

17+
extension Bool: QueryStringEncodable {
18+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
19+
}
20+
21+
extension Float: QueryStringEncodable {
22+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
23+
}
24+
25+
extension Int: QueryStringEncodable {
26+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
27+
}
28+
29+
extension Int32: QueryStringEncodable {
30+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
31+
}
32+
33+
extension Int64: QueryStringEncodable {
34+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
35+
}
36+
37+
extension Double: QueryStringEncodable {
38+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
39+
}
40+
41+
extension Decimal: QueryStringEncodable {
42+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
43+
}
44+
45+
extension String: QueryStringEncodable {
46+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
47+
}
48+
49+
extension URL: QueryStringEncodable {
50+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
51+
}
52+
53+
extension UUID: QueryStringEncodable {
54+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
55+
}
56+
2857
extension RawRepresentable where RawValue: QueryStringEncodable {
2958
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) }
3059
}

‎samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public struct APIHelper {
7070
/// maps all values from source to query parameters
7171
///
7272
/// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
73-
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
73+
public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? {
7474
let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
7575
if let collection = item.value.wrappedValue as? [Any?] {
7676

‎samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,51 @@ import Foundation
99
import FoundationNetworking
1010
#endif
1111

12-
extension Bool: QueryStringEncodable {}
13-
extension Float: QueryStringEncodable {}
14-
extension Int: QueryStringEncodable {}
15-
extension Int32: QueryStringEncodable {}
16-
extension Int64: QueryStringEncodable {}
17-
extension Double: QueryStringEncodable {}
18-
extension Decimal: QueryStringEncodable {}
19-
extension String: QueryStringEncodable {}
20-
extension URL: QueryStringEncodable {}
21-
extension UUID: QueryStringEncodable {}
22-
2312
extension QueryStringEncodable {
2413
@_disfavoredOverload
2514
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
2615
}
2716

17+
extension Bool: QueryStringEncodable {
18+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
19+
}
20+
21+
extension Float: QueryStringEncodable {
22+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
23+
}
24+
25+
extension Int: QueryStringEncodable {
26+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
27+
}
28+
29+
extension Int32: QueryStringEncodable {
30+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
31+
}
32+
33+
extension Int64: QueryStringEncodable {
34+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
35+
}
36+
37+
extension Double: QueryStringEncodable {
38+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
39+
}
40+
41+
extension Decimal: QueryStringEncodable {
42+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
43+
}
44+
45+
extension String: QueryStringEncodable {
46+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
47+
}
48+
49+
extension URL: QueryStringEncodable {
50+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
51+
}
52+
53+
extension UUID: QueryStringEncodable {
54+
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) }
55+
}
56+
2857
extension RawRepresentable where RawValue: QueryStringEncodable {
2958
func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) }
3059
}

0 commit comments

Comments
 (0)