From 22b678764c3ddb1c8de21afed1fad819e54fbd9b Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:29:58 +0000 Subject: [PATCH] [Swift][client] fix parameters encoding (#20934) * [Swift][client] fix parameters encoding * [Swift][client] fix parameters encoding --- .../main/resources/swift6/APIHelper.mustache | 2 +- .../main/resources/swift6/Extensions.mustache | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../Infrastructure/APIHelper.swift | 2 +- .../Infrastructure/Extensions.swift | 51 +++++++++++++++---- .../OpenAPIs/Infrastructure/APIHelper.swift | 2 +- .../OpenAPIs/Infrastructure/Extensions.swift | 51 +++++++++++++++---- 28 files changed, 574 insertions(+), 168 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache index b2188c12b90..04c8f841528 100644 --- a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache @@ -71,7 +71,7 @@ import Vapor{{/useVapor}} /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache index d6315883b2a..78526b60ee8 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache @@ -11,22 +11,51 @@ import FoundationNetworking @preconcurrency import PromiseKit{{/usePromiseKit}}{{#useVapor}} import Vapor{{/useVapor}}{{^useVapor}} -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift index 0f92498171e..74e95feeeed 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -10,22 +10,51 @@ import FoundationNetworking #endif @preconcurrency import PromiseKit -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 0f92498171e..74e95feeeed 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -10,22 +10,51 @@ import FoundationNetworking #endif @preconcurrency import PromiseKit -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 8e370c7ae8c..f576985cdd7 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ internal struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - internal static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + internal static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index cc672834f6b..725aac0bcdb 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 4fe5bbe7e19..c88df32836d 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift index 043b37a03bf..b4218d3375c 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift @@ -70,7 +70,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs - public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: (any Sendable)?, isExplode: Bool)]) -> [URLQueryItem]? { let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value.wrappedValue as? [Any?] { diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 7dd50aa2e70..1120f928d7e 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift @@ -9,22 +9,51 @@ import Foundation import FoundationNetworking #endif -extension Bool: QueryStringEncodable {} -extension Float: QueryStringEncodable {} -extension Int: QueryStringEncodable {} -extension Int32: QueryStringEncodable {} -extension Int64: QueryStringEncodable {} -extension Double: QueryStringEncodable {} -extension Decimal: QueryStringEncodable {} -extension String: QueryStringEncodable {} -extension URL: QueryStringEncodable {} -extension UUID: QueryStringEncodable {} - extension QueryStringEncodable { @_disfavoredOverload func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } } +extension Bool: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Float: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int32: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Int64: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Double: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension Decimal: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension String: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension URL: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + +extension UUID: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: self) } +} + extension RawRepresentable where RawValue: QueryStringEncodable { func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } }