From 5bab14c51ff9036a2a5ea024ab9fe7e0fcaa374c Mon Sep 17 00:00:00 2001 From: Lennard Sprong Date: Thu, 27 Nov 2025 13:54:50 +0100 Subject: [PATCH] [swift6] Don't encode Data as base64 in multipart request --- .../src/main/resources/swift6/APIHelper.mustache | 2 ++ .../src/main/resources/swift6/Extensions.mustache | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- .../Sources/CombineLibrary/Infrastructure/APIHelper.swift | 2 ++ .../Sources/CombineLibrary/Infrastructure/Extensions.swift | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- .../Sources/PetstoreClient/Infrastructure/APIHelper.swift | 2 ++ .../Sources/PetstoreClient/Infrastructure/Extensions.swift | 4 +--- .../Classes/OpenAPIs/Infrastructure/APIHelper.swift | 2 ++ .../Classes/OpenAPIs/Infrastructure/Extensions.swift | 4 +--- 28 files changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache index 04c8f841528b..36268e9ad14a 100644 --- a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache @@ -52,6 +52,8 @@ import Vapor{{/useVapor}} guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } diff --git a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache index 0f661a170b32..ec4258f0c37f 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache @@ -86,9 +86,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 6b6bf2d2b5a7..14dd81c0d1af 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -85,9 +85,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 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 @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 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 @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 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 @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 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 @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 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 @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 6b6bf2d2b5a7..14dd81c0d1af 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 @@ -85,9 +85,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 f576985cdd7e..0888f74aea56 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 @@ -51,6 +51,8 @@ internal struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 40c9dc152409..abac05cf2fa8 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 @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 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 @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fff56a53eec2..55cce41cad18 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 @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible { 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 b4218d3375c9..4895eab4f72d 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 @@ -51,6 +51,8 @@ public struct APIHelper { guard let value = value else { return nil } if let value = value as? any RawRepresentable { return "\(value.rawValue)" + } else if let data = value as? Data { + return data.base64EncodedString(options: Data.Base64EncodingOptions()) } else { return "\(value)" } 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 fc0b544a05c3..3e4acd03c99f 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 @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable { } extension Data: ParameterConvertible { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) - } + func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } extension Date: ParameterConvertible {