[swift6] Don't encode Data as base64 in multipart request

x-sheep · x-sheep · commit 5bab14c51ff9 · 2025-11-27T13:54:50.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ import Vapor{{/useVapor}}`
`52`	`52`	`guard let value = value else { return nil }`
`53`	`53`	`if let value = value as? any RawRepresentable {`
`54`	`54`	`return "\(value.rawValue)"`
	`55`	`+ } else if let data = value as? Data {`
	`56`	`+ return data.base64EncodedString(options: Data.Base64EncodingOptions())`
`55`	`57`	`} else {`
`56`	`58`	`return "\(value)"`
`57`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`extension Data: ParameterConvertible {`
`89`		`- func asParameter(codableHelper: CodableHelper) -> any Sendable {`
`90`		`- return self.base64EncodedString(options: Data.Base64EncodingOptions())`
`91`		`- }`
	`89`	`+ func asParameter(codableHelper: CodableHelper) -> any Sendable { self }`
`92`	`90`	`}`
`93`	`91`
`94`	`92`	`extension Date: ParameterConvertible {`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ public struct APIHelper {`
`51`	`51`	`guard let value = value else { return nil }`
`52`	`52`	`if let value = value as? any RawRepresentable {`
`53`	`53`	`return "\(value.rawValue)"`
	`54`	`+ } else if let data = value as? Data {`
	`55`	`+ return data.base64EncodedString(options: Data.Base64EncodingOptions())`
`54`	`56`	`} else {`
`55`	`57`	`return "\(value)"`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`extension Data: ParameterConvertible {`
`87`		`- func asParameter(codableHelper: CodableHelper) -> any Sendable {`
`88`		`- return self.base64EncodedString(options: Data.Base64EncodingOptions())`
`89`		`- }`
	`87`	`+ func asParameter(codableHelper: CodableHelper) -> any Sendable { self }`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`extension Date: ParameterConvertible {`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`extension Data: ParameterConvertible {`
`88`		`- func asParameter(codableHelper: CodableHelper) -> any Sendable {`
`89`		`- return self.base64EncodedString(options: Data.Base64EncodingOptions())`
`90`		`- }`
	`88`	`+ func asParameter(codableHelper: CodableHelper) -> any Sendable { self }`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`extension Date: ParameterConvertible {`